web/video.js
1
0
Fork 0
mirror of https://github.com/videojs/video.js.git synced 2025-02-08 12:05:47 +02:00
Code Releases Activity
1,201 Commits 20 Branches 522 Tags
Commit Graph

1201 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gary Katsevman
e35083bc28 Monkeypatch canPlayType on Android 4.0+ for HLS 
Android devices starting with 4.0 can play HLS natively to some extent.
However, they do not say so in the canPlayType method. This commit
monkey patches canPlayType to respond with "maybe" for
"application/x-mpegURL" and "application/vnd.apple.mpegURL". Otherwise,
it'll fallback to the original canPlayType method.
 2014-03-13 16:34:29 -04:00
Steve Heffernan
e7b1098563 Merge branch 'master' of github.com:videojs/video.js 2014-03-06 13:18:58 -08:00
Steve Heffernan
a64a5e27cf 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-03-06 13:18:49 -08:00
Steve Heffernan
bdeaae1c92 Release 4.4.3 v4.4.3 2014-03-06 13:15:53 -08:00
Steve Heffernan
e2b2d14f48 Added line to the changelog 2014-03-06 12:55:25 -08:00
Steve Heffernan
96c274de63 Merge branch 'patch/setposter-export' of git://github.com/heff/video-js into heff-patch/setposter-export 2014-03-06 12:49:36 -08:00
Steve Heffernan
6244c39129 Added line to the changelog 2014-03-06 12:48:12 -08:00
Steve Heffernan
e4b269e294 Added an IIFE to prevent deoptimization 2014-03-06 12:36:36 -08:00
Steve Heffernan
54609dc3f5 Merge pull request #1061 from frankhereford/master 
Update the Readme.md file with the current year.
 2014-03-05 16:16:04 -08:00
Steve Heffernan
2005fe2136 Exporting tech.setPoster(). Fixes #1028 2014-03-05 16:08:49 -08:00
frankhereford
efd4822c6b Update the Readme.md file with the current year. 2014-03-05 17:44:07 -06:00
Steve Heffernan
d538debb1d Added try/catch to protect against IE with no Media Player 2014-03-05 15:04:04 -08:00
Steve Heffernan
48230ea1a1 Added line to changelog 2014-03-05 13:42:32 -08:00
Steve Heffernan
661cbd1eb0 Close GH-1059: Added a grunt task for opening the next issue that needs to be addressed. 2014-03-05 13:41:26 -08:00
Steve Heffernan
fe2b702e32 Merge branch 'stable' 2014-03-04 11:33:35 -08:00
Steve Heffernan
d47435a18f Merge pull request #1057 from paolodina/patch-1 
Update setup.md
 2014-03-04 11:33:12 -08:00
Steve Heffernan
7c772fbf3e Merge branch 'bugfix/src-getter' of git://github.com/dmlap/video-js into dmlap-bugfix/src-getter 
Conflicts:
	src/js/media/flash.js
 2014-03-04 11:24:10 -08:00
Paolo Dina
4116d9ec14 Update setup.md 2014-03-04 20:13:14 +01:00
David LaPalomento
f155814cd9 Merge pull request #1 from heff/bugfix/src-getter 
Made the src method return the player when setting
 2014-03-04 14:11:56 -05:00
Steve Heffernan
a0f929dd57 Added line to the changelog 2014-03-04 09:32:28 -08:00
Lee Whitaker
cc5e515360 Use .npmignore to package a smaller subset of videojs for distribution. Make sure to include the video-js.less file for the designer to use. 2014-03-04 09:50:58 -05:00
Steve Heffernan
2e26703162 Fixed captions positioning when player isn't playing 2014-03-03 13:47:16 -08:00
Steve Heffernan
0ad8abfef1 Added line to the change log 2014-03-03 13:37:46 -08:00
Steve Heffernan
61883ab4e2 Merge branch 'master' of git://github.com/harhoo/video.js into harhoo-master 2014-03-03 13:33:34 -08:00
Steve Heffernan
0f854c751b Merge branch 'stable' 2014-03-03 13:32:51 -08:00
Steve Heffernan
5b133823e5 Updated contrib.json with feature workflow 2014-03-03 13:32:21 -08:00
harhoo
3e19d7621a Whitespace changes 2014-03-03 15:31:47 +00:00
harhoo
b0a6cf335a Move captions down when controls are inactive 2014-03-03 10:26:51 +00:00
Steve Heffernan
ed78764379 Updated changelog 2014-02-27 17:57:20 -08:00
Steve Heffernan
7f44942c9b Merge branch 'add/component-support' of git://github.com/peteschaffner/video.js into peteschaffner-add/component-support 2014-02-27 17:55:29 -08:00
Steve Heffernan
e9da3350d4 Made the src method return the player when setting, and made Flash return the current srouce for flash.src() 2014-02-27 17:34:01 -08:00
Steve Heffernan
c6c49ac580 Merge pull request #1040 from ange007/patch-2 
There was no semicolon
 2014-02-25 16:03:00 -08:00
Pete Schaffner
4b0db76d77 Bump version 2014-02-25 15:32:45 +01:00
Vladimir B.
6b28ba268a There was no semicolon 
There was no semicolon
 2014-02-25 13:11:03 +02:00
Pete Schaffner
5146c1fa4a Add component.json file 2014-02-25 07:19:24 +01:00
Steve Heffernan
b98d719564 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-02-24 22:03:34 -08:00
Steve Heffernan
7aefee5d7d Release 4.4.2 v4.4.2 2014-02-24 21:57:43 -08:00
Steve Heffernan
c1e623bed7 Added line to the changelog 2014-02-24 21:51:56 -08:00
Steve Heffernan
333db84510 Made module.exports a string key so it'd be exported. fixes #1033 2014-02-24 21:19:06 -08:00
Steve Heffernan
8f40fa4548 Merge branch 'stable' 2014-02-24 21:15:24 -08:00
Steve Heffernan
9c282811e1 Merge pull request #1037 from heff/patch/patch 
Added patch process to contrib.json
 2014-02-24 21:13:26 -08:00
Steve Heffernan
d68f5a93a5 Updated contrib.json with patch commands 2014-02-24 21:10:29 -08:00
Steve Heffernan
1dd8a15655 Updated contrib patch process 2014-02-24 11:32:35 -08:00
Steve Heffernan
3336f1fe02 Merge branch 'stable' 2014-02-19 12:49:47 -08:00
Steve Heffernan
4fe74d52a9 Updated the CDN links in the setup guide 2014-02-19 12:49:29 -08:00
Steve Heffernan
0d58df8edb Merge branch 'stable' 2014-02-18 17:18:25 -08:00
Steve Heffernan
f135b97ce0 Fixed the version numbers in the changelog 2014-02-18 17:17:58 -08:00
Steve Heffernan
051657334f Removed dist files 2014-02-18 17:04:21 -08:00
Steve Heffernan
7be94c3882 Release 4.4.1 v4.4.1 2014-02-18 17:04:02 -08:00
Steve Heffernan
4f66e09595 Updated changelog 2014-02-18 16:58:11 -08:00