Commit Graph

7522 Commits

Author SHA1 Message Date
shadlaws
384bc7afc8 #2033 - Add Flowplayer 5 to play HTML5 videos.
- 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-02 23:56:13 +01:00
Bharat Mediratta
d213ef3d3f Merge pull request #175 from shadlaws/fix_1639
#1639 - Make dialog "Cancel" links into buttons like "Submit"
2013-03-02 14:08:19 -08:00
Bharat Mediratta
f3d3726786 Merge pull request #177 from shadlaws/fix_2032
#2032 - Fix short form submit/cancel button formatting.
2013-03-02 14:07:53 -08:00
Bharat Mediratta
a81e85d3f1 Merge pull request #176 from shadlaws/fix_2031
#2031 - Add class_exists() before method_exists() if class existence is unknown.
2013-03-02 14:02:00 -08:00
shadlaws
73139982c7 #2032 - Fix short form submit/cancel button formatting.
- 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 23:00:02 +01:00
shadlaws
9b9f1a7b07 #2031 - Add class_exists() before method_exists() if class existence is unknown.
- 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 13:25:10 +01:00
shadlaws
b83abf728f #1639 - Make dialog "Cancel" links into buttons like "Submit"
- modified gallery.dialog.js: made cancel a <button>, added same classes as submit
- modified screen.css to size/position the cancel buttons correctly
2013-03-02 12:28:49 +01:00
Automatic Build Number Updater
0d05e91cd3 Automated update of .build_number to 375 for branch master
Last update: 8cec774bf9 (2 commits ago)
2013-02-28 23:40:12 -07:00
Bharat Mediratta
8166f6d755 Merge pull request #173 from shadlaws/fix_2024
#2024 - In Wind thumb view, hide movie names just like photo names.
2013-02-28 12:13:36 -08:00
Bharat Mediratta
d646053350 Merge pull request #172 from shadlaws/fix_2018_2023
#2018 follow-on and #2023 - Fixed issues with thumb hover effects.
2013-02-28 12:13:23 -08:00
shadlaws
83d0b5c82d #2024 - In Wind thumb view, hide movie names just like photo names. 2013-02-28 17:32:48 +01:00
shadlaws
ef2ca6edb5 #2018 follow-on and #2023 - Fixed issues with thumb hover effects.
- 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-28 17:10:48 +01:00
Automatic Build Number Updater
8cec774bf9 Automated update of .build_number to 374 for branch master
Last update: 109e1ced10 (1 commits ago)
2013-02-27 10:14:45 -07:00
Bharat Mediratta
d6467491b9 Merge pull request #171 from shadlaws/update_themeroller_20130226
Update Themeroller v1.10.0 -> v1.10.1 (in sync with gallery3-vendor)
2013-02-27 09:14:17 -08:00
Automatic Build Number Updater
109e1ced10 Automated update of .build_number to 373 for branch master
Last update: 857cf537b0 (1 commits ago)
2013-02-27 10:14:06 -07:00
Bharat Mediratta
5bf0500271 Merge pull request #170 from shadlaws/fix_2022
#2022 - Fix handling of watermark dialog errors.
2013-02-27 09:14:01 -08:00
Automatic Build Number Updater
857cf537b0 Automated update of .build_number to 372 for branch master
Last update: 555dfd341e (1 commits ago)
2013-02-27 10:12:16 -07:00
Bharat Mediratta
7c94b930ed Merge pull request #169 from shadlaws/fix_2021
#2021 - Cleanup thumb_dirty and resize_dirty instances.
2013-02-27 09:12:13 -08:00
Automatic Build Number Updater
555dfd341e Automated update of .build_number to 371 for branch master
Last update: 81011785aa (1 commits ago)
2013-02-27 10:10:59 -07:00
Bharat Mediratta
ad502513b0 Merge pull request #156 from shadlaws/fix_2010
#2010 - Revise item::find_by_path to search for jpg-converted items.
2013-02-27 09:10:35 -08:00
shadlaws
6fbfbaa458 Update Themeroller v1.10.0 -> v1.10.1 (in sync with gallery3-vendor) 2013-02-27 16:14:03 +01:00
shadlaws
ea4622f726 #2022 - Fix handling of watermark dialog errors.
- 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 09:49:05 +01:00
shadlaws
891a24151e #2021 - Cleanup thumb_dirty and resize_dirty instances.
- 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-27 07:11:52 +01:00
shadlaws
251e9d5c8f #2010 - Revise item::find_by_path to search for jpg-converted items.
- 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-26 18:39:59 +01:00
Automatic Build Number Updater
81011785aa Automated update of .build_number to 370 for branch master
Last update: 05fea3f4f0 (1 commits ago)
2013-02-26 09:59:17 -07:00
Bharat Mediratta
c4fc3c82a9 Merge pull request #164 from shadlaws/fix_2017_2019
#2017, 2019 - Update Flowplayer, fix special character issues.
2013-02-26 08:58:44 -08:00
Automatic Build Number Updater
05fea3f4f0 Automated update of .build_number to 369 for branch master
Last update: 21af370f3c (1 commits ago)
2013-02-26 09:35:59 -07:00
Bharat Mediratta
06afbcfb64 Merge pull request #165 from shadlaws/followon_autocomplete_loading
Follow-on from autocomplete updates.
2013-02-26 08:35:48 -08:00
Automatic Build Number Updater
21af370f3c Automated update of .build_number to 368 for branch master
Last update: 90d8700d18 (1 commits ago)
2013-02-26 09:35:21 -07:00
Bharat Mediratta
44f658bb8f Merge pull request #166 from shadlaws/update_jquery_20130226
Update jQuery libraries to current as of 2013/02/26, in sync with gallery3-vendor.
2013-02-26 08:34:59 -08:00
Automatic Build Number Updater
90d8700d18 Automated update of .build_number to 367 for branch master
Last update: 6993a88669 (1 commits ago)
2013-02-26 09:34:39 -07:00
Bharat Mediratta
80356e857d Merge pull request #167 from shadlaws/fix_2020
#2020 - Add CLI install argument to set admin password.
2013-02-26 08:34:21 -08:00
Automatic Build Number Updater
6993a88669 Automated update of .build_number to 366 for branch master
Last update: 1d2610d613 (1 commits ago)
2013-02-26 09:32:00 -07:00
Bharat Mediratta
343489c01d Merge pull request #168 from shadlaws/update_jsonjs_20130226
Update to latest JSON-js, in sync with gallery3-vendor
2013-02-26 08:31:23 -08:00
shadlaws
b5bcbf4273 Update to latest JSON-js, in sync with gallery3-vendor
- did this a short while ago, but out of sync with gallery3-vendor and with a different minimizer.
2013-02-26 16:49:17 +01:00
shadlaws
58b9b9b05f #2017, 2019 - Update Flowplayer, fix special character issues. In sync with 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 15:52:32 +01:00
shadlaws
d012cddf78 #2020 - Add CLI install argument to set admin password.
This isn't too useful for end users, but would be really useful for developers
that install Gallery3 over and over again...
2013-02-26 13:36:31 +01:00
shadlaws
62335da791 Follow-on from autocomplete updates.
(9345dde83e, d632ef3e50)
- 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-26 13:07:00 +01:00
shadlaws
3f2d005e5f Update jQuery libraries to current as of 2013/02/26, in sync with gallery3-vendor.
- updated jquery.cookie.js
- updated jquery.form.js
2013-02-26 12:19:51 +01:00
Automatic Build Number Updater
1d2610d613 Automated update of .build_number to 365 for branch master
Last update: e23ec0eda9 (1 commits ago)
2013-02-25 11:39:23 -07:00
Bharat Mediratta
4db3ca7986 Merge pull request #162 from shadlaws/followon_autocomplete_and_panel
Follow-on from autocomplete and gallery.panel.js revisions.
2013-02-25 10:38:52 -08:00
Automatic Build Number Updater
e23ec0eda9 Automated update of .build_number to 364 for branch master
Last update: 59fbf7f14e (1 commits ago)
2013-02-25 11:38:08 -07:00
Bharat Mediratta
fa7d208cf2 Merge pull request #163 from shadlaws/fix_2018
#2018 - Make ui.init.js thumbnail hover effect more robust.
2013-02-25 10:37:59 -08:00
shadlaws
09fbe4c344 #2018 - Make ui.init.js thumbnail hover effect more robust.
- changed thumbnail hover effect to store its original height on mouseenter, then return to it on mouseleave.
- removed previous routine which depended on the height of its siblings and was incompatible with some IE versions.
2013-02-25 17:13:10 +01:00
shadlaws
f980608987 Follow-on from autocomplete and gallery.panel.js revisions.
(9345dde83e, d632ef3e50, fd012276cb)
- 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-25 15:09:42 +01:00
Automatic Build Number Updater
59fbf7f14e Automated update of .build_number to 363 for branch master
Last update: 22ce7e0795 (1 commits ago)
2013-02-23 17:17:19 -07:00
Bharat Mediratta
d95953aa2f Merge pull request #158 from shadlaws/fix_2012
#2012 - Clean up gallery.in_place_edit.js.
2013-02-23 16:16:59 -08:00
Automatic Build Number Updater
22ce7e0795 Automated update of .build_number to 362 for branch master
Last update: 261dccc5bc (1 commits ago)
2013-02-23 17:16:42 -07:00
Bharat Mediratta
e64bb4d17f Merge pull request #161 from shadlaws/jquery_ui_1_10_1
Update jQuery-UI from v1.10.0 to v1.10.1
2013-02-23 16:16:07 -08:00
Automatic Build Number Updater
261dccc5bc Automated update of .build_number to 361 for branch master
Last update: d811d63c51 (1 commits ago)
2013-02-23 17:07:34 -07:00