summaryrefslogtreecommitdiff
path: root/modules/gallery
AgeCommit message (Collapse)Author
2013-03-03Merge pull request #179 from shadlaws/fix_2034Bharat Mediratta
#2034 - Add webm and ogv as valid movie types.
2013-03-03Follow-on to #2033 - Rename movieplayer.html.php to movieplayer-flash.html.phpshadlaws
- renamed file with "-flash" to make room for html5 player - updated item model and xss_data.txt to reflect changes --HG-- rename : modules/gallery/views/movieplayer.html.php => modules/gallery/views/movieplayer-flash.html.php
2013-03-03#2034 - Add webm and ogv as valid movie types.shadlaws
- added them to legal_file helper - revised unit tests
2013-03-02#2033 - Add Flowplayer 5 to play HTML5 videos.shadlaws
- add Flowplayer 5 to lib/flowplayer-html5 - move existing Flash Flowplayer to lib/flowplayer-flash - update page.html.php and movieplayer.html.php --HG-- rename : lib/flowplayer.controls.swf => lib/flowplayer-flash/flowplayer.controls.swf rename : lib/flowplayer.js => lib/flowplayer-flash/flowplayer.js rename : lib/flowplayer.pseudostreaming-byterange.swf => lib/flowplayer-flash/flowplayer.pseudostreaming-byterange.swf rename : lib/flowplayer.pseudostreaming.swf => lib/flowplayer-flash/flowplayer.pseudostreaming.swf rename : lib/flowplayer.swf => lib/flowplayer-flash/flowplayer.swf
2013-03-02Merge pull request #177 from shadlaws/fix_2032Bharat Mediratta
#2032 - Fix short form submit/cancel button formatting.
2013-03-02#2032 - Fix short form submit/cancel button formatting.shadlaws
- fixed the height of the submit buttons to match the input box - changed the cancel links into cancel buttons - added the hover effect to the buttons when used in in_place_edit (e.g. admin/tags)
2013-03-02#2031 - Add class_exists() before method_exists() if class existence is unknown.shadlaws
- fixed all instances of this in core code - deleted previous Zend Guard Loader workaround in MY_Kohana.php - updated Bootstrap.php to reflect deleted MY_Kohana.php
2013-02-27Merge pull request #169 from shadlaws/fix_2021Bharat Mediratta
#2021 - Cleanup thumb_dirty and resize_dirty instances.
2013-02-27#2021 - Cleanup thumb_dirty and resize_dirty instances.shadlaws
- g2_import: changed "false" assignment to "0" assignment for consistency. - admin_theme_options: removed unused variables (they're called/used nowhere else). - graphics: removed stanza that clears thumb_dirty and resize_dirty and returns if we have no ops. This has no effect on Gallery currently (for one, graphics::generate doesn't normally get called on an item with no dirty flags), but can inconsistently set resize_dirty of albums and movies to 0 where it's otherwise left at 1. Going forward, it may be useful to be consistent here. - gallery_installer: added v57 stanza to correct any resize_dirty flags of movies/albums that were previously reset to 0. - module.info, install.sql: update to v57
2013-02-26#2010 - Revise item::find_by_path to search for jpg-converted items.shadlaws
- added extra $var_subdir argument to item::find_by_path. - changed item::find_by_path to use $var_subdir to detect if we should look for a jpg-converted item or not (e.g. movie thumbs) - moved the album thumb detection to item::find_by_path to ensure it knows to look for an exact album match. - added more sanity checks to item::find_by_path (now has fewer false positive possibilities). - updated file_proxy to remove the need to guess different movie files. - updated File_Proxy_Controller - new sanity checks catch previously undetected bug. - added additional unit tests for item::find_by_path.
2013-02-26Follow-on from autocomplete updates.shadlaws
(9345dde83e1f092a9309c45282dc21e3fd408875, d632ef3e50252d388c272cacd29e8cc6e4949cec) - gallery module: added loading-small.gif (so all themes have it by default) - gallery module: added css for .ui-autocomplete-loading (copied from .g-loading-small in wind, but without !important so other themes can override it) - gallery module: updated upgrader.html.php to use new image (removes theme dependence) - wind theme: removed outdated css for .ac_loading (not used in v3.0.5, either) - server_add module: removed multiple argument from autocomplete (doesn't work well with it)
2013-02-25Follow-on from autocomplete and gallery.panel.js revisions.shadlaws
(9345dde83e1f092a9309c45282dc21e3fd408875, d632ef3e50252d388c272cacd29e8cc6e4949cec, fd012276cbf03cc1dc7b8da10aac5cc6f26326c6) - revised xss_data.txt golden file (no new cases). - escaped translated string in admin_users.html.php (would have otherwise been a new case in xss_data.txt).
2013-02-23#2014 - Clean up gallery.ajax.js.shadlaws
- prepend "data-" in front of non-standard attr to be more standards compliant. - fix formatting.
2013-02-23Merge branch 'jquery_190'Bharat Mediratta
2013-02-20#2008 - Add warnings if some active modules are obsolete.shadlaws
- added module::get_obsolete_modules_message function - put message on admin/dashboard - put message on admin/modules - put message on upgrader - updated unit test golden file xss_data
2013-02-18Fix up some tests:Bharat Mediratta
- unlink copied files because they confused File_Structure_Test - update golden files
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-18Merge branch 'jquery_190' of github.com:gallery/gallery3 into jquery_190Bharat Mediratta
2013-02-18Merge branch 'master' into jquery_190Bharat Mediratta
2013-02-18Moved autocomplete CSS to gallery.css to ensure it works for all themes ↵shadlaws
(including admin_wind).
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-16Merge branch 'master' into jquery_190Bharat Mediratta
2013-02-15Follow-on to 7bdccade98e76df3a7830bc45bc42321a77c709a to excludeBharat Mediratta
directories for now.
2013-02-15Follow-on to 7bdccade98e76df3a7830bc45bc42321a77c709a - point out that there'sBharat Mediratta
duplicated code in gallery_event.
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-15Dialog sizing, titles, and z-index. This should ensure the small <500px dialogsshadlaws
are correct, all titles are correctly sized, and the dialog boxes go to the top for older themes, too.
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-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-14Merge pull request #133 from shadlaws/followon_1994Bharat Mediratta
Follow-on to 0312d1b071bd4434ddb3f82888b0323da6bf3732 for #1994.
2013-02-12Merge pull request #134 from shadlaws/fix_2001Bharat Mediratta
#2001 - Make filename sanitizing more consistent.
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-10Merge pull request #121 from shadlaws/fix_1935_onlyBharat Mediratta
#1935 - Make FFmpeg easier to install.
2013-02-10Merge pull request #132 from shadlaws/fix_2000Bharat Mediratta
#2000 - Make legal_file::smash_extensions more robust.
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-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-09Merge pull request #130 from shadlaws/fix_1997Bharat Mediratta
#1997 - Correct movie dimensions and mime type improperly set by contributed modules.
2013-02-09Merge pull request #129 from shadlaws/fix_1996Bharat Mediratta
#1996 - Add blacklist to legal_file helper.
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-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-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-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-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-03Merge pull request #118 from shadlaws/fix_1982_followonBharat Mediratta
Follow-on to f83ed5f8716663a45c9d8e8118bbcf0e2849c3fb for #1982.