summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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-07-08availability of rss is now configurableThomas E. Horner
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
2011-06-25Merge branch 'master' into rawphoto-squashChad Parry
2011-06-25Automated update of .build_number to 160 for branch masterAutomatic Build Number Updater
Last update: 71b5412627662ee04d34844b0f90ded712ad2ec7 (1 commits ago)
2011-06-25Merge pull request #53 from chadparry/missing_photoBharat Mediratta
Gracefully handle rule failures with a broken image icon. Fixes #1755.
2011-06-22Automated update of .build_number to 159 for branch masterAutomatic Build Number Updater
Last update: a19554f96cbec458fb8a009ba4e126bf50cd7a52 (1 commits ago)
2011-06-22Merge pull request #54 from mamouneyya/masterTim Almdal
RTL improvements for Admin WInd theme
2011-06-23Yet another RTL review for the admin thememamouneyya
2011-06-23RTLing the comment admin section tabs (the right one)mamouneyya
2011-06-23revert 4650347a672296e4d1ac, it sould be applied to the admin thememamouneyya
2011-06-23Add RTL paginator for Admin Wind (copied from Wind CSS)mamouneyya
2011-06-23RTLing the tabs of admin comment sectionmamouneyya
2011-06-15Gracefully handle rule failures with a broken image icon.Chad Parry
This will be especially useful as third-party modules start supporting a larger variety of image types, and as errors creep into their image processing.
2011-06-15Write more PHP docsChad Parry
2011-06-15Refer to "rules" not "filters"Chad Parry
2011-06-05Automated update of .build_number to 158 for branch masterAutomatic Build Number Updater
Last update: 4a208226edbd3aeb8352b068f6f774ce410a3b3d (1 commits ago)
2011-06-05Use the strict form of mb_detect_encoding for best results.Bharat Mediratta
Thanks to guthy in https://github.com/gallery/gallery3/commit/fa6f233603267505c216abc4f12663d245cd23e7#commitcomment-403145 Fixes #1745.
2011-05-24Automated update of .build_number to 157 for branch masterAutomatic Build Number Updater
Last update: 84c40285276c3d9854a4e61c7f0fa8cf25b6b981 (1 commits ago)
2011-05-24Follow on to c101151616033d53587d1435881dae0fa45aeefa -- delete allBharat Mediratta
tags in setup so that we have a blank slate, otherwise create_tag() will fail because sometimes there'll be other tags in the system. #1628
2011-05-24Automated update of .build_number to 156 for branch masterAutomatic Build Number Updater
Last update: 637e56fe45f061bdbcf8c22df257bf85733db115 (4 commits ago)
2011-05-24Merge branch 'master' of github.com:gallery/gallery3Bharat Mediratta
2011-05-24Allow password reset even when we're in maintenance or private galleryBharat Mediratta
mode, otherwise you can't reset your password if you forgot it when the Gallery is locked down. #1735.
2011-05-24Automated update of .build_number to 155 for branch masterAutomatic Build Number Updater
Last update: 637e56fe45f061bdbcf8c22df257bf85733db115 (2 commits ago)
2011-05-24CheckpointBharat Mediratta
2011-05-24Reassign the copyright to the standard custodian (Bharat). #1732.Bharat Mediratta
2011-05-22Automated update of .build_number to 154 for branch masterAutomatic Build Number Updater
Last update: db734130c5fe10408040b2326b28b102f3131271 (2 commits ago)