summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2009-09-23Correct whitespaceTim Almdal
2009-09-23Remove a commented line I forgot to take outTim Almdal
2009-09-23Merge branch 'master' into talmdal_devTim Almdal
2009-09-22Convert tabs to spacesChad Kieffer
2009-09-22Apply thumbnail hover effect to context menu's list items, which holds the ↵Chad Kieffer
menu open in ie6 and ie7 now. Items which appear above the meta data list underneath flicker, though. I'll fix later.
2009-09-22Simplify the "unchanged" status message.Bharat Mediratta
2009-09-22Create a gallery error handler that traps php errors and rethrows them as ↵Tim Almdal
Exceptions. This fixes ticket #763
2009-09-22Updated to Exifer r4477. Fixes ticket #763.Tim Almdal
2009-09-22For those that run gallery3 at the top level, include a robots.txt file to ↵Tim Almdal
exlude gallery3 working directories from index by robots. Fixes #794 - thanks nigel_aves
2009-09-22Implement the updated version of gallery3-vendor/exifer which has gettext ↵Tim Almdal
replaced with calls to the gallery t method to provide translation. Fixes ticket 672.
2009-09-22Wrap the login form with a view in order to include a forgot password link. ↵Tim Almdal
Fixes ticket #620
2009-09-22Issue an information message if the user clicks "Save Settings" indicating ↵Tim Almdal
that the key was not changed as it as identical. This addresses the obscure issue raised in ticket #756
2009-09-22Change the link on the "Be first to comment" link to do a request to the ↵Tim Almdal
server to get the comment add form. Fixes ticket #699.
2009-09-22Change the gallery.show_full_size widget to only scale the image if one of ↵Tim Almdal
the dimensions is greater than the browser window size. Fixes #695
2009-09-22Revert "Change the exif module to respond to the gallery_ready event and ↵Tim Almdal
check to see if gettext is installed. The 3rd party library used in the exif module expects gettext to be available. Rather than doing all the time use the gallery ready event to only do it when it might be needed. Fixes ticket #672" This reverts commit 33690a32bcf132e5ab470ff77ba23c073ac26271.
2009-09-22Merge branch 'master' into talmdal_devTim Almdal
2009-09-21Don't add in contextual menu height if the menu's emptyChad Kieffer
2009-09-21Merge branch 'master' of git://github.com/gallery/gallery3Chad Kieffer
2009-09-21Merge branch 'master' of git@github.com:gallery/gallery3 into bharat_devBharat Mediratta
Conflicts: modules/gallery/controllers/albums.php
2009-09-212nd attempt at gracefully dealing with sort columns that containBharat Mediratta
nulls. This time around, do a query to determine whether or not the sort column has nulls in it. If it doesn't, then use our comparators as before. There are NULLs in the sort column, so we can't use MySQL comparators. Fall back to iterating over every child row to get to the current one. This can be wildly inefficient for really large albums, but it should be a rare case that the user is sorting an album with null values in the sort column. Fixes #627
2009-09-21Set children_count to 0, photos have no children.Bharat Mediratta
2009-09-21Update the next/previous item calculations to match what we do in photos.phpBharat Mediratta
Force the children_count to be zero, movies have no children. Rename $photo to $movie everywhere.
2009-09-21Don't try to initialize contextual menu unless it has itemsChad Kieffer
2009-09-21Add viewable() protection to children() and children_count() calls.Bharat Mediratta
This is not currently necessary (nor is it a security hole) because we don't constrain permissions at the child level in the core, but it makes our security audits easier and will enable the scenario where somebody writes a module to add per-photo permissions.
2009-09-21Revert "* Move the captured field into the exif module where it is created ↵Tim Almdal
and populated." This reverts commit a00619b812393cf73d1c188af7961af820d36185.
2009-09-21Revert "If captured had been used for any sort orders, reset back to weight"Tim Almdal
This reverts commit c01e467466eff51926108d030f21385179fa24d2.
2009-09-21Change the exif module to respond to the gallery_ready event and check to ↵Tim Almdal
see if gettext is installed. The 3rd party library used in the exif module expects gettext to be available. Rather than doing all the time use the gallery ready event to only do it when it might be needed. Fixes ticket #672
2009-09-21Fix Item_Model::get_position() so that our sort is stable when the comparisonBharat Mediratta
row has a null value in the sort field. Fix for #627 Note: this changes get_position() to take an Item_Model instead of an id!
2009-09-21If captured had been used for any sort orders, reset back to weightTim Almdal
2009-09-20Merge branch 'master' into talmdal_devTim Almdal
2009-09-20* Move the captured field into the exif module where it is created and ↵Tim Almdal
populated. * Create a new API event get_sort_fields that allows modules to contribute new sort fields that they manage. the only condition is that the module needs to add it to the item table. * Changed g2_import to call this api to get the allowable sort fields * Changed album::get_edit_form to call this new api to get the available sort fields Partial fix for ticket #627, as the Capture date is not available until the exif module is installed.
2009-09-19Address IE8 hover effect issues. Closes #666. Chad Kieffer
2009-09-19On the edit album form, add dirname and slug asa hidden fields, so that when ↵Tim Almdal
the edits are being validated on input, the fields are found and can be referenced
2009-09-19Change the fix for ticket #775 to always add the Add menu, but not add any ↵Tim Almdal
items if the album directory is not writable.
2009-09-18Don't display the add menu if the underlying operating system directory is ↵Tim Almdal
not writable. THis should fix ticket #775
2009-09-18* Changed the close functionality so the page is reloaded when the dialog is ↵Tim Almdal
closed. * Renamed the ServerAddCloseButton. * Added Pause and Continue buttons. Now when add is clicked, A Pause button is shown, once the adding is complete, the add button is reshown andpause button is hidden. Clicking the pause button will hide it and show a continue button.
2009-09-17Merge branch 'master' of git@github.com:gallery/gallery3 into talmdal_devTim Almdal
2009-09-17Refactor the server add javascript into a ui.gallery_server_add widget.Tim Almdal
2009-09-17Merge branch 'master' of git@github.com:gallery/gallery3 into talmdal_devTim Almdal
2009-09-17- Add theme->movie_menu() to whitelisted methods.Andy Staudacher
- xss_data checkpoint
2009-09-17Minor style fix: (string) $var, not (string)$var, and move the explicit cast ↵Andy Staudacher
down where it's needed.
2009-09-17use an implicit cast to convert the translated error message to a string as ↵Tim Almdal
it is encoded by the json routines and will be treated as an object otherwise
2009-09-17Remove the update code introduced with 9d7d79. In addition, captialize ↵Tim Almdal
MyISAM correctly.
2009-09-17Cleanup issues with the original fix for #779Tim Almdal
2009-09-17Merge branch 'master' into talmdal_devTim Almdal
2009-09-17Reload the album when server_add dialog is closedTim Almdal
2009-09-17Don't try to creat an album that corresponds to the staging directory. Just ↵Tim Almdal
add the contents of the staging directlyinto the album that server_add was invoked from. Fixes ticket #785
2009-09-17Merge branch 'master' of git@github.com:gallery/gallery3Tim Almdal
2009-09-17Change the timeout on resubmitting the next task iteration to 25ms instead ↵Tim Almdal
of. This allows the jQuery.ajax method to complete its processing. Otherwise, the browser can spend time thrashing around trying to send the next request.
2009-09-17Merge commit 'upstream/master'Andy Staudacher