1
0
mirror of https://github.com/videojs/video.js.git synced 2024-12-14 11:23:30 +02:00
Commit Graph

2478 Commits

Author SHA1 Message Date
Gary Katsevman
1834d39c2f Merge branch 'stable' 2015-10-20 14:00:48 -04:00
Gary Katsevman
49698d2a8c @gkatsev bumped obj.assign to fix uncaught SecurityError in iframes. Fixes #2703. closes #2721 2015-10-20 13:57:21 -04:00
Gary Katsevman
9c28857247 bump object.assign. Fixes #2703 2015-10-20 13:46:55 -04:00
typcn
40b6ad3050 @typcn bumped grunt-sass to ^1.0.0 to support node 4.x. closes #2645 2015-10-19 11:34:57 -04:00
heff
e58c2266de Merge branch 'stable' 2015-10-09 14:14:17 -07:00
heff
0832b89970 Added merge to master process back to the patch accept process 2015-10-09 14:13:23 -07:00
heff
7ce59efa7d Merge branch 'stable' 2015-10-09 14:07:57 -07:00
jrivera
8c101e2b35 @imbcmdth fixed an issue with emulateTextTracks being called before the tech dom was ready. closes #2692 2015-10-09 14:06:55 -07:00
heff
aab9246253 Fixed the branch releases are created from 2015-09-29 16:15:22 -07:00
Steve Heffernan
da09a44eda Updated usage stats in readme 2015-09-29 13:05:26 -07:00
Steve Heffernan
6beb0eb299 Update version in readme code 2015-09-29 13:04:40 -07:00
Matthew McClure
a56781945a Removed unstable warning 2015-09-29 11:39:05 -07:00
heff
872459837b v5.0.0 2015-09-29 09:40:01 -07:00
heff
6354329a1b Removed outdated API docs 2015-09-29 09:31:22 -07:00
heff
cd6c568a03 @imbcmdth fix potential triggerReady infinite loop 2015-09-29 09:28:02 -07:00
heff
e225fbffc2 Merge branch 'master' into stable
Conflicts:
	dist/video-js/video-js.css
	dist/video-js/video-js.less
	dist/video-js/video-js.min.css
	dist/video-js/video-js.swf
	dist/video-js/video.dev.js
	dist/video-js/video.js
	dist/video-js/video.novtt.dev.js
	dist/video-js/video.novtt.js
	src/css/video-js.less
	src/js/control-bar/time-display.js
	src/js/exports.js
	src/js/lib.js
	src/js/media/flash.js
	src/js/media/flash.rtmp.js
	src/js/media/html5.js
	src/js/media/media.js
	src/js/player.externs.js
	test/unit/api.js
	test/unit/flash.js
	test/unit/media.html5.js
	test/unit/media.js
2015-09-29 09:14:50 -07:00
heff
a5dad5ade2 v5.0.0-rc.104 2015-09-28 22:21:17 +00:00
heff
1d79c4a9e2 @heff changed component child lists to arrays instead of objects. closes #2477 2015-09-28 15:17:48 -07:00
heff
c5321f4cbf v5.0.0-rc.103 2015-09-28 20:55:49 +00:00
heff
60c86465f8 @heff improved some skin defaults for external styling. closes #2642 2015-09-28 13:53:37 -07:00
Benoit
1f618d7b00 v5.0.0-rc.102 2015-09-28 18:25:20 +00:00
Benoit Tremblay
2de28927d7 @eXon added support for a tech-supplied poster. closes #2339 2015-09-28 11:23:25 -07:00
Pat
8d9695b6ad v5.0.0-rc.101 2015-09-25 18:16:18 +00:00
Pat O'Neill
ad0820cfa3 @misteroneill fixed tsml to be used as a tag for template strings. closes #2629 2015-09-25 14:13:56 -04:00
heff
992e5e63f5 v5.0.0-rc.100 2015-09-25 15:25:18 +00:00
heff
f6dca78c5e Fixed a contrib.json error 2015-09-25 11:23:28 -04:00
Gary Katsevman
0b7cf586c2 @gkatsev exposed isCrossOrigin and used it to enable CORS for textTrack XHRs. closes #2633 2015-09-24 19:58:25 -04:00
Pat O'Neill
1234faaf71 @misteroneill updated play control to use its state for icon. closes #2636 2015-09-24 16:37:10 -04:00
heff
f5b80c8ea9 Updated the contrib release process for 5.0
Also unescaped changelog entries in contrib pr accept

--skip-ci
2015-09-23 17:26:04 -04:00
heff
2c10c7f310 v5.0.0-rc.99 2015-09-23 16:36:55 +00:00
heff
81806d5725 @heff fixed timeranges deprecation warnings in tests. closes #2627 2015-09-23 12:34:59 -04:00
heff
9788112e76 v5.0.0-rc.98 2015-09-23 16:31:12 +00:00
heff
42468e19be @heff removed a second copy of video.novtt.js from dist. closes #2630 2015-09-23 12:29:22 -04:00
Matthew
ba6018d4ea v5.0.0-rc.97 2015-09-22 23:55:38 +00:00
Matthew McClure
e121428565 moved actual grunt file to build dir 2015-09-22 15:58:42 -07:00
Pat
2be7263ac3 v5.0.0-rc.96 2015-09-22 15:46:50 +00:00
Pat O'Neill
3f8be868bd @misteroneill re-exposed videojs.TextTrack. closes #2625 2015-09-22 11:41:39 -04:00
jforbes
8fbe0a947f v5.0.0-rc.95 2015-09-22 15:39:08 +00:00
jforbes
1f06f23ded @forbesjo removed the PhantomJS dependency. closes #2622 2015-09-22 11:32:23 -04:00
Pat
d072d9b371 v5.0.0-rc.94 2015-09-22 15:21:08 +00:00
Pat O'Neill
61a00db7cb @misteroneill rename "extends" to "extend" for ie8. closes #2624 2015-09-22 11:19:04 -04:00
jrivera
a0b4293b82 v5.0.0-rc.93 2015-09-21 22:05:46 +00:00
jrivera
24ad9841ac @imbcmdth extended createTimeRange to support multiple timeranges. closes #2604 2015-09-21 18:04:10 -04:00
Gary
ccedad44ef v5.0.0-rc.92 2015-09-21 21:54:09 +00:00
Gary Katsevman
81000369ec @gkatsev fixed potential double default style elements. closes #2619 2015-09-21 17:52:32 -04:00
heff
651a33a145 v5.0.0-rc.91 2015-09-18 17:31:30 +00:00
heff
51bae4d7cf Fixed a double loadstart and added readyState catch up events
- Fixed some issue comments
 - Fixed a double ready event

closes #2605
fixes #2588
2015-09-18 10:28:16 -07:00
David
968bd7432d v5.0.0-rc.90 2015-09-15 22:28:43 +00:00
David LaPalomento
24cdbdefff Use Raynos/xhr for XMLHttpRequests
- Get rid of our custom XHR shim. Export it as videojs.xhr.
- Updated XHR to be stubbed everywhere in tests to prevent errors.
- Added npm install to the review process

closes #2318
closes #2594
2015-09-15 15:25:11 -07:00
heff
0c416bd286 v5.0.0-rc.89 2015-09-15 20:04:00 +00:00