summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-03-04Merge pull request #187 from shadlaws/2033_followonBharat Mediratta
Follow-on to #2033 - Change variables and js script loading for Flash Fl...
2013-03-04Merge pull request #185 from shadlaws/minifyjs_20130304Bharat Mediratta
Minify (and re-minify) JS libraries (in sync with gallery3-vendor).
2013-03-04Merge pull request #183 from shadlaws/fix_2037Bharat Mediratta
#2037 - Fix bug with "item_before_update" event in item model.
2013-03-04Merge pull request #186 from jozefs/travisBharat Mediratta
Integrate with Travis CI
2013-03-04Follow-on to #2033 - Change variables and js script loading for Flash ↵shadlaws
Flowplayer. - changed movie_img event variable names to have "flash" in them. - moved flowplayer.js loading from page.html.php to movieplayer-flash. - removed conditional loading for small, photo-specific JS files in page.html.php to keep combined JS consistent between page types (better for caching).
2013-03-04Travis CI integration.Jozef Selesi
2013-03-04Return "1" to CLI if not all unit tests pass.Jozef Selesi
2013-03-04Minify (and re-minify) JS libraries (in sync with gallery3-vendor).shadlaws
- minified jQuery libraries. - re-minified flowplayer, json2-min, and extjs using new minimizer (more efficient, keeps copyrights).
2013-03-03#2037 - Fix bug with "item_before_update" event in item model.shadlaws
2013-03-03Merge pull request #179 from shadlaws/fix_2034Bharat Mediratta
#2034 - Add webm and ogv as valid movie types.
2013-03-03Merge pull request #178 from shadlaws/fix_2033Bharat Mediratta
#2033 - Add Flowplayer 5 to play HTML5 videos.
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 #175 from shadlaws/fix_1639Bharat Mediratta
#1639 - Make dialog "Cancel" links into buttons like "Submit"
2013-03-02Merge pull request #177 from shadlaws/fix_2032Bharat Mediratta
#2032 - Fix short form submit/cancel button formatting.
2013-03-02Merge pull request #176 from shadlaws/fix_2031Bharat Mediratta
#2031 - Add class_exists() before method_exists() if class existence is unknown.
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-03-02#1639 - Make dialog "Cancel" links into buttons like "Submit"shadlaws
- modified gallery.dialog.js: made cancel a <button>, added same classes as submit - modified screen.css to size/position the cancel buttons correctly
2013-02-28Automated update of .build_number to 375 for branch masterAutomatic Build Number Updater
Last update: 8cec774bf9e2a5a5786107777754446a8166242e (2 commits ago)
2013-02-28Merge pull request #173 from shadlaws/fix_2024Bharat Mediratta
#2024 - In Wind thumb view, hide movie names just like photo names.
2013-02-28Merge pull request #172 from shadlaws/fix_2018_2023Bharat Mediratta
#2018 follow-on and #2023 - Fixed issues with thumb hover effects.
2013-02-28#2024 - In Wind thumb view, hide movie names just like photo names.shadlaws
2013-02-28#2018 follow-on and #2023 - Fixed issues with thumb hover effects.shadlaws
- cleaned up resize after hover: more efficient, totally browser-compatible (IE7-10, FF, Chrome tested!). - cleaned up resize on hover: more efficient, fixed bug with neighbors that are bigger but only by a little. - fixed bugs when moving off item with expanded context menu and then quickly back: oversized hover, flicker. - cleaned up formatting, removed unneeded code, and added comments.
2013-02-27Automated update of .build_number to 374 for branch masterAutomatic Build Number Updater
Last update: 109e1ced10f3b0617d92fddc7c5e55d99f24e51b (1 commits ago)
2013-02-27Merge pull request #171 from shadlaws/update_themeroller_20130226Bharat Mediratta
Update Themeroller v1.10.0 -> v1.10.1 (in sync with gallery3-vendor)
2013-02-27Automated update of .build_number to 373 for branch masterAutomatic Build Number Updater
Last update: 857cf537b0e04eb60da3d2d2778220308b2b5c3c (1 commits ago)
2013-02-27Merge pull request #170 from shadlaws/fix_2022Bharat Mediratta
#2022 - Fix handling of watermark dialog errors.
2013-02-27Automated update of .build_number to 372 for branch masterAutomatic Build Number Updater
Last update: 555dfd341e2bcce518289daa3b6c533628cadc49 (1 commits ago)
2013-02-27Merge pull request #169 from shadlaws/fix_2021Bharat Mediratta
#2021 - Cleanup thumb_dirty and resize_dirty instances.
2013-02-27Automated update of .build_number to 371 for branch masterAutomatic Build Number Updater
Last update: 81011785aa8bbaad6dcfe5bb44a247cad778ed75 (1 commits ago)
2013-02-27Merge pull request #156 from shadlaws/fix_2010Bharat Mediratta
#2010 - Revise item::find_by_path to search for jpg-converted items.
2013-02-27Update Themeroller v1.10.0 -> v1.10.1 (in sync with gallery3-vendor)shadlaws
2013-02-27#2022 - Fix handling of watermark dialog errors.shadlaws
- admin_watermarks: changed header at end of form_add() from text/html to text/plain - admin_watermarks: added header at end of form_edit() and form_delete() just like form_add() (currently omitted) - admin_watermarks/gallery.dialog.js: removed unnecessary encode/decode workaround
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-26Automated update of .build_number to 370 for branch masterAutomatic Build Number Updater
Last update: 05fea3f4f0b97520636157097b728ae2700a7ac3 (1 commits ago)
2013-02-26Merge pull request #164 from shadlaws/fix_2017_2019Bharat Mediratta
#2017, 2019 - Update Flowplayer, fix special character issues.
2013-02-26Automated update of .build_number to 369 for branch masterAutomatic Build Number Updater
Last update: 21af370f3cc90bcf709c4fb9193be22d85d368eb (1 commits ago)
2013-02-26Merge pull request #165 from shadlaws/followon_autocomplete_loadingBharat Mediratta
Follow-on from autocomplete updates.
2013-02-26Automated update of .build_number to 368 for branch masterAutomatic Build Number Updater
Last update: 90d8700d1801ae852e9808921c47d3ed01f1db72 (1 commits ago)
2013-02-26Merge pull request #166 from shadlaws/update_jquery_20130226Bharat Mediratta
Update jQuery libraries to current as of 2013/02/26, in sync with gallery3-vendor.
2013-02-26Automated update of .build_number to 367 for branch masterAutomatic Build Number Updater
Last update: 6993a88669d19be84f59dcadbe679a6b005e038f (1 commits ago)
2013-02-26Merge pull request #167 from shadlaws/fix_2020Bharat Mediratta
#2020 - Add CLI install argument to set admin password.
2013-02-26Automated update of .build_number to 366 for branch masterAutomatic Build Number Updater
Last update: 1d2610d613576f9bce7b21bc12852da4bd77ae46 (1 commits ago)
2013-02-26Merge pull request #168 from shadlaws/update_jsonjs_20130226Bharat Mediratta
Update to latest JSON-js, in sync with gallery3-vendor
2013-02-26Update to latest JSON-js, in sync with gallery3-vendorshadlaws
- did this a short while ago, but out of sync with gallery3-vendor and with a different minimizer.
2013-02-26#2017, 2019 - Update Flowplayer, fix special character issues. In sync with ↵shadlaws
gallery3-vendor. - updated all four swf to newest - modified flashembed.js as per http://code.google.com/p/flowplayer-core/issues/detail?id=30 - rebuilt flowplayer.js from source using modified flashembed.js - included ipad plugin in flowplayer.js
2013-02-26#2020 - Add CLI install argument to set admin password.shadlaws
This isn't too useful for end users, but would be really useful for developers that install Gallery3 over and over again...
generated by cgit v1.2.3 (git 2.46.0) at 2025-10-15 18:59:39 +0000