Commit Graph

4673 Commits

Author SHA1 Message Date
Bharat Mediratta
cc80fa035a Merge pull request #207 from shadlaws/fix_siblings_callback
Fix Theme_View::siblings bug - limit and offset reversed in sibling_callback.
2013-03-11 16:35:20 -07:00
Bharat Mediratta
243e3b66ca Merge pull request #206 from shadlaws/fix_2050
#2050 - Update Admin_View to handle events like Theme_View.
2013-03-11 16:32:55 -07:00
shadlaws
b6dc597c66 Fix Theme_View::siblings bug - limit and offset reversed in sibling_callback.
I wonder if this could be causing some random issues I see on the forums...
2013-03-11 23:10:27 +01:00
Bharat Mediratta
313f2abc0c Merge pull request #205 from shadlaws/fix_2053
#2053 - Change all .bind() to .on() for jQuery future-proofing.
2013-03-11 09:46:00 -07:00
Bharat Mediratta
12508a71e0 Merge pull request #200 from shadlaws/fix_2048
#2048 - Remove unneeded jquery.autocomplete.css/js inclusions.
2013-03-11 09:30:26 -07:00
shadlaws
2e94edab53 #2053 - Change all .bind() to .on() for jQuery future-proofing.
- on/off are preferred to bind/unbind, live/die, and delegate/undelegate in jQuery 1.7+
- they're likely on the road toward deprecation, so let's replace them now.
2013-03-11 17:16:20 +01:00
shadlaws
c137740e26 #2050 - Update Admin_View to handle events like Theme_View.
- changed Admin_View event handling to reflect that of Theme_View
(gallery_theme gets called first, admin theme gets called last,
debug mode isn't called for body_attributes and gets g-clear-fix)
2013-03-11 11:40:15 +01:00
shadlaws
b43349f4de #2048 - Remove unneeded jquery.autocomplete.css/js inclusions.
- removed autocomplete.css/js calls in server_add, tag, and g2_import.
- revised xss_data.txt golden file (line number changes only).
2013-03-10 22:08:16 +01:00
shadlaws
b036b8acc0 Follow-on fix: if tests throw an exception, don't throw another by calling an undefined variable. 2013-03-10 11:27:10 +01:00
Bharat Mediratta
0899528ff5 Merge pull request #196 from shadlaws/fix_2046
#2046 - Change Gallery over to using MediaElementJS as its movie player
2013-03-09 14:33:47 -08:00
Bharat Mediratta
a01ec9ff5f Merge pull request #197 from shadlaws/followon_2003
Follow-on to #2003 - Fix innocuous typo (unneeded semi-colon).
2013-03-09 14:00:39 -08:00
shadlaws
de3f9edb88 Follow-on to #1935 - Ensure ffmpeg is executable, remove possible doubled "/".
- movie::find_ffmpeg - made it use is_executable instead of just file_exists.
- system::find_binary - removed possible doubled "/" in paths.
2013-03-09 15:59:23 +01:00
shadlaws
18f38f0dff #2046 - Change Gallery over to using MediaElementJS as its movie player. 2013-03-09 12:51:45 +01:00
shadlaws
5d1033454c Follow-on to #2003 - Fix innocuous typo (unneeded semi-colon). 2013-03-08 12:53:23 +01:00
shadlaws
8b3897915c #2015 - Update ExtJS to 3.4.0 (in sync with gallery3-vendor). 2013-03-07 15:54:13 +01:00
Bharat Mediratta
59ea4a6a31 Follow-on fix: count errors as well as test failures. 2013-03-06 17:04:54 -05:00
Bharat Mediratta
f0064643c2 Set exit status to the number of failed tests. This should fix issues with Travis. 2013-03-06 16:45:38 -05:00
Bharat Mediratta
feed100337 Revert "Return "1" to CLI if not all unit tests pass.". We're not successfully
passing back $all_passed because the function doesn't take it by reference.  Which
is my fault because I gave Jozefs bad advice.  But I don't think it's necessary anyway
so I'm going to try a different approach.

This reverts commit 4fe07c6b0a.

Conflicts:
	modules/gallery_unit_test/controllers/gallery_unit_test.php
2013-03-06 16:38:38 -05:00
Bharat Mediratta
d136a035e3 Explicitly print out the exit status to see if I can narrow down failures on Travis. 2013-03-06 16:13:49 -05:00
Bharat Mediratta
dc7bf9486f Follow-on for #2043. Fix some tests that made bad assumptions about
the state of the world.  These were uncovered when we ran the tests on
Travis which runs the tests in a different order than what I (and
apparently others) use on their dev boxes.
2013-03-06 14:33:24 -05:00
Bharat Mediratta
d2577c066b Follow-on to 384bc7afc8 for #2033
Update golden file for XSS test.
2013-03-05 21:27:44 -05:00
Bharat Mediratta
74532b9c94 Remove stray line of debug output. 2013-03-05 13:20:12 -05:00
shadlaws
4b28478776 #2040 - Deactivate modules that no longer exist.
- added module::deactivate_missing_modules()
- revised module::deactivate() to change log message if the module is missing
- added call to new function in module::get_obsolete_modules_message()
- added call to new function when loading admin/maintenance menu
2013-03-05 16:54:41 +01:00
Bharat Mediratta
24475e914f Merge pull request #187 from shadlaws/2033_followon
Follow-on to #2033 - Change variables and js script loading for Flash Fl...
2013-03-04 15:34:11 -08:00
Bharat Mediratta
0fb8e202c9 Merge pull request #185 from shadlaws/minifyjs_20130304
Minify (and re-minify) JS libraries (in sync with gallery3-vendor).
2013-03-04 15:32:05 -08:00
Bharat Mediratta
f1884b59f1 Merge pull request #183 from shadlaws/fix_2037
#2037 - Fix bug with "item_before_update" event in item model.
2013-03-04 15:14:04 -08:00
shadlaws
a517d9a33a Follow-on to #2033 - Change variables and js script loading for Flash 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-04 23:44:50 +01:00
Jozef Selesi
4fe07c6b0a Return "1" to CLI if not all unit tests pass. 2013-03-04 23:29:47 +01:00
shadlaws
1544a83279 Minify (and re-minify) JS libraries (in sync with gallery3-vendor).
- minified jQuery libraries.
- re-minified flowplayer, json2-min, and extjs using new minimizer (more efficient, keeps copyrights).
2013-03-04 19:14:47 +01:00
shadlaws
295fadd570 #2037 - Fix bug with "item_before_update" event in item model. 2013-03-03 23:42:02 +01:00
Bharat Mediratta
e772767363 Merge pull request #179 from shadlaws/fix_2034
#2034 - Add webm and ogv as valid movie types.
2013-03-03 14:23:48 -08:00
shadlaws
9d7d6c50bb Follow-on to #2033 - Rename movieplayer.html.php to movieplayer-flash.html.php
- 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 00:45:03 +01:00
shadlaws
e7b224461a #2034 - Add webm and ogv as valid movie types.
- added them to legal_file helper
- revised unit tests
2013-03-03 00:16:38 +01:00
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
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
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
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
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
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
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
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
Bharat Mediratta
0a957c293f Merge pull request #160 from shadlaws/fix_2014
#2014 - Clean up gallery.ajax.js.
2013-02-23 16:07:05 -08:00
shadlaws
b52a533a0f #2014 - Clean up gallery.ajax.js.
- prepend "data-" in front of non-standard attr to be more standards compliant.
- fix formatting.
2013-02-23 21:49:29 +01:00
shadlaws
fd012276cb #2013 - Clean up gallery.panel.js.
- prepend "data-" in front of non-standard attr to be more standards compliant.
2013-02-23 21:29:09 +01:00
Bharat Mediratta
9d6ed037bb Merge branch 'jquery_190' 2013-02-23 01:09:30 -05:00
shadlaws
94aadf03da #2008 - Add warnings if some active modules are obsolete.
- 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-20 17:30:27 +01:00
Bharat Mediratta
1b6bae2e80 Merge pull request #154 from shadlaws/master
Follow-on to fd0051dab7 for #2006.
2013-02-18 16:23:07 -08:00