User: justintime Branch: DRUPAL-6--2 Date: Sat, 08 May 2010 14:02:30 +0000 Modified files: /modules/node_gallery CHANGELOG.txt README.txt /modules/node_gallery/contrib/node_gallery_lightbox2 node_gallery_lightbox2.admin.js node_gallery_lightbox2.info node_gallery_lightbox2.module /modules/node_gallery/includes node_gallery_handler_field_fid.inc node_gallery_handler_field_gid.inc node_gallery_views_handler_image_count.inc /modules/node_gallery node_gallery.admin.inc node_gallery.admin.js node_gallery.css node_gallery.inc node_gallery.info node_gallery.install node_gallery.module node_gallery.pages.inc node_gallery.token.inc node_gallery.views.inc /modules/node_gallery/theme gallery-cover-view.tpl.php gallery-image-thumbnail.tpl.php gallery-images-list.tpl.php gallery-teaser.tpl.php image-detail-view.tpl.php node-image-default.tpl.php theme.inc Log message: Merging the changes I made mistakenly in TRUNK back to 2.x. These include: #748054: after sorting images nodes are re-published #609150: How to enable "My galleries" on the navigation menu? #550995: Admin editing gallery changes user ID & #784328: pathauto creates url collisions for node gallery #791930: warning: Parameter 1 to theme_gallery_edit_images_form() expected to be a reference, value given in /usr/share/drupal6/includes/ #765024: CCK & Node Gallery Solution - thanks kgnet! #743980: Gallery displays unpublished 'gallery image's (fixed count on Galleries list) #762672: Gallery deletion returns user to gallery list even if user has no permissions to view it #743980: Gallery displays unpublished 'gallery image's #701456: Authenticated User gets error message after image upload but Admin doesn't. Error: Invalid argument.... form.inc on line 1429 #713430: Array-related warnings when there are no gallery or image types - thanks shaisachs Links: http://cvs.drupal.org/diff.php?path=contributions/modules/node_gallery/CHANG... http://cvs.drupal.org/diff.php?path=contributions/modules/node_gallery/READM... http://cvs.drupal.org/diff.php?path=contributions/modules/node_gallery/contr... http://cvs.drupal.org/diff.php?path=contributions/modules/node_gallery/contr... http://cvs.drupal.org/diff.php?path=contributions/modules/node_gallery/contr... http://cvs.drupal.org/diff.php?path=contributions/modules/node_gallery/inclu... http://cvs.drupal.org/diff.php?path=contributions/modules/node_gallery/inclu... http://cvs.drupal.org/diff.php?path=contributions/modules/node_gallery/inclu... http://cvs.drupal.org/diff.php?path=contributions/modules/node_gallery/node_... http://cvs.drupal.org/diff.php?path=contributions/modules/node_gallery/node_... http://cvs.drupal.org/diff.php?path=contributions/modules/node_gallery/node_... http://cvs.drupal.org/diff.php?path=contributions/modules/node_gallery/node_... http://cvs.drupal.org/diff.php?path=contributions/modules/node_gallery/node_... http://cvs.drupal.org/diff.php?path=contributions/modules/node_gallery/node_... http://cvs.drupal.org/diff.php?path=contributions/modules/node_gallery/node_... http://cvs.drupal.org/diff.php?path=contributions/modules/node_gallery/node_... http://cvs.drupal.org/diff.php?path=contributions/modules/node_gallery/node_... http://cvs.drupal.org/diff.php?path=contributions/modules/node_gallery/node_... http://cvs.drupal.org/diff.php?path=contributions/modules/node_gallery/theme... http://cvs.drupal.org/diff.php?path=contributions/modules/node_gallery/theme... http://cvs.drupal.org/diff.php?path=contributions/modules/node_gallery/theme... http://cvs.drupal.org/diff.php?path=contributions/modules/node_gallery/theme... http://cvs.drupal.org/diff.php?path=contributions/modules/node_gallery/theme... http://cvs.drupal.org/diff.php?path=contributions/modules/node_gallery/theme... http://cvs.drupal.org/diff.php?path=contributions/modules/node_gallery/theme...