summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-02-09Automated update of .build_number to 334 for branch masterAutomatic Build Number Updater
Last update: bc8cd154c5bad64ed13a5c6662e9685fdabe2c79 (1 commits ago)
2013-02-09Merge pull request #129 from shadlaws/fix_1996Bharat Mediratta
#1996 - Add blacklist to legal_file helper.
2013-02-09Automated update of .build_number to 333 for branch masterAutomatic Build Number Updater
Last update: f4ecb7e65850ca0cac9f7d963c34f7cd20ee9446 (1 commits ago)
2013-02-09Merge pull request #128 from shadlaws/fix_1994Bharat Mediratta
#1994 - Make get_file_metadata throw an exception if photo or movie is unidentifiable/illegal.
2013-02-08Automated update of .build_number to 332 for branch masterAutomatic Build Number Updater
Last update: 40c5cba2dccdb217bd93274f65d16fd5558257fe (1 commits ago)
2013-02-08Merge pull request #127 from shadlaws/fix_1993Bharat Mediratta
#1993 - Remove "failed" query string from upgrader redirect if there are no errors.
2013-02-08#1996 - Add blacklist to legal_file helper.shadlaws
Adding a blacklist to legal_file could prevent possible security holes arising from a contributed module that adds file types by user input (e.g. an admin screen).
2013-02-08#1994 - Make get_file_metadata throw an exception if photo or movie is ↵shadlaws
unidentifiable/illegal. - photo & movie helpers: modified to throw exceptions when file is known to be unidentifiable/illegal. - item model: revised to work with exceptions and be more explicit when the data file is invalid. - item model: removed duplicate get_file_metadata call for updated items. - admin_watermarks controller: revised to work with exceptions (really cleans up logic here). - graphics helper: revised to handle invalid placeholders (a nearly-impossible corner case, but still...). - photo & movie helper tests: revised to work with exceptions, added new tests for illegal files with valid extensions. - item model tests: revised to work with exceptions, added new tests for illegal files with valid extensions.
2013-02-08#1993 - Remove "failed" query string from upgrader redirect if there are no ↵shadlaws
errors. - Changed redirect if it finished without failures. - No change to Upgrader_Controller::index(), since its behavior with an empty vs. undefined failed query is identical.
2013-02-07Automated update of .build_number to 331 for branch masterAutomatic Build Number Updater
Last update: 1796a290c18a2e38c7714ac903c78ac54c373e6b (2 commits ago)
2013-02-07Merge branch 'master' of github.com:gallery/gallery3Bharat Mediratta
2013-02-07Follow-on to 1e4d75c12072b49c3469f18af13bcf3439afc6b0 for #1975.Bharat Mediratta
Don't try to use an array index on a function return, that's not supported in PHP 5.3
2013-02-07Automated update of .build_number to 330 for branch masterAutomatic Build Number Updater
Last update: 2fe80add2ed23516948c712cd899c03302c865fb (1 commits ago)
2013-02-07Merge pull request #125 from shadlaws/fix_1992Bharat Mediratta
#1992 - Improve examples for thumb/resize/file path/url functions in item model
2013-02-07#1992 - Improve examples for thumb/resize/file path/url functions in item model.shadlaws
Documentation-only changes to examples used in: - Item_Model::url - Item_Model::abs_url - Item_Model::file_path - Item_Model::file_url - Item_Model::resize_path - Item_Model::resize_url - Item_Model::thumb_path - Item_Model::thumb_url
2013-02-06Automated update of .build_number to 329 for branch masterAutomatic Build Number Updater
Last update: aed006a92e858cb9ca66dd021c07c5d80586169f (1 commits ago)
2013-02-06Merge pull request #124 from shadlaws/fix_1991Bharat Mediratta
#1991 - Add options to graphics::mark_dirty to specify type and/or mime type
2013-02-06Automated update of .build_number to 328 for branch masterAutomatic Build Number Updater
Last update: 1796a290c18a2e38c7714ac903c78ac54c373e6b (1 commits ago)
2013-02-06Merge pull request #122 from shadlaws/followon_1982_part_2Bharat Mediratta
Follow-on to 949b8cda14ec037386da34c43248ebd60542f5da for #1982.
2013-02-06#1991 - Add options to graphics::mark_dirty to specify type and/or mime type.shadlaws
- graphics::mark_dirty - added $type and $mime_type as options. - graphics::mark_dirty - used options to set additional where conditions.
2013-02-06Follow-on to 949b8cda14ec037386da34c43248ebd60542f5da for #1982.shadlaws
- Add extra condition to Item_Model_Test::urls_test to test cache busters of missing files. - Previous commit fixes unit test for empty album url, but now no test checks missing files.
2013-02-05Automated update of .build_number to 327 for branch masterAutomatic Build Number Updater
Last update: f9aeb3b5cd4efb6bb92f034e82af93c8133df66c (5 commits ago)
2013-02-05Merge branch 'master' of github.com:gallery/gallery3Bharat Mediratta
2013-02-05Force a sort order no sibling checks. Fixes #1990.Bharat Mediratta
2013-02-03Automated update of .build_number to 326 for branch masterAutomatic Build Number Updater
Last update: 291059d86a5badb62360b88f5dccab4a07f47778 (1 commits ago)
2013-02-03Merge pull request #118 from shadlaws/fix_1982_followonBharat Mediratta
Follow-on to f83ed5f8716663a45c9d8e8118bbcf0e2849c3fb for #1982.
2013-02-02Automated update of .build_number to 325 for branch masterAutomatic Build Number Updater
Last update: f9aeb3b5cd4efb6bb92f034e82af93c8133df66c (3 commits ago)
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)