web/video.js
1
0
Fork 0
mirror of https://github.com/videojs/video.js.git synced 2025-01-25 11:13:52 +02:00
Code Releases Activity

Merge branch 'stable'

Browse Source 
Conflicts:
	dist/video-js/video-js.css
	dist/video-js/video-js.min.css
	dist/video-js/video-js.swf
	dist/video-js/video.js
This commit is contained in:
Steve Heffernan 2014-09-25 14:18:03 -07:00
commit 2a71d69c72
4 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -6,6 +6,9 @@ CHANGELOG
--------------------
## 4.8.5 (2014-09-25)
* Updated to the latest version of the swf to fix HLS playback ([view](https://github.com/videojs/video.js/pull/1538))
## 4.8.4 (2014-09-23)
* @gkatsev fixed isFullscreen reporting on iOS devices ([view](https://github.com/videojs/video.js/pull/1511))

2
bower.json
View File

@ -1,7 +1,7 @@
{
"name": "video.js",
"description": "An HTML5 and Flash video player with a common API and skin for both.",
"version": "4.8.4",
"version": "4.8.5",
"main": [
"dist/video-js/video.js",
"dist/video-js/video-js.css"

2
component.json
View File

@ -1,7 +1,7 @@
{
"name": "video.js",
"description": "An HTML5 and Flash video player with a common API and skin for both.",
"version": "4.8.4",
"version": "4.8.5",
"keywords": [
"videojs",
"html5",

4
package.json
View File

@ -1,7 +1,7 @@
{
"name": "video.js",
"description": "An HTML5 and Flash video player with a common API and skin for both.",
"version": "4.8.4",
"version": "4.8.5",
"copyright": "Copyright 2014 Brightcove, Inc. https://github.com/videojs/video.js/blob/master/LICENSE",
"keywords": [
"videojs",
@ -21,7 +21,7 @@
},
"main": "./dist/video-js/video.js",
"dependencies": {
"videojs-swf": "4.4.4"
"videojs-swf": "4.4.5"
},
"devDependencies": {
"calcdeps": "~0.1.7",