summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-02-02Merge branch 'master' of github.com:gallery/gallery3Bharat Mediratta
2013-02-02Create gallery::allow_css_and_js_combining() which lets you disable ↵Bharat Mediratta
combining CSS/JS by touching var/DONT_COMBINE. Fixes #1989.
2013-02-02Automated update of .build_number to 324 for branch masterAutomatic Build Number Updater
Last update: a99b6f79aa8f66bc4d2ea34f814a2f53dde1d288 (1 commits ago)
2013-02-02Merge pull request #120 from shadlaws/fix_1986_followonBharat Mediratta
Follow-in to 314e2e67b1d52b7d01a715d7a6680862bf83b987 for #1986.
2013-02-02Follow-in to 314e2e67b1d52b7d01a715d7a6680862bf83b987 for #1986.shadlaws
- Update xss_test golden file (change line numbers).
2013-02-02Follow-on to f83ed5f8716663a45c9d8e8118bbcf0e2849c3fb for #1982.shadlaws
- Fix unit test for album url since empty albums now have thumbnails.
2013-02-01Automated update of .build_number to 323 for branch masterAutomatic Build Number Updater
Last update: 070095cf6cc628374ff56489c27220ca61b5735a (1 commits ago)
2013-02-01Merge pull request #117 from mikeage/fix_1987Bharat Mediratta
#1987 g2_import module should redirect with a 301, not 302
2013-02-01 #1987 g2_import module should redirect with a 301, not 302Mike Miller
As the g2_import process is generally assumed to be permanent, the redirect should be a 301, and not a 302.
2013-01-31Automated update of .build_number to 322 for branch masterAutomatic Build Number Updater
Last update: f9aeb3b5cd4efb6bb92f034e82af93c8133df66c (1 commits ago)
2013-02-01Fix ctrl-click behavior. Fixes #1986.Bharat Mediratta
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
generated by cgit v1.2.3 (git 2.46.0) at 2025-10-15 01:44:47 +0000