summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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...
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-10Follow-on to 0312d1b071bd4434ddb3f82888b0323da6bf3732 for #1994.shadlaws
- Updated function comments to match revisions. - No functional changes.
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.
generated by cgit v1.2.3 (git 2.46.0) at 2025-10-16 16:56:55 +0000