web/video.js
1
0
Fork 0
mirror of https://github.com/videojs/video.js.git synced 2024-11-26 08:51:09 +02:00
Code Releases Activity
1,485 Commits 20 Branches 519 Tags 150 MiB
e72d682028
Commit Graph

1485 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matthew McClure
e72d682028 added timeout fix and tests. 2014-09-02 12:39:08 -07:00
Steve Heffernan
1aabc440b6 Merge branch 'master' of https://github.com/videojs/video.js 2014-09-02 11:07:37 -07:00
Steve Heffernan
c5bd01160a Added line to the changelog for #1409 2014-09-02 11:06:30 -07:00
Steve Heffernan
82aa55795e Removed html5Mock var declarations and fixed whitespace 2014-09-02 11:04:30 -07:00
Steve Heffernan
7c27add29d Merge branch 'issue-1408' of github.com:glencoesoftware/video.js into glencoesoftware-issue-1408 2014-09-02 11:00:36 -07:00
Matthew McClure
11b592ae01 Update CONTRIBUTING.md 
Getting rid of some out of date info about Karma configuration.
 2014-09-02 10:39:33 -07:00
Andreas Knab
c4b4ebea4a Remove unneeded html5Mock 2014-08-28 12:28:07 +02:00
Steve Heffernan
1f33546f90 Added a line to the change log for #1455 2014-08-27 15:33:48 -07:00
Steve Heffernan
521f0eb941 Merge branch 'songpete-patch-1' 2014-08-27 15:31:15 -07:00
Steve Heffernan
22aa758067 Merge branch 'patch-1' of github.com:songpete/video.js into songpete-patch-1 2014-08-27 15:15:32 -07:00
Steve Heffernan
537ae2b805 Merge pull request #1435 from dmlap/test-manual-tracking 
Add test for manual time tracking and dispose
 2014-08-27 13:26:48 -07:00
Steve Heffernan
fc0d37daec Merge branch 'guardian-html5-src-fix' 2014-08-27 13:12:46 -07:00
Steve Heffernan
2a9f1cdaac Added a line to the changelog for #1430 2014-08-27 13:11:55 -07:00
Steve Heffernan
87e25dd38e Merge branch 'html5-src-fix' of github.com:guardian/video.js into guardian-html5-src-fix 2014-08-27 13:08:02 -07:00
Steve Heffernan
16321d6208 Added line to the changelog for #1426 2014-08-27 13:05:33 -07:00
Steve Heffernan
34a8d64c04 Merge pull request #1426 from andekande/germantranslation 
german Translation based on es.json
 2014-08-27 12:59:50 -07:00
Pete Song
58c081f154 Bind 'onKeyPress' during keydown instead of keyup. 
Binding during keydown will be more effective at preventing certain default behavior like moving the page down as these events may happen prior to keyup. Addresses #1452
 2014-08-26 20:45:39 -04:00
Andreas Knab
49f58e0bbd Switch to sinon fake timers 2014-08-25 16:42:58 +02:00
Andreas Knab
f716807852 Add test cases for default and disabled timeout 2014-08-25 11:35:06 +02:00
Andreas Knab
6d65871cb0 Add simple inactivityTimeout test 2014-08-25 11:28:52 +02:00
Steve Heffernan
055d81dc3a Merge branch 'stable' 
Conflicts:
	dist/video-js/video-js.css
	dist/video-js/video-js.min.css
	dist/video-js/video.dev.js
	dist/video-js/video.js
 2014-08-20 15:17:08 -07:00
Steve Heffernan
760eb308db Release 4.7.3 2014-08-20 15:16:22 -07:00
Steve Heffernan
03059c17d8 Added line to the changelog for #1424 2014-08-20 15:12:12 -07:00
Eric Berdahl
5ee97ea9a1 Publish (i.e. prevent closure compiler from obfuscating name of) videojs.Player.prototype.selectSource function. This allows developers to provide their own algorithms for selecting which source a Player should use. 2014-08-20 15:11:58 -07:00
Steve Heffernan
5761ab33bd Added line to the changelog for #1427 2014-08-20 15:07:52 -07:00
Tom Johnson
c19a3f3f48 add fix for localization of not supported message 
add base documentation for language support

typo fix

added utility function for adding languages per conversation with @heff. Includes test.

move addLanguage to core. update both core and util tests. added export property

added language sandbox for demo

fix comment

doc udpate

remove build instructions

add addLanguage API to doc

fix deep merge in test

test update

update local reference to string for compiled tests
 2014-08-20 15:04:30 -07:00
Steve Heffernan
a888108e2c Merge pull request #1422 from SunnyLi/patch-1 
Fix typo in video tracks documentation
 2014-08-20 13:00:32 -07:00
David LaPalomento
a1eb8dd975 Add test for manual time tracking and dispose 
Make sure time and progress event synthesis is turned off after the tech is disposed.For #1431.
 2014-08-20 14:39:02 -04:00
Matt Osborn
21f2d3c150 fixing techGet for HTML5 src method 2014-08-19 17:04:31 +01:00
Jan Hesse
dd0c7efa60 german Translation based on es.json 2014-08-18 13:11:05 +02:00
Sunny Li
ec61386f47 Fix typo in video tracks documentation 
small typo
 2014-08-16 12:45:31 -04:00
Andreas Knab
98edeccb3f Allow disabling of inactivity timeout 2014-08-15 14:39:49 +02:00
Steve Heffernan
342bdce748 Merge branch 'stable' 
Conflicts:
	dist/video-js/video-js.css
	dist/video-js/video-js.min.css
	dist/video-js/video-js.swf
	dist/video-js/video.dev.js
	dist/video-js/video.js
 2014-08-14 16:32:26 -07:00
Steve Heffernan
7baa40220f Release 4.7.2 2014-08-14 16:31:27 -07:00
Steve Heffernan
aaab1500c8 Added line to the changelog for #1417 2014-08-14 16:29:39 -07:00
Steve Heffernan
487c05628c Fixed console log tests that were breaking in IE8 2014-08-14 16:15:13 -07:00
David LaPalomento
dfdbdbc9bb Bump SWF to 4.4.3 
Pick up updated flash compiler settings.
 2014-08-14 15:09:06 -07:00
David LaPalomento
f037818656 Don't dynamically turn off progress events 
The major browsers that support HTML video now reliably support progress events, so don't worry about synthesizing them for HTML anymore.
 2014-08-14 15:08:54 -07:00
David LaPalomento
f4ce62d4b1 Move manual events into tech controller 
Migrate the timers that manage creating timeupdate and progress events when the tech doesn't support them natively. Now, techs that extend MediaTechController will continue to automatically pick up synthetic playback and buffering events but they're scoped much more closely to the entity that needs them. In addition, time and progress tracking have been moved much earlier into the component initialization which fixes #1414.
 2014-08-14 15:08:37 -07:00
Andreas Knab
0b4737d209 Allow per-player setting of inactivityTimeout 2014-08-12 13:20:48 +02:00
Andreas Knab
3cfbf94245 Fix issue with minified version 2014-08-12 13:20:35 +02:00
Andreas Knab
e4a0d264d6 Make inactivity timeout configurable 2014-08-11 11:01:15 +02:00
Steve Heffernan
7f4e6eb432 Removed dist files 2014-08-06 11:27:17 -07:00
Steve Heffernan
692a0e9c09 Release 4.7.1 2014-08-06 11:26:56 -07:00
Steve Heffernan
a7d6c350e7 Added line to changelog for #1401 2014-08-06 11:24:41 -07:00
Steve Heffernan
9e34570c0f Merge pull request #1401 from jabes/patch-1 
Prevent EMALFORMED errors with bower.json
 2014-08-06 11:18:38 -07:00
Justin Bull
c529f0898d Update bower.json 
Prevent EMALFORMED errors with bower.
 2014-08-05 19:08:39 -07:00
Steve Heffernan
3bf4afc831 Removed dist files 2014-08-05 18:09:20 -07:00
Steve Heffernan
f3d7196a73 Release 4.7.0 2014-08-05 18:05:38 -07:00
Steve Heffernan
7ea1d8f544 Modified language json structure to not include the code. 
Also removed languages from being combined with core until we add the ability to choose languages.
 2014-08-05 17:48:00 -07:00