stian/gallery3
1
0
Fork 0
mirror of https://github.com/Pathduck/gallery3.git synced 2026-06-16 15:09:55 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity
7,522 Commits 4 Branches 0 Tags
a5700a2f3cee5ef02ae1bba97bf8b2cdac8fa4a2
Commit Graph

7522 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
7d9276963e Remove Flash Flowplayer v3. 2013-03-09 12:52:09 +01:00
shadlaws
18f38f0dff #2046 - Change Gallery over to using MediaElementJS as its movie player. 2013-03-09 12:51:45 +01:00
Jozef Selesi
7bb24c3160 Add Vagrant files to .gitignore. 
Trac-Ticket: #2047
 2013-03-09 02:48:19 +01:00
shadlaws
5665728096 Add MediaElementJS to handle HTML5/Flash/Silverlight video and audio. 2013-03-08 20:51:10 +01:00
shadlaws
717bab9312 Remove HTML5 Flowplayer v5. 2013-03-08 15:22:18 +01:00
shadlaws
5d1033454c Follow-on to #2003 - Fix innocuous typo (unneeded semi-colon). 2013-03-08 12:53:23 +01:00
Automatic Build Number Updater
f5475535a2 Automated update of .build_number to 383 for branch master 
Last update: 8dc5449541 (1 commits ago)
[ci skip]
 2013-03-07 11:40:30 -07:00
Bharat Mediratta
8b47bad74b Merge pull request #194 from shadlaws/fix_2015_extjs_340 
#2015 - Update ExtJS to 3.4.0 (in sync with gallery3-vendor).
 2013-03-07 10:40:03 -08:00
Automatic Build Number Updater
8dc5449541 Automated update of .build_number to 382 for branch master 
Last update: d7ceab5608 (1 commits ago)
[ci skip]
 2013-03-07 11:36:38 -07:00
Bharat Mediratta
a2c615c0e9 Merge pull request #193 from shadlaws/readme_31_update 
Update README.md to say 3.1+ instead of 3.0+.
 2013-03-07 10:36:03 -08:00
shadlaws
8b3897915c #2015 - Update ExtJS to 3.4.0 (in sync with gallery3-vendor). 2013-03-07 15:54:13 +01:00
shadlaws
cd83b06ab0 Update README.md to say 3.1+ instead of 3.0+. 2013-03-07 10:11:14 +01:00
Automatic Build Number Updater
d7ceab5608 Automated update of .build_number to 381 for branch master 
Last update: f50590127f (1 commits ago)
[ci skip]
 2013-03-06 16:14:25 -07:00
Bharat Mediratta
ab5be078d2 Merge pull request #192 from jozefs/master 
Fix README.md so new packaging code doesn't bomb out
 2013-03-06 15:14:12 -08:00
Jozef Selesi
e8552f4e61 Add newline after code block so packaging doesn't complain. 2013-03-07 00:10:36 +01:00
Automatic Build Number Updater
f50590127f Automated update of .build_number to 380 for branch master 
Last update: f9939e282b (1 commits ago)
[ci skip]
 2013-03-06 15:32:37 -07:00
Bharat Mediratta
9e9c32b6d6 Only build 3.0.x, 3.1.x and master branches 2013-03-06 17:30:58 -05:00
Automatic Build Number Updater
f9939e282b Automated update of .build_number to 379 for branch master 
Last update: 97a156d530 (1 commits ago)
[ci skip]
 2013-03-06 15:07:53 -07:00
Bharat Mediratta
59ea4a6a31 Follow-on fix: count errors as well as test failures. 2013-03-06 17:04:54 -05:00
Automatic Build Number Updater
97a156d530 Automated update of .build_number to 378 for branch master 
Last update: 121fee8c4e (4 commits ago)
[ci skip]
 2013-03-06 14:46:45 -07:00
Bharat Mediratta
1c27c6a706 Merge branch 'master' of github.com:gallery/gallery3 2013-03-06 16:46:18 -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
Automatic Build Number Updater
1752929a7a Automated update of .build_number to 377 for branch master 
Last update: 121fee8c4e (1 commits ago)
[ci skip]
 2013-03-06 14:14:21 -07: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
Automatic Build Number Updater
121fee8c4e Automated update of .build_number to 376 for branch master 
Last update: 0d05e91cd3 (16 commits ago)
 2013-03-06 12:53:36 -07: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
b8e0bbafc4 Travis doesn't have PHP 5.2.3. Test against 5.3 / 5.4 / 5.5. 2013-03-05 21:36:47 -05:00
Bharat Mediratta
1830839b75 Test against 5.2.3, our minimum version. 
Also test against 5.3, 5.4 and 5.5 to be forward looking
 2013-03-05 21:34:43 -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
Bharat Mediratta
7fd7b10108 Merge pull request #190 from shadlaws/fix_2040 
#2040 - Deactivate modules that no longer exist.
 2013-03-05 08:51:43 -08:00
Bharat Mediratta
e630ab9bdc Merge pull request #189 from jozefs/markdown 
Convert README to Markdown and show build status badge
 2013-03-05 08:47:52 -08: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
Jozef Selesi
ef1ae582bb Add Travis CI build status badge to README. 2013-03-05 10:30:16 +01:00
Jozef Selesi
d449eabe7f Convert README to Markdown. 2013-03-05 10:30:12 +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
Bharat Mediratta
20614e29c0 Merge pull request #186 from jozefs/travis 
Integrate with Travis CI
 2013-03-04 15:11:26 -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
d5f3dfafda Travis CI integration. 2013-03-04 23:29:51 +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
Bharat Mediratta
8d05571fa3 Merge pull request #178 from shadlaws/fix_2033 
#2033 - Add Flowplayer 5 to play HTML5 videos.
 2013-03-03 14:23:18 -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