summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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]
2013-03-06Explicitly print out the exit status to see if I can narrow down failures on ↵Bharat Mediratta
Travis.
2013-03-06Automated update of .build_number to 376 for branch masterAutomatic Build Number Updater
Last update: 0d05e91cd3c5050c25133c864f8b789f499d8e17 (16 commits ago)
2013-03-06Follow-on for #2043. Fix some tests that made bad assumptions aboutBharat Mediratta
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-05Travis doesn't have PHP 5.2.3. Test against 5.3 / 5.4 / 5.5.Bharat Mediratta
2013-03-05Test against 5.2.3, our minimum version.Bharat Mediratta
Also test against 5.3, 5.4 and 5.5 to be forward looking
2013-03-05Follow-on to 384bc7afc86be706bf61def09afc8306cdad2443 for #2033Bharat Mediratta
Update golden file for XSS test.
2013-03-05Remove stray line of debug output.Bharat Mediratta
2013-03-05Merge pull request #190 from shadlaws/fix_2040Bharat Mediratta
#2040 - Deactivate modules that no longer exist.
2013-03-05Merge pull request #189 from jozefs/markdownBharat Mediratta
Convert README to Markdown and show build status badge
2013-03-05#2040 - Deactivate modules that no longer exist.shadlaws
- 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-05Add Travis CI build status badge to README.Jozef Selesi
2013-03-05Convert README to Markdown.Jozef Selesi
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