summaryrefslogtreecommitdiff
path: root/modules
AgeCommit message (Collapse)Author
2012-03-26Fixed Delete buttonMaxim Rubis
2012-03-06Merge branch 'master' of git://github.com/gallery/gallery3Nathan Kinkade
2012-02-27Update copyright to 2012. #1822Bharat Mediratta
2012-02-27Updated for #1764 and #1790Bharat Mediratta
2012-02-21Merge branch 'master' of git://github.com/gallery/gallery3Nathan Kinkade
2012-02-06Don't support display contexts for robots. Fixes #1819.Bharat Mediratta
2012-02-06Add tags for all Cache::instance()->set calls that don't have one.Bharat Mediratta
Fixes #1818.
2012-02-05Add Baidu, Bing and Ezooms to the robits list. Fixes #1817.Bharat Mediratta
2012-02-04Updates to submodule randimg, tracks new commit.Nathan Kinkade
2012-02-04Submodule randimg follows a new commit.Nathan Kinkade
2012-01-22Merge branch 'master' of git://github.com/gallery/gallery3Nathan Kinkade
2011-12-23Use Albums_Controller::get_display_context as the default display context. ↵Bharat Mediratta
Fixes #1812.
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-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-03In get_position() don't try to truncate the score if it's empty. Follow-on ↵Bharat Mediratta
to ce43f29e2ceaac3d638061f81dc6037b5e0018d3
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-01Merge branch 'master' of git://github.com/gallery/gallery3Nathan Kinkade
2011-10-29gzip stream problem on Google Chromeffchung
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-03Fix the standard and REST uploaders to use a callback function toBharat Mediratta
delete temporary files during shutdown. Fixes #1788.
2011-10-03Work around a JS bug in IE9 that breaks the organize module.Bharat Mediratta
Fixes #1790.
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-09-28Manually fixed a merge conflict after pulling.Nathan Kinkade
2011-08-30Make the Theme_View::thumb_proportion() API call backwards compatible toBharat Mediratta
the API before dc21cf36b606048dc24532407d39bc8f5b4211fa. Fixes #1775
2011-08-30Merge branch 'master' of git@github.com:gallery/gallery3Tim Almdal
2011-08-30Patch for #1774Tim Almdal
2011-08-27Merge branch 'master' into bharat_devBharat Mediratta
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-11Simplification of 59b04b897b8a664cd7334b017fac8158a6281434 for #1764:Bharat Mediratta
- Breadcrumb::build_from_item becomes Breadcrumb::array_from_item_parents - Eliminate Breadcrumb::$id -- it's no longer necessary - Fold Breadcrumb::generate_show_query_strings into Breadcrumb::array_from_item_parents - Create Breadcrumb::set_first() and Breadcrumb::set_last() - Breadcrumb::build_from_list goes away, we just use arrays for this - Change Search_Controller and Tag_Controller to just create an array of Breadcrumb instances with the first/last marked appropriately - Breadcrumb_Test loses a bunch of complexity.
2011-08-11Initial commit of a patch for Ticket #1764. as discussed here: ↵Tim Almdal
https://github.com/gallery/gallery3/pull/58/files#r72949. Create a Breadcrumb library which has two static methods for_item (which takes a an item and builds the entire breadcrumb for the item) or build (which takes a variable number of Breadcrumb elements and creates a breadcrumb based on the specified elements). Used tag->url() to build the tag album url. Escaped the query string for the search. Tightened up the breadcrumb code in page.html.php. When adding the show query parameter, we can't blindly concatenate using the ? separator. We have to check that we use a & if a query parameter already exists.
2011-08-11Patch for ticket #1765. Provide the full site url for the the gallery link ↵Tim Almdal
instead of trying to use url_base for the hidden link and the presentation text.
2011-08-11Patch for ticket #1769. Remove the rows in groups_users when the user or the ↵Tim Almdal
group is deleted.
2011-08-11Merge branch 'master' of git://github.com/gallery/gallery3Nathan Kinkade
2011-08-08Simplification of 59b04b897b8a664cd7334b017fac8158a6281434 for #1764:Bharat Mediratta
- Breadcrumb::build_from_item becomes Breadcrumb::array_from_item_parents - Eliminate Breadcrumb::$id -- it's no longer necessary - Fold Breadcrumb::generate_show_query_strings into Breadcrumb::array_from_item_parents - Create Breadcrumb::set_first() and Breadcrumb::set_last() - Breadcrumb::build_from_list goes away, we just use arrays for this - Change Search_Controller and Tag_Controller to just create an array of Breadcrumb instances with the first/last marked appropriately - Breadcrumb_Test loses a bunch of complexity.
2011-08-07Initial commit of a patch for Ticket #1764. as discussed here: ↵Tim Almdal
https://github.com/gallery/gallery3/pull/58/files#r72949. Create a Breadcrumb library which has two static methods for_item (which takes a an item and builds the entire breadcrumb for the item) or build (which takes a variable number of Breadcrumb elements and creates a breadcrumb based on the specified elements). Used tag->url() to build the tag album url. Escaped the query string for the search. Tightened up the breadcrumb code in page.html.php. When adding the show query parameter, we can't blindly concatenate using the ? separator. We have to check that we use a & if a query parameter already exists.
2011-08-04Patch for ticket #1765. Provide the full site url for the the gallery link ↵Tim Almdal
instead of trying to use url_base for the hidden link and the presentation text.
2011-08-04Patch for ticket #1769. Remove the rows in groups_users when the user or the ↵Tim Almdal
group is deleted.
2011-08-04fix for ticket #1759. correct parameter names to match usage.Tim Almdal
2011-07-24Patch for ticket #1763. Where offset could be converted to a null string. ↵Tim Almdal
It's not really a problem in the current release, but will cause isses when we serialize the offset as part of the display context.
2011-07-24Update golden file.Bharat Mediratta
2011-07-24Assign copyright to Bharat Mediratta as trustee for Gallery, perBharat Mediratta
https://github.com/gallery/gallery3/pull/51/files
2011-07-23Merge branch 'master' of git://github.com/gallery/gallery3Nathan Kinkade
2011-07-23Added a new module for annotating photos.Nathan Kinkade
2011-07-23Added a new module for downloading a full sized image.Nathan Kinkade