summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-01-31Automated update of .build_number to 321 for branch masterAutomatic Build Number Updater
Last update: 340a14d3065aa9f330b462d14426960450a0d1d8 (1 commits ago)
2013-01-31Follow-on to 93963422505ecc790af62ae0503f301145debac3 for #1985 whichBharat Mediratta
was breaking all unit tests. Use module::install("gallery") instead of calling gallery_installer::install directly.
2013-01-31Automated update of .build_number to 320 for branch masterAutomatic Build Number Updater
Last update: 795f2569941f582127885f0bdcabe089d644a5d6 (3 commits ago)
2013-01-31Merge branch 'master' of github.com:gallery/gallery3Bharat Mediratta
2013-01-31Drop the requirement to have the install() function set the moduleBharat Mediratta
version. It's redundant. Fixes #1985.
2013-01-31Automated update of .build_number to 319 for branch masterAutomatic Build Number Updater
Last update: 795f2569941f582127885f0bdcabe089d644a5d6 (1 commits ago)
2013-01-31Merge pull request #115 from shadlaws/fix_1982Bharat Mediratta
#1982 - Add placeholder for albums with no album cover.
2013-01-31Automated update of .build_number to 318 for branch masterAutomatic Build Number Updater
Last update: 107735ffc42bd761e28cbfc79f59aa23c1bcbc2a (1 commits ago)
2013-01-31Escape the host/username/password arguments to mysqldump. Fixes #1984.Bharat Mediratta
2013-01-31Automated update of .build_number to 317 for branch masterAutomatic Build Number Updater
Last update: a15d062b23f36920f5db0793b1086a149f7030ac (1 commits ago)
2013-01-31Merge pull request #116 from shadlaws/fix_1983Bharat Mediratta
#1983: Remove item keys changed for/by graphics::generate from significant changes list.
2013-01-31Automated update of .build_number to 316 for branch masterAutomatic Build Number Updater
Last update: e17c39386b9d322f9bafd8b548ec6b94a7c5f7b5 (1 commits ago)
2013-01-31Merge pull request #114 from shadlaws/fix_1945_followonBharat Mediratta
Follow-on to 5fca371a616dba16f955087c4477ee229ee222d0 for #1945.
2013-01-31#1983: Remove item keys changed for/by graphics::generate from significant ↵shadlaws
changes list. There's no need to run through all of the item save/validation logic for these entries, which are changed frequently during the course of thumb/resize generation.
2013-01-31#1982 - Add placeholder for albums with no album cover.shadlaws
- Added missing_album_cover.jpg placeholder image. - Modified the graphics helper to use it. Calling graphics::generate will copy it. - Modified item::remove_album_cover and gallery_event::item_created to run graphics::generate. - Added unit test to Graphics_Helper_Test.
2013-01-31Follow-on to 5fca371a616dba16f955087c4477ee229ee222d0 for #1945.shadlaws
Previously skipped admin_watermarks mods to use new functionality of #1945 since there was concurrent work on it with #1970. Now that both are done, we can wrap this up.
2013-01-30Automated update of .build_number to 315 for branch masterAutomatic Build Number Updater
Last update: fc82f56f4b3c91ac1ceee426f477b256918636f8 (2 commits ago)
2013-01-30Follow-in to cff1e76e8da2055f9faf7449222b43a686014b1c for #1978Bharat Mediratta
Restrict which album cover ids we swap over to the hierarchy of the current album, otherwise we can wind up in sticky situations with hierarchical album cover chains. Eg, you have a hierarchy like this: root -> A1 -> A2 --> A3 -> P1 A4 -> P2 P1 is the album cover for its entire hierarchy. But then you swap A2's album cover for A3 making this: root -> A1 -> A2 + A3 -> P1 \-> A4 -> P2 Since A1, A2 and A3 all had P1 as their album cover item id. Now we're swapping it over to P2 but we want to leave P1 as A3's album cover item id. So only look at A4's hierarchy and ignore its peers.
2013-01-30Support additional where tuples in ORM_MPTT::parents. Fixes #1980.Bharat Mediratta
2013-01-30Automated update of .build_number to 314 for branch masterAutomatic Build Number Updater
Last update: 12ea6ad642c0e84fe67f1324f8fa00c9534e7aa5 (3 commits ago)
2013-01-30Merge branch 'master' of github.com:gallery/gallery3Bharat Mediratta
2013-01-30Actually disable the "make album cover" option when the item is already the ↵Bharat Mediratta
album cover. Fixes #1979.
2013-01-30Automated update of .build_number to 313 for branch masterAutomatic Build Number Updater
Last update: 12ea6ad642c0e84fe67f1324f8fa00c9534e7aa5 (1 commits ago)
2013-01-30When changing the album cover, find and retarget any other albums which were ↵Bharat Mediratta
using the old item as their album cover. Fixes #1978.
2013-01-30Automated update of .build_number to 312 for branch masterAutomatic Build Number Updater
Last update: 0ab40de11d65476454d4bf1129916a6856001002 (1 commits ago)
2013-01-30Merge pull request #112 from shadlaws/fix_1968Bharat Mediratta
#1968 - Improve album cover generation/removal/etc.
2013-01-30Automated update of .build_number to 311 for branch masterAutomatic Build Number Updater
Last update: 28cd0ad2c13fec256c4a0f162ec7b552eb88d66c (5 commits ago)
2013-01-30Merge branch 'master' of github.com:gallery/gallery3Bharat Mediratta
2013-01-30Follow-on to 1e4d75c12072b49c3469f18af13bcf3439afc6b0 for #1975.Bharat Mediratta
Create a siblings() function which pulls together the siblings_callback function and makes it a more palatable API.
2013-01-30Automated update of .build_number to 310 for branch masterAutomatic Build Number Updater
Last update: 28cd0ad2c13fec256c4a0f162ec7b552eb88d66c (3 commits ago)
2013-01-30Merge branch 'master' of github.com:gallery/gallery3Bharat Mediratta
2013-01-30Protect admins from themselves - in case an admin changed theBharat Mediratta
watermark.name setting to something terrible by accident via Admin > Advanced, we'll just use the basename. Fixes #1977.
2013-01-30Automated update of .build_number to 309 for branch masterAutomatic Build Number Updater
Last update: 28cd0ad2c13fec256c4a0f162ec7b552eb88d66c (1 commits ago)
2013-01-30Don't concatenate tainted strings in JS. Fixes #1976.Bharat Mediratta
2013-01-30Automated update of .build_number to 308 for branch masterAutomatic Build Number Updater
Last update: a983e8748e6e6667e968e96f8f0994f49b763b73 (1 commits ago)
2013-01-30Improve the display context API to return a "siblings_callback" fieldBharat Mediratta
containing a callback that returns all the siblings. Fixes #1975.
2013-01-30Automated update of .build_number to 307 for branch masterAutomatic Build Number Updater
Last update: 861e8628f5d847cbf5bc3cc9f94254514e8296a8 (1 commits ago)
2013-01-30Merge pull request #110 from mikeage/g2_importBharat Mediratta
#1973 Handle redirected G2 URLs for tags, including g2_itemId passed
2013-01-30 #1973 Handle redirected G2 URLs for tags, including g2_itemId passedMike Miller
2013-01-30#1968 - Improve album cover generation/removal/etc.shadlaws
- Added stanza to Item_Model::save that handles when cover id is null. - Added logic to graphics::generate to copy/convert album cover thumbs from their item thumbs to ensure they're always jpg, and eliminate the possibility that we copy/convert a dirty thumb. - Redirected other places in code where we want to do one of the above two things to use these two functions instead (gallery_event::item_updated_data_file, item::make_album_cover, item::remove_album_cover). - Improved validation in Item_Model so only albums can have covers and all covers must be non-albums. - Added unit tests to Graphics_Helper_Test.
2013-01-29Automated update of .build_number to 306 for branch masterAutomatic Build Number Updater
Last update: 899590873bbc444a35654573473f3c7326a95f87 (1 commits ago)
2013-01-29Merge pull request #108 from shadlaws/fix_1970Bharat Mediratta
#1970 - Make add watermarks more secure and add unit tests.
2013-01-29Automated update of .build_number to 305 for branch masterAutomatic Build Number Updater
Last update: b7c73ee693473eef9b536fb05f8c2b190e47b866 (1 commits ago)
2013-01-29Merge pull request #105 from shadlaws/fix_1967Bharat Mediratta
#1967 - Improve how graphics::generate handles missing/bad images.
2013-01-29#1970 - Make add watermarks more secure and add unit tests.shadlaws
This follows #1855 and #1951... - Ensured that invalid or illegal files are not added even if they have valid extensions. - Added unit tests (currently there aren't any...)
2013-01-29#1967 - Improve how graphics::generate handles missing/bad images.shadlaws
- Made missing_photo match the image format (jpg, png, etc.). - Swapped missing_photo.png for missing_photo.jpg since it's likely to require less conversion to match. - Improved error messages to user when things go wrong. - Ensured that missing image placeholders are always copied when there's an error. - Ensured we don't mistake no file output for a correct file output (delete target before attempt). - Restructured graphics::generate a bit to work better with above changes. - Added unit tests for graphics::generate.
2013-01-29Automated update of .build_number to 304 for branch masterAutomatic Build Number Updater
Last update: cf58e064d462eae6a1973cdf146e4867bf539357 (1 commits ago)
2013-01-29Merge pull request #106 from shadlaws/fix_1945Bharat Mediratta
#1945 - Extend legal_file helper functions.
2013-01-29Automated update of .build_number to 303 for branch masterAutomatic Build Number Updater
Last update: 23c6c507526ec1fc4a7ff80afb154341d75e9cab (1 commits ago)
2013-01-29Merge pull request #107 from shadlaws/fix_1969Bharat Mediratta
#1969 - Give graphics events the ability to override the standard process