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,166 Commits 20 Branches 519 Tags 150 MiB
5146c1fa4a
Commit Graph

1166 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Steve Heffernan
8c59405d86 Added missing files from standard test suite 2014-02-10 17:14:46 -08:00
Steve Heffernan
7ade43d91d Merge branch 'bugfix/lastseek-cleanup' of git://github.com/dmlap/video-js into dmlap-bugfix/lastseek-cleanup 2014-02-10 16:17:30 -08:00
Steve Heffernan
49656ab013 Merge branch 'master' of github.com:videojs/video.js 2014-02-10 16:09:32 -08:00
Steve Heffernan
6f83d0b00e Merge branch 'karma-update' of git://github.com/christophercurrie/video.js into christophercurrie-karma-update 
Conflicts:
	test/karma.conf.js.example
 2014-02-10 16:08:47 -08:00
Phil Schleihauf
71ba5bb062 Create 'track' element in the HTML5 shiv sample 
Matches the shiv to the one at [the start of `src/js/core.js`](https://github.com/videojs/video.js/blob/master/src/js/core.js#L8).

Right now it's missing `track`.
 2014-02-10 15:40:32 -05:00
Steve Heffernan
11e7028c25 Merge pull request #999 from mmcc/document-passing-element 
Update docs to reflect being able to pass an element instead of ID.
 2014-02-07 16:53:19 -08:00
Matthew McClure
7926c2d9a6 syntax highlighting and some clarity 2014-02-07 16:52:15 -08:00
Matthew McClure
2b1291816f Update docs to reflect being able to pass an element instead of ID. Closes #844 2014-02-07 16:26:49 -08:00
Gary Katsevman
4d9d06e1c9 Enable building videojs with browserify. 
This uses browserify-shim to get browserify to recognize videojs.
It uses dist/video-js/video.js for the main file of the module.
To build using browserify, you just run browserify on the module and
use --standalone (or -s) to make it produce a UMD file.
This seems to work just fine in the browser (and requirejs looks like
it'll work, though, I haven't tested it) but it won't work in node right
now because videojs is doing a lot of stuff with 'document' directly and
its causing problems in node.
 2014-02-07 18:28:41 -05:00
Steve Heffernan
0fc76451f9 Adding line to CHANGELOG 2014-02-06 17:15:19 -08:00
Matthew McClure
3cb41c7786 Close GH-971: Quiet down deprecation warnings. 2014-02-06 17:15:01 -08:00
Steve Heffernan
2d5ca1ebc2 Adding line to CHANGELOG 2014-02-06 17:12:00 -08:00
Steve Heffernan
1b45195f9d Close GH-981: Stopped component's dispose event from bubbling up. 2014-02-06 17:11:33 -08:00
Steve Heffernan
04c893208e Added line to changelog 2014-02-06 17:01:49 -08:00