1
0
mirror of https://github.com/videojs/video.js.git synced 2024-11-28 08:58:46 +02:00
Commit Graph

61 Commits

Author SHA1 Message Date
Tom Johnson
0a1d4b2645 use grunt connect for development 2014-03-25 15:22:29 -07: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 2014-03-06 13:15:53 -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
7aefee5d7d Release 4.4.2 2014-02-24 21:57:43 -08:00
Steve Heffernan
7be94c3882 Release 4.4.1 2014-02-18 17:04:02 -08:00
Steve Heffernan
9e5dce5c14 Release 4.4.0 2014-02-18 13:43:40 -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
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
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
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
d73bfb80b7 Merge branch 'windows-dist' of git://github.com/christophercurrie/video.js into christophercurrie-windows-dist
Conflicts:
	package.json
2014-01-23 17:47:19 -08:00
Steve Heffernan
e4b4906198 Updated swf version and grunt file references 2014-01-23 17:15:41 -08:00
Steve Heffernan
f152c6a4be Changed video-js swf location 2014-01-23 15:44:52 -08:00
Christopher Currie
9088dfffc9 Use specific launcher versions 2014-01-21 08:45:59 -08:00
Christopher Currie
a54d9cdae6 Add dependencies and configuration for all browser launchers 2014-01-21 08:42:40 -08:00
Christopher Currie
51b836d6be Update to karma 0.10/grunt-karma 0.6.
Current version of grunt-karma has ChromeLauncher bugs.
2014-01-17 14:18:09 -08:00
Christopher Currie
02eb2d3ee3 Support dist target on Windows 2014-01-16 11:41:17 -08:00
Tom Johnson
0dae44988e use SWF grunt build project. Update gruntfile for dist task to use packaged SWF. Updated sandbox for reference to SWF. 2014-01-07 07:32:16 -08:00
David LaPalomento
75b2171051 Close GH-850: Use qunitjs through npm. 2013-12-02 15:34:00 -08:00
Steve Heffernan
4e216cdddb Bump version to 4.3.0 2013-11-04 16:14:04 -08:00
Steve Heffernan
f318eb9f1f Close GH-801: API Doc Generation 2. Fixes #747 2013-10-28 18:25:28 -07:00
Steve Heffernan
3203c2c5ed Merge branch 'stable' 2013-10-15 13:39:32 -07:00
Steve Heffernan
9ec2556a7c Bump version to 4.2.2 2013-10-15 13:39:30 -07:00
BCJwhisenant
13dbf23c3c Close GH-714: Added support for running tests with Karma. 2013-09-19 09:24:06 -07:00
Steve Heffernan
faea65a44e Bump version to 4.2.1 2013-09-09 12:21:51 -07:00
Steve Heffernan
52c577995c Bump version to 4.2.0 2013-09-04 13:26:45 -07:00
Steve Heffernan
1eca8add85 Close GH-644: LESS for CSS. 2013-07-19 20:18:39 -07:00
Steve Heffernan
fdf7f4f228 Bump version to 4.1.0 2013-06-28 15:58:25 -07:00
Steve Heffernan
8a728a80ac Added uglifyjs which somehow got dropped from #571 2013-06-11 15:35:14 -07:00
Steve Heffernan
6fe5513f30 Bump version to 4.0.4 2013-06-11 15:27:49 -07:00
Steve Heffernan
880be64f48 Bump version to 4.0.3 2013-05-28 15:31:11 -07:00
Steve Heffernan
8dd88d1626 Bump version to 4.0.2 2013-05-23 13:12:43 -07:00
Steve Heffernan
0fe7348456 Close GH-535: Adding version numbers in build. Minifying CSS.. 2013-05-23 13:10:29 -07:00
Steve Heffernan
36c92404c3 Bump version to 4.0.1 2013-05-22 18:16:13 -07:00
Steve Heffernan
3acdb497d1 Updated version back to 4.0 2013-05-08 14:15:41 -07:00
Steve Heffernan
6c75c5ea34 Merge branch 'master' of git://github.com/videojs/video.js into feature/deploy
Conflicts:
	package.json
	src/css/video-js.css
2013-05-08 14:15:19 -07:00
Matthew McClure
55e2c99899 removed styles from pseudo elements to make broad styling possible. updated copyright link in package.json 2013-05-08 13:29:02 -07:00
Steve Heffernan
199b8f29da Bumped package version to 4.0.0 2013-05-06 11:45:42 -07:00
Steve Heffernan
7cc733a8df Rotating CHANGELOG 2013-05-03 23:05:33 -07:00
Matthew McClure
07d90fb6e0 grunt now adds copyright comment to top of video.js 2013-04-22 18:48:34 -07:00
Matthew McClure
953ae8abec Added copyright banner to top of distribution video.js 2013-04-21 22:44:36 -07:00
Steve Heffernan
c74f39318f Updated grunt and grunt-contrib versions to fix PhantomJS bug
Also changed some additional code to fix new jshint issues found by new jshint version.
2013-04-09 10:42:41 -07:00
Steve Heffernan
bafaf49e7e Close GH-433: Update contribflow version and add contrib.json. 2013-04-08 13:55:50 -07:00
Steve Heffernan
e0b2e470f4 Added contribflow as a package. 2013-03-25 16:52:36 -07:00
Steve Heffernan
496c699298 Updated to specific version of grunt-contrib-qunit to fix travis CI build errors 2013-02-24 15:20:17 -08:00