summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2012-01-22Merge branch 'master' of git://github.com/gallery/gallery3Nathan Kinkade
2011-12-25Automated update of .build_number to 185 for branch masterAutomatic Build Number Updater
Last update: 2d911974d751334f4c6ca1bc3b0f3f98e220436e (4 commits ago)
2011-12-25Merge pull request #64 from ophian/patch-1Bharat Mediratta
added if (nh < 1) { var nh = 0; } Fixes #1813
2011-12-23Merge branch 'master' of github.com:gallery/gallery3Bharat Mediratta
2011-12-23Use Albums_Controller::get_display_context as the default display context. ↵Bharat Mediratta
Fixes #1812.
2011-12-17Automated update of .build_number to 184 for branch masterAutomatic Build Number Updater
Last update: 2d911974d751334f4c6ca1bc3b0f3f98e220436e (1 commits ago)
2011-12-17Follow-on fix for #1790 - the last fix broke rearranging for everythingBharat Mediratta
*but* IE9. Oops!
2011-11-30Merge branch 'master' of git://github.com/gallery/gallery3Nathan Kinkade
2011-11-24Automated update of .build_number to 183 for branch masterAutomatic Build Number Updater
Last update: 94eef9eaecbdcc98f4b5adb0da939480a324b0ad (2 commits ago)
2011-11-24Move the Content-Length header into the main block, fix some formatting.Bharat Mediratta
Follow-on to 5b969fd069e239e4126b52377518ac98968b1aab which is a fix for #1802.
2011-11-24Merge branch 'patch-1' of git://github.com/ffchung/gallery3Bharat Mediratta
2011-11-19Merge branch 'master' of git://github.com/gallery/gallery3Nathan Kinkade
2011-11-05added if (nh < 1) { var nh = 0; } Ian
to start album upper border not as nh = -n
2011-11-03Automated update of .build_number to 182 for branch masterAutomatic Build Number Updater
Last update: 8a88a64b9a953ec810514df772c8ba877afb6768 (1 commits ago)
2011-11-03In get_position() don't try to truncate the score if it's empty. Follow-on ↵Bharat Mediratta
to ce43f29e2ceaac3d638061f81dc6037b5e0018d3
2011-11-03Automated update of .build_number to 181 for branch masterAutomatic Build Number Updater
Last update: 7b65a292ce991c676899ac1e4920b8ce1534c3bd (2 commits ago)
2011-11-03Better fix for dc21cf36b606048dc24532407d39bc8f5b4211fa - let's just fix upBharat Mediratta
the root album thumbnail when the proportions change so that we avoid this problem altogether.
2011-11-03Revert "Fix a bug introduced in dc21cf36b606048dc24532407d39bc8f5b4211fa where"Bharat Mediratta
It doesn't work for search because there are no children. And this just feels clunky to me - we should arrange for the root album to have the right dimensions of thumbnail instead. This reverts commit 4cb49b9152e82d0ab53b1038c7a7d7203c8bf97d.
2011-11-03Automated update of .build_number to 180 for branch masterAutomatic Build Number Updater
Last update: 4f370b6c237e85d5daa84edcc7d46990ea473b19 (1 commits ago)
2011-11-03Fix a bug introduced in dc21cf36b606048dc24532407d39bc8f5b4211fa whereBharat Mediratta
we're basing the thumb proportions on the album's thumbnail, but this will be messed up in the case of the root album which may not have a properly update thumbnail, so its proportions may not be representative of the album's contents. So instead, base the thumb proportions on the first child of the album.
2011-11-01Merge branch 'master' of git://github.com/gallery/gallery3Nathan Kinkade
2011-10-29gzip stream problem on Google Chromeffchung
2011-10-26Automated update of .build_number to 179 for branch masterAutomatic Build Number Updater
Last update: 5639ff342195ec80f125f4b09ccc5ae5932c2197 (9 commits ago)
2011-10-26Merge branch 'master' of github.com:gallery/gallery3Bharat Mediratta
2011-10-26Follow on to 7f62f09cf377b92b615e456ec4539300b331fd4b for #1663 to fix badBharat Mediratta
query syntax, pointed out by Singularis in http://gallery.menalto.com/gallery_3.0.2_feedback#comment-383135
2011-10-26Merge branch 'master' of git://github.com/gallery/gallery3Nathan Kinkade
2011-10-03Automated update of .build_number to 178 for branch masterAutomatic Build Number Updater
Last update: 5639ff342195ec80f125f4b09ccc5ae5932c2197 (7 commits ago)
2011-10-03Merge branch 'master' of github.com:gallery/gallery3Bharat Mediratta
2011-10-03Fix the standard and REST uploaders to use a callback function toBharat Mediratta
delete temporary files during shutdown. Fixes #1788.
2011-10-03Automated update of .build_number to 177 for branch masterAutomatic Build Number Updater
Last update: 5639ff342195ec80f125f4b09ccc5ae5932c2197 (5 commits ago)
2011-10-03Merge branch 'master' of github.com:gallery/gallery3Bharat Mediratta
2011-10-03Work around a JS bug in IE9 that breaks the organize module.Bharat Mediratta
Fixes #1790.
2011-10-03Automated update of .build_number to 176 for branch masterAutomatic Build Number Updater
Last update: 5639ff342195ec80f125f4b09ccc5ae5932c2197 (3 commits ago)
2011-10-03Merge branch 'master' of github.com:gallery/gallery3Bharat Mediratta
2011-10-03Use a stdClass wrapper around the data in the before_combine andBharat Mediratta
after_combine events so that event handlers can modify the data. Fixes #1789.
2011-10-02Automated update of .build_number to 175 for branch masterAutomatic Build Number Updater
Last update: dfbfe090168ee4ed44e2c8208e79d3fe40f90437 (1 commits ago)
2011-10-02Close the breadcrumb listTim Almdal
2011-09-28Manually fixed a merge conflict after pulling.Nathan Kinkade
2011-08-30Automated update of .build_number to 174 for branch masterAutomatic Build Number Updater
Last update: 5639ff342195ec80f125f4b09ccc5ae5932c2197 (1 commits ago)
2011-08-30Make the Theme_View::thumb_proportion() API call backwards compatible toBharat Mediratta
the API before dc21cf36b606048dc24532407d39bc8f5b4211fa. Fixes #1775
2011-08-30Automated update of .build_number to 173 for branch masterAutomatic Build Number Updater
Last update: 246f5b59cb0e525a5ff6eaffce6b13e9af7e70b2 (2 commits ago)
2011-08-30Merge branch 'master' of git@github.com:gallery/gallery3Tim Almdal
2011-08-30Patch for #1774Tim Almdal
2011-08-27Automated update of .build_number to 172 for branch masterAutomatic Build Number Updater
Last update: e4d4a89a1bd54164fb62d95ac62a44957d124e68 (2 commits ago)
2011-08-27Merge branch 'master' into bharat_devBharat Mediratta
2011-08-27Automated update of .build_number to 171 for branch masterAutomatic Build Number Updater
Last update: a5b1972bbe9676479886ca94bb23f09407a87561 (2 commits ago)
2011-08-27Refactor the display context code a bit:Bharat Mediratta
1) Move the display context code into the controller themselves so that it's more logically a continuation callback from the original controller rendering code. 2) Simplify the display context set/get code and put it in the item helper, it's just a couple of lines of code now. 3) Add more descriptive breadcrumb strings
2011-08-11Merge branch 'displayContext' into display_context_compressedTim Almdal
Conflicts: modules/gallery/controllers/movies.php modules/gallery/controllers/photos.php modules/tag/controllers/tag.php
2011-08-11Patch for tickets #1428 and #1760Tim Almdal
Create the concept of a Photo_Display_Context. If the user is browsing a dynamic album (i.e. tags) and chooses to look at an image in that album. The display of the image happens correctly, but the 'next' and 'previous' buttons are no longer consistent. When one of these is clicked, Gallery will open the adjacent image in the actuall album, not the dynamic album.
2011-08-11Automated update of .build_number to 170 for branch masterAutomatic Build Number Updater
Last update: 8fd319918b8cafb48781fee02d2075473eb42267 (1 commits ago)
generated by cgit v1.2.3 (git 2.46.0) at 2025-10-17 22:22:05 +0000