Commit Graph
6803 Commits
Author SHA1 Message Date
Bharat Mediratta 5ca5a97a23 Merge branch 'master' of github.com:gallery/gallery3 2011-10-03 21:47:45 -07:00
Bharat Mediratta 79a2e3f1a7 Use a stdClass wrapper around the data in the before_combine and
after_combine events so that event handlers can modify the data.
Fixes #1789.
2011-10-03 21:47:18 -07:00
Automatic Build Number Updater 519b1ff11b Automated update of .build_number to 175 for branch master
Last update: dfbfe09016 (1 commits ago)
2011-10-02 15:34:37 -07:00
Tim Almdal 91bdcfe1c5 Close the breadcrumb list 2011-10-02 15:34:37 -07:00
Automatic Build Number Updater dfbfe09016 Automated update of .build_number to 174 for branch master
Last update: 5639ff3421 (1 commits ago)
2011-08-30 20:49:35 -07:00
Bharat Mediratta 1ed54ab5dc Make the Theme_View::thumb_proportion() API call backwards compatible to
the API before dc21cf36b6.

Fixes #1775
2011-08-30 20:49:23 -07:00
Automatic Build Number Updater 5639ff3421 Automated update of .build_number to 173 for branch master
Last update: 246f5b59cb (2 commits ago)
2011-08-30 20:04:35 -07:00
Tim Almdal 044309cb50 Merge branch 'master' of git@github.com:gallery/gallery3 2011-08-30 20:05:00 -07:00
Tim Almdal 96a4a261a4 Patch for #1774 2011-08-30 20:04:31 -07:00
Automatic Build Number Updater 8970e50c6a Automated update of .build_number to 172 for branch master
Last update: e4d4a89a1b (2 commits ago)
2011-08-27 20:56:54 -07:00
Bharat Mediratta 084c2717c0 Merge branch 'master' into bharat_dev 2011-08-27 20:56:03 -07:00
Automatic Build Number Updater 246f5b59cb Automated update of .build_number to 171 for branch master
Last update: a5b1972bbe (2 commits ago)
2011-08-27 14:56:04 -07:00
Bharat Mediratta ce43f29e2c Refactor the display context code a bit:
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-27 11:18:07 -07:00
Tim Almdal c92d34a86b Merge branch 'displayContext' into display_context_compressed
Conflicts:
	modules/gallery/controllers/movies.php
	modules/gallery/controllers/photos.php
	modules/tag/controllers/tag.php
2011-08-11 22:11:24 -07:00
Tim Almdal 933a34986d Patch for tickets #1428 and #1760
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-11 22:04:21 -07:00
Automatic Build Number UpdaterandTim Almdal b78f87cb80 Automated update of .build_number to 170 for branch master
Last update: 8fd319918b (1 commits ago)
2011-08-11 22:04:03 -07:00
Bharat MedirattaandTim Almdal 67719c6f61 Simplification of 59b04b897b for #1764:
- 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-11 22:04:03 -07:00
Automatic Build Number UpdaterandTim Almdal 23b1ed4108 Automated update of .build_number to 169 for branch master
Last update: c986b45931 (1 commits ago)
2011-08-11 22:04:02 -07:00
Tim Almdal a246b6fe45 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-11 22:04:02 -07:00
Automatic Build Number UpdaterandTim Almdal b1d5104ed6 Automated update of .build_number to 168 for branch master
Last update: 71560f1fcd (4 commits ago)
2011-08-11 22:04:01 -07:00
Tim Almdal eb5c7e5e18 Patch for ticket #1765. Provide the full site url for the the gallery link instead of trying to use url_base for the hidden link and the presentation text. 2011-08-11 22:04:01 -07:00
Tim Almdal 66a6986d37 Patch for ticket #1769. Remove the rows in groups_users when the user or the group is deleted. 2011-08-11 22:04:00 -07:00
Automatic Build Number UpdaterandTim Almdal 3b8bd84629 Automated update of .build_number to 167 for branch master
Last update: 71560f1fcd (2 commits ago)
2011-08-11 22:04:00 -07:00
Automatic Build Number Updater a5b1972bbe Automated update of .build_number to 170 for branch master
Last update: 8fd319918b (1 commits ago)
2011-08-08 21:30:38 -07:00
Bharat Mediratta da523de777 Simplification of 59b04b897b for #1764:
- 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-08 21:29:19 -07:00
Automatic Build Number Updater 8fd319918b Automated update of .build_number to 169 for branch master
Last update: c986b45931 (1 commits ago)
2011-08-08 20:20:31 -07:00
Bharat Mediratta 59b04b897b Merge pull request #60 from gallery/breadcrumb_final
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-08 20:20:20 -07:00
Tim Almdal dd0b622ae9 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-07 13:41:47 -07:00
Automatic Build Number Updater c986b45931 Automated update of .build_number to 168 for branch master
Last update: 71560f1fcd (4 commits ago)
2011-08-04 21:00:26 -07:00
Tim Almdal 0bab6e0a9c Merge branch 'master' of git@github.com:gallery/gallery3 2011-08-04 21:00:44 -07:00
Tim Almdal e736d98eaa Patch for ticket #1765. Provide the full site url for the the gallery link instead of trying to use url_base for the hidden link and the presentation text. 2011-08-04 21:00:21 -07:00
Tim Almdal 11c76572f0 Patch for ticket #1769. Remove the rows in groups_users when the user or the group is deleted. 2011-08-04 20:29:06 -07:00
Automatic Build Number Updater 5b4913ca11 Automated update of .build_number to 167 for branch master
Last update: 71560f1fcd (2 commits ago)
2011-08-04 20:28:57 -07:00
Tim Almdal 7f8056b593 fix for ticket #1759. correct parameter names to match usage. 2011-08-04 19:44:19 -07:00
Automatic Build Number Updater 71560f1fcd Automated update of .build_number to 166 for branch master
Last update: 4d7105d89e (1 commits ago)
2011-07-24 17:11:13 -07:00
Tim Almdal de1b4082cd Patch for ticket #1763. Where offset could be converted to a null string. 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-24 17:11:04 -07:00
Automatic Build Number Updater 4d7105d89e Automated update of .build_number to 165 for branch master
Last update: 403f64bf2a (4 commits ago)
2011-07-24 08:34:28 -07:00
Bharat Mediratta 281768fa24 Merge branch 'master' of github.com:gallery/gallery3 2011-07-24 08:34:21 -07:00
Bharat Mediratta ce0b9bcc14 Update golden file. 2011-07-24 08:32:14 -07:00
Bharat Mediratta 458c6316e7 Assign copyright to Bharat Mediratta as trustee for Gallery, per
https://github.com/gallery/gallery3/pull/51/files
2011-07-24 08:31:39 -07:00
Automatic Build Number Updater 98fb814584 Automated update of .build_number to 164 for branch master
Last update: 403f64bf2a (1 commits ago)
2011-07-24 08:26:35 -07:00
Bharat Mediratta ad47d826cf Merge pull request #51 from chadparry/rawphoto-squash
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-24 08:25:57 -07:00
Chad Parry 0672c8f83f Polishing the rawphoto changes, including adding some tests.
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-21 01:12:26 -06:00
Chad Parry fc32b9fd47 Merge branch 'master' into rawphoto-squash 2011-07-21 00:12:51 -06:00
Chad Parry 44b624f6fb Squashed commit of the following:
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 403f64bf2a
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: e8382b960a (1 commits ago)

commit 51726f9e4b
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 e8382b960a
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: 40cda7fa3f (1 commits ago)

commit 1afbcafe0e
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 40cda7fa3f
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: 771de0a374 (1 commits ago)

commit aa08df7f0a
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 fc6c1390d3
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 784c429070
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-21 00:11:52 -06:00
Automatic Build Number Updater 403f64bf2a Automated update of .build_number to 163 for branch master
Last update: e8382b960a (1 commits ago)
2011-07-12 21:44:14 -07:00
Tim Almdal 51726f9e4b 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. 2011-07-12 21:44:40 -07:00
Automatic Build Number Updater e8382b960a Automated update of .build_number to 162 for branch master
Last update: 40cda7fa3f (1 commits ago)
2011-06-27 22:27:04 -07:00
Bharat Mediratta 1afbcafe0e Merge pull request #56 from alindeman/alindeman/1758
[Fixes #1758] Link to themes codex page instead of modules codex page
2011-06-27 22:26:41 -07:00
Automatic Build Number Updater 40cda7fa3f Automated update of .build_number to 161 for branch master
Last update: 771de0a374 (1 commits ago)
2011-06-27 22:25:54 -07:00