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

361 Commits

Author SHA1 Message Date
Pat
5c4681506b v5.0.0-rc.33 2015-07-30 18:13:56 +00:00
David
aa8601f22f v5.0.0-rc.32 2015-07-30 16:12:50 +00:00
Matthew
06bff98ca6 v5.0.0-rc.31 2015-07-28 23:42:10 +00:00
Matthew
63392f25a7 v5.0.0-rc.30 2015-07-28 23:32:49 +00:00
heff
57152ae62f v5.0.0-rc.29 2015-07-24 17:14:27 +00:00
Benoit
dd6ed45f8e v5.0.0-rc.28 2015-07-24 17:05:11 +00:00
Benoit
152e1ad808 v5.0.0-rc.27 2015-07-24 16:41:32 +00:00
Benoit
75af988c86 v5.0.0-rc.26 2015-07-24 16:35:39 +00:00
Pat
3cabc75b83 v5.0.0-rc.25 2015-07-24 16:10:27 +00:00
David
8be7810049 v5.0.0-rc.24 2015-07-21 23:00:24 +00:00
David
843a57765d v5.0.0-rc.23 2015-07-21 21:33:22 +00:00
David LaPalomento
4ad45ef9a8 @dmlap fire seeking in the flash tech, not the SWF. closes #2372 2015-07-21 17:31:51 -04:00
David
4056c5f75c v5.0.0-rc.22 2015-07-21 21:14:00 +00:00
David
52bbd468d5 v5.0.0-rc.21 2015-07-21 20:57:44 +00:00
David
dd9930b6c6 v5.0.0-rc.20 2015-07-21 18:08:08 +00:00
David
c98f775267 v5.0.0-rc.19 2015-07-21 17:00:51 +00:00
David
1eb416deef v5.0.0-rc.18 2015-07-21 16:09:35 +00:00
Matthew
ca5103befe v5.0.0-rc.17 2015-07-17 01:23:41 +00:00
Gary
69348f4e0d v5.0.0-rc.16 2015-07-16 20:40:18 +00:00
heff
3842890900 v5.0.0-rc.15 2015-07-15 22:24:33 +00:00
heff
3e35935182 Sped up tests by relying on watchify and splitting up tests
- Temporarily killed API tests. Combining them with other tests.
- Using browserify:watch for build/temp/video.js (sandbox testing)
- Using karma:watch for automated tests

Using individual watch tasks allows watchify to use smart caching in both
instances.

- Switched to grunt-concurrent for watch tasks
- Switched to travis containers, sudo: false
- Added caching of npm modules in Travis
- Consolidated travis testing
- Cleaned up grunt file
- Fixed travis.yml spacing
- Added the watchAll task for trying it out
- Moved travis test script logic to package.json
- Moved coverage reporting to Travis only

closes #2254
2015-07-15 15:22:34 -07:00
Gary
dfd481037e v5.0.0-rc.14 2015-07-13 17:06:31 +00:00
Gary
7bcc2ba8f7 v5.0.0-rc.13 2015-07-10 21:46:54 +00:00
Gary
5bcf3b40e3 v5.0.0-rc.12 2015-07-10 20:42:55 +00:00
Gary Katsevman
d5061d7691 Update vttjs to fix a trailing comma JSON error
closes #2331
2015-07-10 13:40:40 -07:00
David
70d82a03db v5.0.0-rc.11 2015-07-10 19:37:02 +00:00
David
590e731db4 v5.0.0-rc.10 2015-07-10 19:23:15 +00:00
Matthew
440dfe92f8 v5.0.0-rc.9 2015-07-09 23:21:22 +00:00
Matt
db3e58b653 v5.0.0-rc.8 2015-07-09 23:05:34 +00:00
Michelle
f73f69c66c v5.0.0-rc.7 2015-07-09 22:42:04 +00:00
Gary
004b1e8f7b v5.0.0-rc.6 2015-07-08 22:08:15 +00:00
Thijs
5fc794f4e7 v5.0.0-rc.5 2015-07-08 21:53:06 +00:00
Matthew
49fbea6f4c v5.0.0-rc.4 2015-07-07 00:11:38 +00:00
David LaPalomento
99032bb2a7 @dmlap updated to videojs-swf@4.7.1 to fix a video dimensions issue on subsequent loads. closes #2281 2015-07-06 16:36:19 -07:00
Pavel
8d33388899 v5.0.0-rc.3 2015-07-02 04:24:40 +00:00
Matthew
ffe7c32899 v5.0.0-rc.2 2015-06-08 21:39:27 +00:00
heff
3857d78261 v5.0.0-rc.1 2015-06-08 10:56:31 -07:00
Matthew
20748ba7f7 v5.0.0-34 2015-06-06 00:38:03 +00:00
Matthew
362821801e v5.0.0-33 2015-06-05 23:25:53 +00:00
Matthew McClure
34df8767a2 bumping font version to 1.3.0 2015-06-05 16:16:33 -07:00
heff
5bf28c9e3d v5.0.0-32 2015-06-05 22:49:14 +00:00
heff
4803ac2674 Removed the CDN publishing logic into it's own repo
See videojs/cdn#3

- Added a guide note about skipping analytics tracking on the CDN
- Updated videojs-font
- Added videojs-ie8 as a dependency
- Updated the examples directory URLs and added to dist
- Updated CSS to override font path
2015-06-05 15:38:52 -07:00
Carlos
7eff3aca48 v5.0.0-31 2015-06-05 17:39:36 +00:00
Steve
3a0f14728e v5.0.0-30 2015-06-05 00:39:39 +00:00
Matthew McClure
dac91a7b7b @mmcc moved the fonts into their own repo. closes #2223 2015-06-02 11:04:40 -07:00
Steve
f03a91909e v5.0.0-29 2015-05-30 02:15:59 +00:00
Matthew
965af8113f v5.0.0-28 2015-05-29 23:58:59 +00:00
Steve
a6a4a0fd24 v5.0.0-27 2015-05-29 23:04:55 +00:00
heff
2af3047467 v5.0.0-26 2015-05-29 22:41:13 +00:00
heff
7ea3566a8c v5.0.0-25 2015-05-29 02:51:59 +00:00
heff
8d768ef0ab Switched lodash to use the compat version for IE8 support 2015-05-28 18:20:06 -07:00
heff
3bf01d9a41 v5.0.0-24 2015-05-28 18:05:09 +00:00
heff
a88e311214 Fixed a number of IE8 and Flash issues from 5.0 changes
IE8 compatiblity fixes - Babel loose mode and ES5-shim

Reverted to old isPlainObject to fix IE8

Lodash.isplainobject was throwing a "Member not found error" on elements,
specifically the 'custom' track element being passed in options.

(turned out to be that we were using lodash modern, not compat)

Fixed full-window mode in IE8 by fixing fullscreen API check

Fixed the swf events by creating the object in component.createEl
fixes #2184

Added es5 shim and sham to the sandbox example
related to #1687
2015-05-28 11:00:08 -07:00
heff
fb5d0ce6ad v5.0.0-23 2015-05-27 18:44:33 +00:00
heff
fdd133906c v5.0.0-22 2015-05-23 00:29:46 +00:00
David
27ee448e1f v5.0.0-21 2015-05-22 02:50:34 +00:00
David LaPalomento
0ad43fd576 update the swf to v4.7 2015-05-21 19:47:44 -07:00
45aff0062cf1b0e55a6532b0a513db6be3952d17
21edde8702 v5.0.0-20 2015-05-22 00:09:43 +00:00
heff
7c5206eaf9 v5.0.0-19 2015-05-21 18:36:46 +00:00
heff
1bfe0b4fed Clean up and documentation of src/js/video.js and DOM functions
Preparing to export utility functions on the videojs object

closes #2182

Change el() to getEl() for consistency

Cleaned up DOM functions library

Clean up and document videojs object API

Fixed mergeOptions to modify the first object instead of a copy

More cleanup of the main video.js file and documentation

Fixed issues with mergeOptions

Cleaned up the addLanguage function

Removed unnecessary underscores in private module vars
2015-05-21 11:33:12 -07:00
Matthew
caf725a3d4 v5.0.0-18 2015-05-19 18:25:29 +00:00
heff
b2311c7664 v5.0.0-17 2015-05-19 00:57:10 +00:00
heff
dc083f8cf4 v5.0.0-16 2015-05-16 01:25:32 +00:00
heff
a8ff970d4a Broke up Lib and Util into smaller libraries of functions
Broke out bind, guid, and element data functions from Lib

Separated out more dom functions in to dom.js

Broke out URL functions into url.js

Removed setLocalStorage since it wasn't being used

Moved browser tests out of lib

Moved log functions into their own file

Removed trim() since it wasn't being used

Moved formatTime into its own file

Moved round into its own file and renamed roundFloat()

Moved capitalize into its own file and renamed as toTitleCase()

Moved createTimeRange into its own file

Removed Lib.arr.forEach infavor of the native forEach

Removed Lib.obj.create in favor of native Object.create (ES6-sham)

Removed obj.each in favor of native Object.getOwnPropertyNames().forEach()

Removed obj.merge and copy. Using lodash.assign instead.

Replaced Lib.obj.isPlain with lodash.isPlainObject

Removed Lib.obj.isArray in favor of the native Array.isArray

Also removed the lib.js tests file as all tests have been moved
or removed.

Removed Lib.isEmpty in favor of !Object.getOwnPropertyNames().length

Switched Util.mergeOptions and deepMerge to use new mergeOptions()

Moved Lib.TEST_VID to Html5.TEST_VID

Removed Lib references everywhere. Woo!

Attempting to fix sourcemap test errors by setting grunt-browserify version

Switched to object.assign from lodash.assign

Removed unused 'inherits' dependency

Reorganzied test files and added '.test' to file names

Combined js/core.js and js/video.js

Moved events.js into the utils directory
2015-05-15 18:20:35 -07:00
heff
349ff89541 v5.0.0-15 2015-05-14 05:47:16 +00:00
heff
2fc8968002 @heff added support for fluid widths, aspect ratios, and metadata defaults. closes #1952 2015-05-13 22:45:01 -07:00
Matthew
6128305cc3 v5.0.0-14 2015-05-13 05:02:43 +00:00
heff
fbdb3f1ce2 v5.0.0-13 2015-05-12 20:17:33 +00:00
heff
b87fb3ce32 v5.0.0-12 2015-05-12 19:42:16 +00:00
Brandon
de843affb7 v5.0.0-11 2015-05-06 16:12:56 +00:00
Matthew
793da0979a v5.0.0-10 2015-05-04 18:38:30 +00:00
Gary
9b71d6b7d8 v5.0.0-9 2015-05-01 21:18:08 +00:00
Gary
aa7f7709b1 v5.0.0-8 2015-05-01 21:01:43 +00:00
Gary Katsevman
90b2f5d6ac build: @gkatsev updated the Gruntfile to use ES6. closes #2106 2015-05-01 12:54:31 -07:00
Gary
87b8f8ec77 v5.0.0-7 2015-05-01 19:50:46 +00:00
Gary Katsevman
43a14291fa @gkatsev updated the component.js styles to match the new style guide. closes #2105 2015-05-01 12:48:28 -07:00
Matthew
75aa65ebae v5.0.0-6 2015-05-01 19:45:17 +00:00
Gary
90702a4f3e v5.0.0-5 2015-05-01 18:30:14 +00:00
Deirdre
3e1b76c9fb v5.0.0-4 2015-04-30 21:54:23 +00:00
Deirdre
b72f651a59 v5.0.0-3 2015-04-30 21:51:09 +00:00
heff
ebf0aa1a06 v5.0.0-2 2015-04-30 14:20:13 -07:00
heff
c7265e3d9d Merge branch 'master' into review-dmlap-test-and-build-improvements 2015-04-30 12:03:52 -07:00
heff
a131a00c4c Added a prerelease grunt task. Updated packages to correct version. 2015-04-29 16:21:05 -07:00
David LaPalomento
54519da32c Grunt improvements
Get test/index.html working when loaded directly into a browser. Remove extra browserifying via karma. Add timing info to to grunt output.
2015-04-29 15:02:14 -07:00
Matthew McClure
f21f840afb added scss files to dist folder 2015-04-29 13:16:18 -07:00
Matthew McClure
1eae8697e6 Bumping to 5.0 prerelease 2015-04-28 16:04:12 -07:00
Matthew McClure
4cdca881d4 expose the dist file and derequire the bundle 2015-04-28 15:57:13 -07:00
heff
f19d13b9bb @heff added and `extends` function for external subclassing. closes #2078 2015-04-28 11:50:09 -07:00
Matthew McClure
4ac762cf48 @mmcc added a new default skin, switched to SASS, modified the html closes #1999
- removed old less style. no going back now.
- switched back to video-js.scss naming and added a base-style injection class
- cleaned up and simplified big play btn
- Flexbox straight flexin.
- move to using variables for text and icon font families
- use table layout for IE 8 and 9
- moved to using extend for icons
- Switched to SASS, added a new default theme, updated the html
- added horizontal classes
- added connect-watch grunt task
- show all the things in the control bar so everything is available
  by default (and hidden via css
- reignore dist for now
- removing trailing comma to get the tests passing
- Switched to using libsass and removed incompatible "black magic"
- updating to es6 syntax
- removed old separator, added grunt task for dev, and updated example
- singular time-control and live-control. remove playing class on pause
- updated separator control styles
- Show full control bar when a player goes to fullscreen.
  Also added a grunt task specifically for skin development (only watches sass file changes and runs sass)
- allow poster image to toggle playback
- This allows the poster image to toggle play / pause on audio-only sources
- fixed issue with scrollbars in Chrome on Linux
- make the control bar not-quite-black
- added back some focus highlights until we decide on another path
2015-04-28 09:52:27 -07:00
Deirdre Connolly
c62aa10637 @dconnolly replaced JSON.parse with a safe non-eval JSON parse. closes #2077 2015-04-27 17:05:39 -07:00
heff
a02ee27802 @heff converted all classes to use ES6 classes. closes #1993 2015-04-14 13:08:32 -07:00
heff
6e5fc8d687 More build and testing cleanup. Also some reorganization. 2015-04-02 11:33:51 -07:00
Matthew McClure
0c9d53321f Report test coverage analytics during test runs 2015-04-02 11:33:50 -07:00
heff
f298d18023 Most of test conversion for es6ification 2015-04-02 11:33:50 -07:00
Matthew McClure
2e689f85e5 Starting ES6 conversion up to functional player 2015-04-02 11:33:50 -07:00
heff
12df63d7e7 Merge branch 'stable'
Conflicts:
	dist/video-js/video-js.css
	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
	package.json
2015-03-17 13:52:42 -07:00
heff
6786b70da1 Release v4.12.5 2015-03-17 20:47:00 +00:00
heff
bccea74d23 Updated to videojs-swf v4.5.4 to fix a potential security issue. closes #1955 2015-03-17 13:41:21 -07:00
heff
9dea6bed33 @heff replaced Closure Compiler with Uglify for minification. closes #1940 2015-03-12 11:23:47 -07:00
heff
9009593297 Release v4.12.4 2015-03-05 01:16:06 +00:00
Matthew
ab84de6960 Release v4.12.3 2015-02-28 01:10:21 +00:00
heff
06b8541fdb Switched to grunt-aws-s3 for CDN uploads
closes #1800, closes #1658, closes #1855
2015-02-26 17:55:30 -08:00
Matthew
ed8ccf599b Release v4.12.2 2015-02-27 00:09:30 +00:00
Matthew McClure
6e6c9fe885 remove tagrelease and commit unstaged changes manually (github-release handles tagging) 2015-02-26 15:05:16 -08:00
Matthew McClure
0b392fa9f5 breaking grunt tasks out into separate files to clean up the main Gruntfile. Also removed unused requires from the primary Gruntfile and making sure they are in the appropriate task file. 2015-02-25 16:05:31 -08:00
heff
8e372d7ffd Release 4.12.1 2015-02-19 16:32:05 -08:00
heff
dd24d17372 Release 4.12.0 2015-02-17 16:44:25 -08:00
Gary Katsevman
4e5c28cc56 @gkatsev greatly improved text track support and implemented vtt.js as the webvtt parser. closes #1749 2015-02-13 15:19:02 -08:00
heff
aac97d287a Release 4.11.4 2015-01-23 10:50:22 -08:00
Lee Whitaker
3c83fd364d Update swf version to 4.5.3
closes #1823
2015-01-23 10:42:40 -08:00
heff
881be6f77d Release 4.11.3 2014-12-19 14:17:50 -08:00
heff
ad3e430cc6 Release 4.11.2 2014-12-17 16:12:38 -08:00
heff
daa66b9183 Release 4.11.1 2014-12-04 14:05:50 -08:00
heff
0469c5063c Release 4.11.0 2014-12-04 13:29:40 -08:00
heff
dd9b4df727 @heff updated the SWF to the latest version. closes #1714 2014-12-04 13:24:05 -08:00
Steve Heffernan
0919b77f31 Release 4.10.2 2014-10-30 17:25:22 -07:00
Steve Heffernan
7511bb606d Release 4.10.1 2014-10-29 08:36:16 -07:00
Steve Heffernan
6958643678 Release 4.10.0 2014-10-28 17:28:25 -07:00
Steve Heffernan
b848fd736d Release 4.9.1 2014-10-15 16:07:59 -07:00
Steve Heffernan
b619404069 Bumped to videojs-swf v4.5.1 to fix a data sanitization issue. closes #1587 2014-10-15 16:04:18 -07:00
Steve Heffernan
85730d7a1b Release 4.9.0 2014-09-30 18:51:46 -07:00
Steve Heffernan
ce97c24d79 @heff updated to swf v4.5.0 to fix event issues. closes #1554 2014-09-30 16:16:36 -07:00
Steve Heffernan
c0518a1ff0 Release 4.8.5 2014-09-25 14:15:59 -07:00
Steve Heffernan
bb52851aa4 Updated to the latest version of the swf to fix HLS playback. closes #1538 2014-09-25 14:09:25 -07:00
Steve Heffernan
2b57ada7df Release 4.8.4 2014-09-23 16:21:59 -07:00
Steve Heffernan
ae04900c54 Release 4.8.3 2014-09-22 16:13:03 -07:00
Steve Heffernan
0ef6b4af73 Updated to version 4.4.4 of the swf 2014-09-22 16:04:02 -07:00
Steve Heffernan
ee7c962494 Release 4.8.2 2014-09-16 16:38:42 -07:00
Steve Heffernan
18965bb8d7 Release 4.8.1 2014-09-05 14:58:12 -07:00
Steve Heffernan
88f59d7ad6 Release 4.8.0 2014-09-03 08:43:58 -07:00
Tom Johnson
011861bbdb add support for videojs-grunt-languages
updates to change build/lang to build/files/lang

update grunt languages references and version

remove build/lang reference

update languages plugin reference for array support
2014-09-02 11:40:06 -07:00
Steve Heffernan
760eb308db Release 4.7.3 2014-08-20 15:16:22 -07:00
Steve Heffernan
7baa40220f Release 4.7.2 2014-08-14 16:31:27 -07:00
David LaPalomento
dfdbdbc9bb Bump SWF to 4.4.3
Pick up updated flash compiler settings.
2014-08-14 15:09:06 -07:00
Steve Heffernan
692a0e9c09 Release 4.7.1 2014-08-06 11:26:56 -07:00
Steve Heffernan
f3d7196a73 Release 4.7.0 2014-08-05 18:05:38 -07:00
Steve Heffernan
a97a002ed6 Release 4.6.4 2014-07-11 14:48:42 -07:00
Steve Heffernan
2af481e0ec Updated to swf version 4.4.2 to fix the network state reporting 2014-07-11 14:38:30 -07:00
Steve Heffernan
b2f6175a7b Release 4.6.3 2014-06-12 14:08:27 -07:00
David LaPalomento
39ae5178ee Updated to version 4.4.1 of the SWF. closes #1285 2014-06-12 14:02:44 -07:00
Steve Heffernan
61a919d529 Updated test dependencies to fix travis tests 2014-06-10 17:13:20 -07:00
Steve Heffernan
17cb669047 Release 4.6.2 2014-06-10 16:58:41 -07:00
Steve Heffernan
5edc3a5cbc Release 4.6.1 2014-05-20 13:58:26 -07:00
Steve Heffernan
d01de49ded Release 4.6.0 2014-05-20 10:42:01 -07:00
Gary Katsevman
3189ec1a0b Added cross-browser testing with SauceLabs, and added Karma as the default test runner. closes #1187 2014-05-16 14:48:05 -07:00
Steve Heffernan
d7f840a969 Better error handling. closes #1197
Squashed commit of the following:

commit 81d785980d
Author: Steve Heffernan <steve@zencoder.com>
Date:   Mon May 12 12:53:59 2014 -0700

    Removed unneeded comments

commit c7ad7322e4
Author: Steve Heffernan <steve@zencoder.com>
Date:   Fri May 9 14:29:31 2014 -0700

    Addressed comments in #1191
    Now clearing errors on loadstart events.
    Added some default error messages.

commit a742239d0e
Author: Steve Heffernan <steve@zencoder.com>
Date:   Wed May 7 15:38:31 2014 -0700

    Fixed the error display to hide by default

commit 561c3f8449
Author: Steve Heffernan <steve@zencoder.com>
Date:   Mon May 5 10:44:47 2014 -0700

    Added support for displaying a message for the error.

commit 2214207842
Author: Steve Heffernan <steve@zencoder.com>
Date:   Fri May 2 17:18:22 2014 -0700

    Updated spinner to hide on all errors

commit 95d7e70274
Author: Steve Heffernan <steve@zencoder.com>
Date:   Fri May 2 15:37:44 2014 -0700

    Exported ErrorDisplay

commit 11ca9cdd8d
Author: Steve Heffernan <steve@zencoder.com>
Date:   Fri May 2 15:35:46 2014 -0700

    Updated flash tech to support new errors

commit 56cbe66f42
Author: Steve Heffernan <steve@zencoder.com>
Date:   Fri May 2 13:06:49 2014 -0700

    Started on better error handling and displaying in the UI when an error has occurred.

commit 740014c57b
Author: Steve Heffernan <steve@zencoder.com>
Date:   Wed Apr 30 16:11:33 2014 -0700

    Added better global log/error/warn functions.
    Added sinon.js for stubs in tests.
    Updated grunt version to satisfy peer dependency warning.
2014-05-12 17:08:48 -07:00
Steve Heffernan
4242fe3857 Release 4.5.2 2014-04-12 14:03:18 -07:00
Steve Heffernan
da45dad831 Updated versioning to bump bower and component json files also
fixes #1123, fixes #1140
2014-04-12 13:47:39 -07:00
Steve Heffernan
848cfd6620 Release 4.5.1 2014-03-27 14:31:36 -07:00
Steve Heffernan
825de43819 Release 4.5.0 2014-03-27 13:35:51 -07:00
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