summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-03-11Merge pull request #207 from shadlaws/fix_siblings_callbackBharat Mediratta
Fix Theme_View::siblings bug - limit and offset reversed in sibling_callback.
2013-03-11Automated update of .build_number to 392 for branch masterAutomatic Build Number Updater
Last update: ff5f386320b150fe3e33440c0dba4c71bc1830ef (1 commits ago) [ci skip]
2013-03-11Merge pull request #206 from shadlaws/fix_2050Bharat Mediratta
#2050 - Update Admin_View to handle events like Theme_View.
2013-03-11Fix Theme_View::siblings bug - limit and offset reversed in sibling_callback.shadlaws
I wonder if this could be causing some random issues I see on the forums...
2013-03-11Automated update of .build_number to 391 for branch masterAutomatic Build Number Updater
Last update: 24e720b48ea7ca8892374431727d42d9d1eac486 (1 commits ago) [ci skip]
2013-03-11Merge pull request #205 from shadlaws/fix_2053Bharat Mediratta
#2053 - Change all .bind() to .on() for jQuery future-proofing.
2013-03-11Automated update of .build_number to 390 for branch masterAutomatic Build Number Updater
Last update: 5c137b655ba525da08e0a5d8eeeb5e9224651aaf (1 commits ago) [ci skip]
2013-03-11Merge pull request #203 from shadlaws/fix_2052Bharat Mediratta
#2052 - Revise gallery.show_full_size.js: update for new jQuery, refactor.
2013-03-11Automated update of .build_number to 389 for branch masterAutomatic Build Number Updater
Last update: 2478bb06fde719598e090908a8f08396adb81517 (1 commits ago) [ci skip]
2013-03-11Merge pull request #200 from shadlaws/fix_2048Bharat Mediratta
#2048 - Remove unneeded jquery.autocomplete.css/js inclusions.
2013-03-11Automated update of .build_number to 388 for branch masterAutomatic Build Number Updater
Last update: 4d631a4cad515984fd202fbaa124b6a01f156379 (1 commits ago) [ci skip]
2013-03-11Merge pull request #199 from shadlaws/unit_test_fix_20130310Bharat Mediratta
Follow-on fix: if tests throw an exception, don't throw another by calling an undefined variable.
2013-03-11#2053 - Change all .bind() to .on() for jQuery future-proofing.shadlaws
- 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#2052 - Revise gallery.show_full_size.js: update for new jQuery, refactor.shadlaws
- fixed for new jQuery. - removed unnecessary CSS. - fixed bug where small images would get oversized when the window was resized. - refactored a few other things.
2013-03-11#2050 - Update Admin_View to handle events like Theme_View.shadlaws
- 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-10#2048 - Remove unneeded jquery.autocomplete.css/js inclusions.shadlaws
- removed autocomplete.css/js calls in server_add, tag, and g2_import. - revised xss_data.txt golden file (line number changes only).
2013-03-10Follow-on fix: if tests throw an exception, don't throw another by calling ↵shadlaws
an undefined variable.
2013-03-09Automated update of .build_number to 387 for branch masterAutomatic Build Number Updater
Last update: e2cc29a61a0cb2c60e015841af983d3a6572a9d9 (1 commits ago) [ci skip]
2013-03-09Merge pull request #196 from shadlaws/fix_2046Bharat Mediratta
#2046 - Change Gallery over to using MediaElementJS as its movie player
2013-03-09Automated update of .build_number to 386 for branch masterAutomatic Build Number Updater
Last update: 2b8fdd3b9031f130347107de90ebb3d8da0aa7c8 (1 commits ago) [ci skip]
2013-03-09Merge pull request #195 from jozefs/masterBharat Mediratta
Add Vagrant-related files to .gitignore
2013-03-09Automated update of .build_number to 385 for branch masterAutomatic Build Number Updater
Last update: 43f2c4ecaace42731e794203b6827a0cefc7b450 (1 commits ago) [ci skip]
2013-03-09Merge pull request #197 from shadlaws/followon_2003Bharat Mediratta
Follow-on to #2003 - Fix innocuous typo (unneeded semi-colon).
2013-03-09Automated update of .build_number to 384 for branch masterAutomatic Build Number Updater
Last update: f5475535a2b4107709caeec6f74ce76465dbb632 (1 commits ago) [ci skip]
2013-03-09Merge pull request #198 from shadlaws/followon_1935Bharat Mediratta
Follow-on to #1935 - Ensure ffmpeg is executable, remove possible doubled "/"
2013-03-09Follow-on to #1935 - Ensure ffmpeg is executable, remove possible doubled "/".shadlaws
- movie::find_ffmpeg - made it use is_executable instead of just file_exists. - system::find_binary - removed possible doubled "/" in paths.
2013-03-09Remove Flash Flowplayer v3.shadlaws
2013-03-09#2046 - Change Gallery over to using MediaElementJS as its movie player.shadlaws
2013-03-09Add Vagrant files to .gitignore.Jozef Selesi
Trac-Ticket: #2047
2013-03-08Add MediaElementJS to handle HTML5/Flash/Silverlight video and audio.shadlaws
2013-03-08Remove HTML5 Flowplayer v5.shadlaws
2013-03-08Follow-on to #2003 - Fix innocuous typo (unneeded semi-colon).shadlaws
2013-03-07Automated update of .build_number to 383 for branch masterAutomatic Build Number Updater
Last update: 8dc54495411b5c7c728efccece81b3c41dd2b201 (1 commits ago) [ci skip]
2013-03-07Merge pull request #194 from shadlaws/fix_2015_extjs_340Bharat Mediratta
#2015 - Update ExtJS to 3.4.0 (in sync with gallery3-vendor).
2013-03-07Automated update of .build_number to 382 for branch masterAutomatic Build Number Updater
Last update: d7ceab5608134c7eadf6ffe2375a501d0e488508 (1 commits ago) [ci skip]
2013-03-07Merge pull request #193 from shadlaws/readme_31_updateBharat Mediratta
Update README.md to say 3.1+ instead of 3.0+.
2013-03-07#2015 - Update ExtJS to 3.4.0 (in sync with gallery3-vendor).shadlaws
2013-03-07Update README.md to say 3.1+ instead of 3.0+.shadlaws
2013-03-06Automated update of .build_number to 381 for branch masterAutomatic Build Number Updater
Last update: f50590127f960a59a25e4daff16d0c98d062b712 (1 commits ago) [ci skip]
2013-03-06Merge pull request #192 from jozefs/masterBharat Mediratta
Fix README.md so new packaging code doesn't bomb out
2013-03-07Add newline after code block so packaging doesn't complain.Jozef Selesi
2013-03-06Automated update of .build_number to 380 for branch masterAutomatic Build Number Updater
Last update: f9939e282bc79ef6e7ac3c81c80897c3d76270b9 (1 commits ago) [ci skip]
2013-03-06Only build 3.0.x, 3.1.x and master branchesBharat Mediratta
2013-03-06Automated update of .build_number to 379 for branch masterAutomatic Build Number Updater
Last update: 97a156d530b22d190f2c227105fd279a049ac76d (1 commits ago) [ci skip]
2013-03-06Follow-on fix: count errors as well as test failures.Bharat Mediratta
2013-03-06Automated update of .build_number to 378 for branch masterAutomatic Build Number Updater
Last update: 121fee8c4e8ee88017df017eaf0638cde2dd8ec5 (4 commits ago) [ci skip]
2013-03-06Merge branch 'master' of github.com:gallery/gallery3Bharat Mediratta
2013-03-06Set exit status to the number of failed tests. This should fix issues with ↵Bharat Mediratta
Travis.
2013-03-06Revert "Return "1" to CLI if not all unit tests pass.". We're not successfullyBharat Mediratta
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 4fe07c6b0a341b0b99ee1b051f7c0bdfda572e04. Conflicts: modules/gallery_unit_test/controllers/gallery_unit_test.php
2013-03-06Automated update of .build_number to 377 for branch masterAutomatic Build Number Updater
Last update: 121fee8c4e8ee88017df017eaf0638cde2dd8ec5 (1 commits ago) [ci skip]