web/video.js
1
0
Fork 0
mirror of https://github.com/videojs/video.js.git synced 2024-12-16 11:37:29 +02:00
Code Releases Activity
1,331 Commits 20 Branches 521 Tags 151 MiB
fa635f835f
Commit Graph

1331 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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 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 2014-02-18 17:04:02 -08:00
Steve Heffernan
4f66e09595 Updated changelog 2014-02-18 16:58:11 -08:00
Steve Heffernan
1bb2c7ed57 Added .npmignore so dist/ files won't be ignored in packages 2014-02-18 16:57:14 -08:00
Steve Heffernan
1e781d14df Updated the release process to remove dist files after the release 2014-02-18 15:40:56 -08:00
Steve Heffernan
ee9a18d5ac Removed dist files after publishing 2014-02-18 15:09:45 -08:00
Steve Heffernan
ce0c4b12d2 Fixed contrib release branch pushes 2014-02-18 14:39:20 -08:00
Steve Heffernan
9e5dce5c14 Release 4.4.0 2014-02-18 13:43:40 -08:00
Steve Heffernan
88dca0a2e2 Fixed contrib release to use bump-only, so it doesn't tag and push 2014-02-18 13:41:56 -08:00
Steve Heffernan
8aa2eb4719 Updated package github url. fixes #1020 2014-02-18 13:31:18 -08:00
Steve Heffernan
ecaf748e4f Added a bower.json 2014-02-18 13:27:02 -08:00
Steve Heffernan
c9cad9ca1e Updated to the latest version of the swf 2014-02-18 13:19:35 -08:00
Steve Heffernan
956aaa0425 Added release process using contrib.json 2014-02-14 16:52:48 -08:00
Steve Heffernan
e062dec423 Fixed grunt file error 2014-02-13 21:09:42 -08:00
Steve Heffernan
8b720ce45a Fixed a mistype 2014-02-13 19:28:13 -08:00
Steve Heffernan
5ab2504e90 Added line to changelog 2014-02-13 19:24:55 -08:00
Steve Heffernan
310a0630c9 Switched to custom universal module definition. closes #998 closes #847 closes #998 2014-02-13 19:20:30 -08:00
Steve Heffernan
468b07c651 Merge branch 'browserify' of git://github.com/gkatsev/video-js into gkatsev-browserify 2014-02-13 14:51:30 -08:00
Steve Heffernan
12c830049e Updated changelog 2014-02-11 17:21:24 -08:00
Steve Heffernan
fe4c477da6 Switch this.content references to use the standard this.contentEl_ 
Also cleaned up some comments and formatting.
 2014-02-11 17:20:07 -08:00
Steve Heffernan
24125bbb63 Merge branch 'patch-1' of git://github.com/MrAvenger/video.js into MrAvenger-patch-1 2014-02-11 15:36:06 -08:00
Steve Heffernan
e73bb869ce Merge pull request #1005 from uniphil/patch-1 
Create 'track' element in the HTML5 shiv sample
 2014-02-10 17:30:41 -08:00
Steve Heffernan
5c907e1ce2 Added missing file from minified test suite 2014-02-10 17:24:48 -08:00