summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-02-14Merge branch 'master' of git://github.com/gallery/gallery3Nathan Kinkade
2013-02-13Automated update of .build_number to 342 for branch masterAutomatic Build Number Updater
Last update: 4fc539651685d0c0b540c88f2a64e8ffe1f69646 (1 commits ago)
2013-02-13Merge pull request #143 from mikeage/g2_importBharat Mediratta
Replace = with ==
2013-02-13Replace = with ==Mike Miller
This was my mistake; I didn't test it thoroughly. It results in all g2 mappings being broken!
2013-02-12Automated update of .build_number to 341 for branch masterAutomatic Build Number Updater
Last update: 9ed67350331ff32e6f42a53ad1ba09d1533e8af9 (1 commits ago)
2013-02-12Merge pull request #134 from shadlaws/fix_2001Bharat Mediratta
#2001 - Make filename sanitizing more consistent.
2013-02-12Automated update of .build_number to 340 for branch masterAutomatic Build Number Updater
Last update: 0302e4ec0ef04f1a11b20f3c60637246bf915b7f (1 commits ago)
2013-02-12Merge pull request #123 from shadlaws/fix_1988Bharat Mediratta
#1988 - Add movie_allow_uploads option ("always", "never", or "autodetect").
2013-02-12Automated update of .build_number to 339 for branch masterAutomatic Build Number Updater
Last update: e109f0b5113c1f8b33130866af44450ca4107ed4 (1 commits ago)
2013-02-12Merge pull request #135 from shadlaws/fix_zend_debug_messageBharat Mediratta
#1749, #1754, #1901 - Add debugging message if Zend Guard code obfuscation is enabled.
2013-02-12#1749, #1754, #1901 - Add debugging message if Zend Guard code obfuscation ↵shadlaws
is enabled. Zend Guard code obfuscation is enabled by default on many PHP 5.3+ installations, but we don't use it and Kohana 2.4 is incompatible with it (see Trac tickets). Rather than crash and/or hack core Kohana code, we can display an error message to help the end user disable it.
2013-02-12#2001 - Make filename sanitizing more consistent.shadlaws
- legal_file - added sanitize_filname() to sanitize photo/movie filenames. - admin_watermarks - revised add() to use new function. - item model - added _process_data_file_info() to validate the data file, get its metadata, and sanitize the item name. - item model - revised save() for new items to use _process_data_file_info *before* the slug is checked. - item model - revised save() for updated items to use _process_data_file_info. - item model - revised save() for updated items to sanitize name if changed. - uploader - removed call to smash_extensions (item model does this when it calls sanitize_filename). - Legal_File_Helper_Test - added unit tests for sanitize_filename. - Item_Model_Test - revised existing unit tests based on changes. - Item_Model_Test - added new unit tests for names with legal but incorrect extensions. - Averted take over by HAL with fix #2001...
2013-02-12#1988 - Add movie_allow_uploads option ("always", "never", or "autodetect").shadlaws
- gallery_installer, module.info, install.sql - add movie_allow_uploads variable - movie::allow_uploads (new) - return true if movie_allow_uploads is "always" or "autodetect" and FFmpeg found, false otherwise - legal_file - use movie::allow_uploads instead of movie::find_ffmpeg - Form_Uploadify - use movie::allow_uploads instead of movie::find_ffmpeg
2013-02-10Automated update of .build_number to 338 for branch masterAutomatic Build Number Updater
Last update: 53ce9c85d16cef2d7e63d02a6b9e93d184787d3f (1 commits ago)
2013-02-10Merge pull request #121 from shadlaws/fix_1935_onlyBharat Mediratta
#1935 - Make FFmpeg easier to install.
2013-02-10Automated update of .build_number to 337 for branch masterAutomatic Build Number Updater
Last update: 9c363abc419039eaf5bb40cce90c3f5bde9d4e76 (1 commits ago)
2013-02-10Merge pull request #132 from shadlaws/fix_2000Bharat Mediratta
#2000 - Make legal_file::smash_extensions more robust.
2013-02-10Automated update of .build_number to 336 for branch masterAutomatic Build Number Updater
Last update: a06faf61b40b458870bad5e66e2666c90032ee2d (2 commits ago)
2013-02-10#2000 - Make legal_file::smash_extensions more robust.shadlaws
- Fixed legal_file::smash_extensions. - Added new unit test. - Removed duplicated condition in existing unit test.
2013-02-09Extend siblings callbacks to take a $limit and an $offset for navigatingBharat Mediratta
large sibling sets. Useful for the thumbnav module since we don't want to iterate a thousand siblings to find the one we care about. Fixes #1999.
2013-02-09Reset db_applied after find(). Fixes #1998.Bharat Mediratta
2013-02-09#1935 - Make FFmpeg easier to install.shadlaws
- system::find_binary - add Gallery's bin subdirectory to search - system::find_binary - auto-fix permissions if found in Gallery's bin directory
2013-02-09Automated update of .build_number to 335 for branch masterAutomatic Build Number Updater
Last update: dce31266988a79c45ba41fca31cf95a520c7bff3 (1 commits ago)
2013-02-09Merge pull request #130 from shadlaws/fix_1997Bharat Mediratta
#1997 - Correct movie dimensions and mime type improperly set by contributed modules.
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-09#1997 - Update movie dimensions and mime type if previously set without FFmpeg.shadlaws
- Added code to check/correct movie width, height, and mime in graphics::generate. As the comment says in the commit, this isn't ideal, but doing it in an upgrade script wouldn't be very ideal either.
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)