summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-02-14Merge pull request #142 from shadlaws/jquery_19_themerollerBharat Mediratta
Updated Themeroller for wind and admin_wind.
2013-02-14Merge pull request #140 from shadlaws/jquery_19_libs_followonBharat Mediratta
Changing 2 library names back to (less-standardized) original names.
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-13Fix Cancel link positioning, fix watermark error reply (seems to have ↵shadlaws
already been broken in v3.0.4...)
2013-02-13Updated Themeroller for wind and admin_wind.shadlaws
2013-02-13Dialog centering, sizing, etc. seem to be fixed! Well, *if* they come from ↵shadlaws
a link/menu. If they come from a context menu, they're still really broken.
2013-02-12Changing 2 library names back to (less-standardized) original names.shadlaws
json2.js -> json2-min.js ; jquery.localScroll.js -> jquery.localscroll.js While this is irrelevant for Wind, changing the filenames back to what we used to have ensures that we don't break contributed themes. --HG-- rename : lib/jquery.localScroll.js => lib/jquery.localscroll.js
2013-02-12Follow-on to b01897af8deaf38d9da627b39168cb296572384f - add debugging ↵shadlaws
message if Zend Guard code obfuscation is enabled to installer, too.
2013-02-12Merge pull request #137 from shadlaws/jquery_19_success_xhrBharat Mediratta
Updated success callbacks for gallery.panel.js and gallery.dialog.js
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-12Merge pull request #136 from shadlaws/jquery_19_libsBharat Mediratta
Finished jQuery library updates, current for 2013/02/12.
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-12Formatting: cleaned up extra lines, whitespaces, converted tabs to spaces, etc.shadlaws
2013-02-12Updated success callbacks for gallery.panel.js and gallery.dialog.js - no ↵shadlaws
longer need to save xhr ahead of success. Tested and seems to work well, even with watermarks on Chrome (previously an issue).
2013-02-12Updated json.js libraryshadlaws
- json.js 2012/10/08 - used non-minified to be consistent with other libraries - updated filename in page.html.php call
2013-02-12Changed case of call to jquery.localScroll.js to match new standard.shadlaws
2013-02-12Finished jQuery library updates, current for 2013/02/12.shadlaws
- jquery.js 1.9.1 (2013/02/04) - jquery.cookie.js 1.3.1 (2013/01/30) - jquery.scrollTo.js 1.4.5 (2012/12/14) - jquery.localScroll.js 1.2.8b (2012/09/21) Note: jquery.jeditable.js and jquery.MultiFile.js still removed, as they are no longer used.
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.
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)