summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2011-10-02Close the breadcrumb listTim Almdal
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)
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-11Automated update of .build_number to 169 for branch masterAutomatic Build Number Updater
Last update: c986b45931c8c168de478c48db0a8024ce99b7b8 (1 commits ago)
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-11Automated update of .build_number to 168 for branch masterAutomatic Build Number Updater
Last update: 71560f1fcd5d968fc9b3a9372bda03b4262b5728 (4 commits ago)
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-11Automated update of .build_number to 167 for branch masterAutomatic Build Number Updater
Last update: 71560f1fcd5d968fc9b3a9372bda03b4262b5728 (2 commits ago)
2011-08-08Automated update of .build_number to 170 for branch masterAutomatic Build Number Updater
Last update: 8fd319918b8cafb48781fee02d2075473eb42267 (1 commits ago)
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-08Automated update of .build_number to 169 for branch masterAutomatic Build Number Updater
Last update: c986b45931c8c168de478c48db0a8024ce99b7b8 (1 commits ago)
2011-08-08Merge pull request #60 from gallery/breadcrumb_finalBharat Mediratta
Initial commit of a patch for Ticket #1764. as discussed here: 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-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-04Automated update of .build_number to 168 for branch masterAutomatic Build Number Updater
Last update: 71560f1fcd5d968fc9b3a9372bda03b4262b5728 (4 commits ago)
2011-08-04Merge branch 'master' of git@github.com:gallery/gallery3Tim Almdal
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-04Automated update of .build_number to 167 for branch masterAutomatic Build Number Updater
Last update: 71560f1fcd5d968fc9b3a9372bda03b4262b5728 (2 commits ago)
2011-08-04fix for ticket #1759. correct parameter names to match usage.Tim Almdal
2011-07-24Automated update of .build_number to 166 for branch masterAutomatic Build Number Updater
Last update: 4d7105d89ee286698d2f20e9261d21c6626984d3 (1 commits ago)
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-24Automated update of .build_number to 165 for branch masterAutomatic Build Number Updater
Last update: 403f64bf2a91fe3ac2496a0a6a6180ece26afd82 (4 commits ago)
2011-07-24Merge branch 'master' of github.com:gallery/gallery3Bharat Mediratta
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-24Automated update of .build_number to 164 for branch masterAutomatic Build Number Updater
Last update: 403f64bf2a91fe3ac2496a0a6a6180ece26afd82 (1 commits ago)
2011-07-24Merge pull request #51 from chadparry/rawphoto-squashBharat Mediratta
Chad Parry's framework enhancement to support replacing an image with a new version of a different mime type. This includes code that centralizes file type management and fixes some latent issues around the relative url and path caching getting out of date.
2011-07-21Polishing the rawphoto changes, including adding some tests.Chad Parry
Squashed commit of the following: commit 945316a8c220b12adb687c896bcc5e86f99f46a4 Author: Chad Parry <github@chad.parry.org> Date: Thu Jul 21 01:11:13 2011 -0600 Add a test for the sunny-day scenario where a rule changes a data file's MIME type. commit 4ee1ee000c8f4d8ebaae66f637bc71080486fd73 Author: Chad Parry <github@chad.parry.org> Date: Thu Jul 21 00:49:47 2011 -0600 Ensure that a third-party cannot swap out a legitimate photo with an unsafe file type. commit 7dd0105bfc59c150e5640e693778f51bbaa44eab Author: Chad Parry <github@chad.parry.org> Date: Thu Jul 21 00:48:19 2011 -0600 Update the MIME type and other meta-data when a new data file is provided. commit 5a8844c7947b21cf658f22cc61f20ffa9e8f07f2 Author: Chad Parry <github@chad.parry.org> Date: Thu Jul 21 00:30:01 2011 -0600 Remove a unit test that no longer applies. Replacement data files are allowed to have different MIME types. commit 0de9c6283ce4f5773cad8e92b6785d6a1f7b5e46 Author: Chad Parry <github@chad.parry.org> Date: Thu Jul 21 00:27:45 2011 -0600 If one rule fails, then abort processing, rather than trying to proceed to subsequent rules. commit 41d379c2b777ae7b3a11f528971228e234f8976f Author: Chad Parry <github@chad.parry.org> Date: Thu Jul 21 00:10:10 2011 -0600 Replace an overly-complicated regular expression with a simple in_array, at Bharat's suggestion. commit 1b3f7111d4c2607baaa2da0aab3b501f2d9a1426 Merge: 8f7904a 403f64b Author: Chad Parry <github@chad.parry.org> Date: Wed Jul 20 21:02:56 2011 -0600 Merge branch 'master' into rawphoto commit 8f7904ab62c71a7e4ee68762f936030b4dcb4ea1 Merge: e950573 771de0a Author: Chad Parry <github@chad.parry.org> Date: Sat Jun 25 14:12:39 2011 -0600 Merge branches 'master' and 'rawphoto' into rawphoto commit e95057337996351e49915d9f85d007d50103a4be Author: Chad Parry <github@chad.parry.org> Date: Wed Jun 15 20:24:18 2011 -0600 Merge branches 'rawphoto-squash' and 'rawphoto' into rawphoto
2011-07-21Merge branch 'master' into rawphoto-squashChad Parry
2011-07-21Squashed commit of the following:Chad Parry
commit 41d379c2b777ae7b3a11f528971228e234f8976f Author: Chad Parry <github@chad.parry.org> Date: Thu Jul 21 00:10:10 2011 -0600 Replace an overly-complicated regular expression with a simple in_array, at Bharat's suggestion. commit 1b3f7111d4c2607baaa2da0aab3b501f2d9a1426 Merge: 8f7904a 403f64b Author: Chad Parry <github@chad.parry.org> Date: Wed Jul 20 21:02:56 2011 -0600 Merge branch 'master' into rawphoto commit 403f64bf2a91fe3ac2496a0a6a6180ece26afd82 Author: Automatic Build Number Updater <bharat+gallery3_build_number_updater@menalto.com> Date: Tue Jul 12 21:44:14 2011 -0700 Automated update of .build_number to 163 for branch master Last update: e8382b960a3c19bb28140833e348e6c9c9db8a8a (1 commits ago) commit 51726f9e4b8372c40b27f843fca7b783e6db9623 Author: Tim Almdal <tnalmdal@shaw.ca> Date: Tue Jul 12 21:44:40 2011 -0700 Fix for ticket #1752. Add an RSS field link for the current album. Or, in the case of a photo or movie, add a link to the rss field of the parent album. commit e8382b960a3c19bb28140833e348e6c9c9db8a8a Author: Automatic Build Number Updater <bharat+gallery3_build_number_updater@menalto.com> Date: Mon Jun 27 22:27:04 2011 -0700 Automated update of .build_number to 162 for branch master Last update: 40cda7fa3fa8d9ede1f24bfa8460aab1ac681c34 (1 commits ago) commit 1afbcafe0e556ac571a5282f8b481fb90f5fb05a Merge: 40cda7f fc6c139 Author: Bharat Mediratta <bharat@menalto.com> Date: Mon Jun 27 22:26:41 2011 -0700 Merge pull request #56 from alindeman/alindeman/1758 [Fixes #1758] Link to themes codex page instead of modules codex page commit 40cda7fa3fa8d9ede1f24bfa8460aab1ac681c34 Author: Automatic Build Number Updater <bharat+gallery3_build_number_updater@menalto.com> Date: Mon Jun 27 22:25:54 2011 -0700 Automated update of .build_number to 161 for branch master Last update: 771de0a3746ac0d780cb5dce2a14aa5a6ddf06d7 (1 commits ago) commit aa08df7f0a839c95d268853cd745f622c98cadd0 Merge: 771de0a 784c429 Author: Bharat Mediratta <bharat@menalto.com> Date: Mon Jun 27 22:25:46 2011 -0700 Merge pull request #55 from alindeman/alindeman/1757 [Fixes #1757] Redirect to root album if path comes in as main.php or index.php commit fc6c1390d3d5f3d99d75b04acf208ae3729c11ce Author: Andy Lindeman <alindeman@gmail.com> Date: Mon Jun 27 08:25:50 2011 -0400 [Fixes #1758] Link to themes codex page instead of modules codex page commit 784c429070db54e183feb3e0ea6f2726b6507081 Author: Andy Lindeman <alindeman@gmail.com> Date: Mon Jun 27 07:24:37 2011 -0400 [Fixes #1757] Redirect to root album if path comes in as main.php or index.php commit 8f7904ab62c71a7e4ee68762f936030b4dcb4ea1 Merge: e950573 771de0a Author: Chad Parry <github@chad.parry.org> Date: Sat Jun 25 14:12:39 2011 -0600 Merge branches 'master' and 'rawphoto' into rawphoto commit e95057337996351e49915d9f85d007d50103a4be Author: Chad Parry <github@chad.parry.org> Date: Wed Jun 15 20:24:18 2011 -0600 Merge branches 'rawphoto-squash' and 'rawphoto' into rawphoto
2011-07-12Automated update of .build_number to 163 for branch masterAutomatic Build Number Updater
Last update: e8382b960a3c19bb28140833e348e6c9c9db8a8a (1 commits ago)
2011-07-12Fix for ticket #1752. Add an RSS field link for the current album. Or, in ↵Tim Almdal
the case of a photo or movie, add a link to the rss field of the parent album.
2011-06-27Automated update of .build_number to 162 for branch masterAutomatic Build Number Updater
Last update: 40cda7fa3fa8d9ede1f24bfa8460aab1ac681c34 (1 commits ago)
2011-06-27Merge pull request #56 from alindeman/alindeman/1758Bharat Mediratta
[Fixes #1758] Link to themes codex page instead of modules codex page
2011-06-27Automated update of .build_number to 161 for branch masterAutomatic Build Number Updater
Last update: 771de0a3746ac0d780cb5dce2a14aa5a6ddf06d7 (1 commits ago)
2011-06-27Merge pull request #55 from alindeman/alindeman/1757Bharat Mediratta
[Fixes #1757] Redirect to root album if path comes in as main.php or index.php
2011-06-27[Fixes #1758] Link to themes codex page instead of modules codex pageAndy Lindeman
2011-06-27[Fixes #1757] Redirect to root album if path comes in as main.php or index.phpAndy Lindeman