summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-02-18Automated update of .build_number to 357 for branch masterAutomatic Build Number Updater
Last update: 12d68b89feea10855ce4c779f2afb543e40f1c21 (1 commits ago)
2013-02-18Merge pull request #154 from shadlaws/masterBharat Mediratta
Follow-on to fd0051dab7258c817ff01877bd4324530ce79398 for #2006.
2013-02-18Follow-on to fd0051dab7258c817ff01877bd4324530ce79398 for #2006.shadlaws
- fix unit tests for watermarks, which check for deleted files.
2013-02-18Automated update of .build_number to 356 for branch masterAutomatic Build Number Updater
Last update: f12aaf3c345fcce39fdbe721c896c03e3b429e58 (1 commits ago)
2013-02-18Fix up some tests:Bharat Mediratta
- unlink copied files because they confused File_Structure_Test - update golden files
2013-02-18Automated update of .build_number to 355 for branch masterAutomatic Build Number Updater
Last update: e950d2f4ef52b68e1ccf1cec2e896a916af5e571 (1 commits ago)
2013-02-18Merge pull request #150 from shadlaws/fix_zend_guard_loader_issuesBharat Mediratta
#1749, 1754, 1901 - Eliminate incompatibility with Zend Guard Loader.
2013-02-18#1749, 1754, 1901 - Eliminate incompatibility with Zend Guard Loader.shadlaws
- added MY_Kohana to provide wrapper for auto_load(), which loads dummy class when none found. - revised Bootstrap to load MY_Kohana. This is based on the patch described here: http://blog.teatime.com.tw/1/post/403
2013-02-18Automated update of .build_number to 354 for branch masterAutomatic Build Number Updater
Last update: afa61f9d0d551bc2a0c4fa903eb3f55742720c8d (1 commits ago)
2013-02-18Merge pull request #149 from shadlaws/fix_2007Bharat Mediratta
#2007 - Change search box text when only looking in the current album.
2013-02-18#2007 - Change search box text when only looking in the current album.shadlaws
- search.html.php - updated to use new labels. - search_link.html.php - updated to use new labels. Moved code that determines current album to top, then used it for both the new label and the hidden album input. Resulting form code looks more symmetric to search.html.php.
2013-02-17Automated update of .build_number to 353 for branch masterAutomatic Build Number Updater
Last update: 87d20c63af02ae573853da2cb82d7323a56677b5 (1 commits ago)
2013-02-17Merge pull request #148 from shadlaws/fix_2006Bharat Mediratta
#2006 - Add system::mark_file_for_delete API to delete files at shutdown.
2013-02-17#2006 - Add system::mark_file_for_delete API to delete files at shutdown.shadlaws
- added system::mark_file_for_delete to be called to mark a file - added system::delete_marked_files to be called at shutdown to delete the list - amended system::temp_filename to, by default, add the temp name to the list - updated a few other places in code where this should be used
2013-02-16Automated update of .build_number to 352 for branch masterAutomatic Build Number Updater
Last update: eb5b99abb4fb50df2dc8e8125a4fc49a674bc423 (1 commits ago)
2013-02-16Merge pull request #145 from shadlaws/revert_zend_guard_checkBharat Mediratta
#1749, 1754, 1901 - revert two recent commits that check for Zend Guard code obfuscation.
2013-02-16#1749, 1754, 1901 - revert two recent commits that check for Zend Guard ↵shadlaws
obfuscation level support. This is not the root of the problem for all installs, and can trigger false positives that break previously-working installs... we'll have to find a better way.
2013-02-15Automated update of .build_number to 351 for branch masterAutomatic Build Number Updater
Last update: 9346503c62a14a738dfa2efe24b8831275b73f44 (1 commits ago)
2013-02-15Follow-on to 7bdccade98e76df3a7830bc45bc42321a77c709a to excludeBharat Mediratta
directories for now.
2013-02-15Automated update of .build_number to 350 for branch masterAutomatic Build Number Updater
Last update: c97fe4bcdde3201ca416d61e38cd8afb4503dca2 (1 commits ago)
2013-02-15Follow-on to 7bdccade98e76df3a7830bc45bc42321a77c709a - point out that there'sBharat Mediratta
duplicated code in gallery_event.
2013-02-15Automated update of .build_number to 349 for branch masterAutomatic Build Number Updater
Last update: 5b6c138da1e53e93e4de8079885fcef29d12e673 (4 commits ago)
2013-02-15Merge branch 'master' of github.com:gallery/gallery3Bharat Mediratta
2013-02-15Every 500th request prune a single old file from var/tmp and var/logs.Bharat Mediratta
Might not be aggressive enough. Fixes #2005.
2013-02-15Automated update of .build_number to 348 for branch masterAutomatic Build Number Updater
Last update: 5b6c138da1e53e93e4de8079885fcef29d12e673 (2 commits ago)
2013-02-15Create an empty and secure gallery3/bin directory for use with the newBharat Mediratta
system::find_binary code. Fixes #2004.
2013-02-15Change gallery/bin -> gallery3/bin in the comment since I suspect mostBharat Mediratta
people don't change the name of the directory. Follow-on to 1d7f5e3ab117a6cce8f2a1d3de5e311b74dbee81 for #1935
2013-02-15Automated update of .build_number to 347 for branch masterAutomatic Build Number Updater
Last update: 6089374891407dda5da27bbceb9aa774004737b6 (1 commits ago)
2013-02-15Digibug up and vanished. Move the module to contrib for now. ThisBharat Mediratta
will leave the module active in any existing installs that had it active, but that shouldn't cause any negative impact. Fixes #2002.
2013-02-14Automated update of .build_number to 346 for branch masterAutomatic Build Number Updater
Last update: 21acbbf549f3167d14c89270683ef06746552d75 (1 commits ago)
2013-02-14Merge pull request #138 from shadlaws/fix_2003Bharat Mediratta
#2003 - Add admin/movies screen.
2013-02-14#2003 - Add admin/movies screen.shadlaws
Added admin/movies screen analogous to the admin/graphics screen so the user can: - see how FFmpeg is configured (path and version, similar to toolkits in admin/graphics) - get some instructions on how to install FFmpeg if not found - change the movie_allow_uploads setting - ask Gallery to rebuild their movie thumbs Specifics: - admin_movies, admin_movies.html (new) - new Movies admin screen - ffmpeg.png (new) - logo for admin screen - movie::get_ffmpeg_version (new) - return version number and date of FFmpeg - form_uploadify.html - change admin message if movie uploads are disabled - gallery_event::admin_menu - added Movies link to Settings - xss_data.txt - updated golden file for unit tests
2013-02-14Automated update of .build_number to 345 for branch masterAutomatic Build Number Updater
Last update: 3fa08f54a6cd4741646824b8ed98c14ea2d1633f (1 commits ago)
2013-02-14Merge pull request #139 from shadlaws/followon_zend_guard_debug_messageBharat Mediratta
Follow-on to b01897af8deaf38d9da627b39168cb296572384f - add debugging message
2013-02-14Automated update of .build_number to 344 for branch masterAutomatic Build Number Updater
Last update: db9810136381a6d74e82be10b4dbe7e4d2e344bf (1 commits ago)
2013-02-14Follow-on to 9dbe2e15ad9db3b2be53e46bc5f67d382fb4089d for #1999.Bharat Mediratta
Fix an issue where siblings() by itself throws an error. The problem is that Theme_View::siblings() passes a null offset and limit to the callback which gets passed down to search::search_within_album, which creates its query in raw SQL and doesn't check for a null offset/limit. We want a reasonable limit on the size of the set here (and 1000 is probably wayyy too high so lower that to 100) so amend get_siblings to stop using default parameters and actually check the inputs. Author: Bharat Mediratta <bharat@menalto.com> Date: Sat Feb 9 14:53:34 2013 -0500 Extend siblings callbacks to take a $limit and an $offset for navigating 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-14Automated update of .build_number to 343 for branch masterAutomatic Build Number Updater
Last update: e5ed05004f005bdccdbf68e199ae2324ad97e895 (1 commits ago)
2013-02-14Merge pull request #133 from shadlaws/followon_1994Bharat Mediratta
Follow-on to 0312d1b071bd4434ddb3f82888b0323da6bf3732 for #1994.
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-12Follow-on to b01897af8deaf38d9da627b39168cb296572384f - add debugging ↵shadlaws
message if Zend Guard code obfuscation is enabled to installer, too.
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...