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

1317 Commits

Author SHA1 Message Date
Steve Heffernan
d01de49ded Release 4.6.0 2014-05-20 10:42:01 -07:00
Steve Heffernan
1744d64142 Fixed contrib.json to work with handlebars 2014-05-20 10:39:21 -07:00
Steve Heffernan
956f3e03eb Temporarily removed the saucelabs ipad test because it was errororing unrelated to tests 2014-05-19 13:59:12 -07:00
Brad Chase
23ab370ab6 Added a player option to offset the subtitles/captions timing. closes #1212 2014-05-19 13:40:04 -07:00
Steve Heffernan
bd66416b75 Updated the CDN font to point to the new font version, /f/3/ 2014-05-19 13:34:26 -07:00
Matthew McClure
6bb92282c3 Added a cog icon to the font icons. closes #1211 2014-05-19 13:21:32 -07:00
Dominic
f3ab261d5b Added a clearer error message when a tech is undefined. closes #1210 2014-05-19 12:45:00 -07:00
Steve Heffernan
38c394fc90 Fixed another issue with changelog adding during feature accept command 2014-05-19 12:07:54 -07:00
Gary Katsevman
a97bb5f74b Fixed saucelabs integration to run on commits in TravisCI. closes #1214 2014-05-16 15:18:24 -07:00
Steve Heffernan
4d05b6febb Fixed changelog adding in contrib accept script 2014-05-16 15:07:13 -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
b8f525cb81 Added contrib feature accept and review commands 2014-05-16 11:32:47 -07:00
Steve Heffernan
46aa551e1e Modernized the fullscreen API and added support for IE11. fixes #1155 closes #1205 2014-05-15 14:46:28 -07:00
Steve Heffernan
97c1f83dc7 Added a missing changelog item 2014-05-14 16:01:52 -07:00
Steve Heffernan
0c3fb04acb Fixed issues from comments on d7f840a969
- use triple equals
- don't block play call on error
2014-05-14 15:46:23 -07:00
Steve Heffernan
bad5130c8f Fixed the loadstart event listener order so it's attached before the HTML5 tech triggers it. fixes #1208 fixes #1207 fixes #1193 2014-05-14 15:04:31 -07:00
Artem Suschev
8dfe0a4d06 Added support for playbackRate switching. closes #1132 2014-05-13 14:02:02 -07:00
Erik Skogby
047bd8f618 Made vjs.get work with xDomain in IE < 10. closes #1095 2014-05-13 12:35:40 -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
01567428b0 Merge branch 'stable' 2014-05-09 13:10:27 -07:00
Steve Heffernan
4235a3d8c1 Added bug and request contrib commands 2014-05-09 13:09:58 -07:00
Steve Heffernan
4bb3a23331 Made negative LESS calculations a little more readable.
Added line to the changelog for PR merge.
2014-05-09 10:56:46 -07:00
Steve Heffernan
7782eda524 Merge branch 'master' of github.com:fobiaxx/video.js into fobiaxx-master 2014-05-09 10:45:58 -07:00
Matthew McClure
92eac13caa More explicit MIME type note
Added a more explicit MIME type note in setup. Moved to a footnote and made comment more verbose to avoid confusion.
2014-05-07 15:31:02 -07:00
Steve Heffernan
bcb69a0b23 Merge branch 'master' of github.com:videojs/video.js 2014-05-07 15:23:43 -07:00
Steve Heffernan
3fd0c92c95 Added line to changelog 2014-05-07 15:23:32 -07:00
Matthew McClure
a6718913be Merge pull request #1149 from bosoniq/master
Included self-hosting MIME type instructions
2014-05-07 15:22:13 -07:00
Chris Fung
1df28ff311 Fixed the default flag for captions/subtitles tracks. closes #1153 closes #656 2014-05-07 14:59:01 -07:00
Jon Zepernick
dbff62e3f0 Made tap events on mobile less sensitive to touch moves. closes #1111 2014-05-06 17:22:29 -07:00
Steve Heffernan
ef25557577 Added line to changelog 2014-05-06 17:03:44 -07:00
Steve Heffernan
269f7b15c0 Merge branch 'master' of github.com:michelt/video.js into michelt-master 2014-05-06 17:01:53 -07:00
Steve Heffernan
adf4e507c1 Added line to the changelog 2014-05-06 14:51:09 -07:00
Steve Heffernan
a5bc6884e2 Merge branch 'Akkuma-master' 2014-05-06 14:37:33 -07:00
Gregory Waxman
e7617bfdd4 Merge pull request #1 from heff/Akkuma-master
Updates for videojs/video.js#1093
2014-05-06 11:16:15 -04:00
Steve Heffernan
27f0f789e0 Updated to match comments in #1093 2014-05-05 17:11:14 -07:00
Steve Heffernan
3e5ef19212 Merge branch 'master' of github.com:Akkuma/video.js into Akkuma-master
Conflicts:
	src/js/lib.js
2014-05-05 16:34:15 -07:00
Steve Heffernan
d96e008978 Updated setup.md and demo.html with fallback paragraph 2014-05-05 15:48:34 -07:00
Steve Heffernan
227700a236 Added a more informative and styled fallback message for non-html5 browsers that also have JavaScript disabled 2014-04-29 13:39:38 -07:00
Fernando José La Calle Prada
923ce038f7 Fixed compilation failure with LESS v1.7.0 and GRUNT v0.4.4. The operations on the variables must be enclosed in parentheses so the compiler takes as math operations and not as strings. 2014-04-29 16:21:34 +02:00
Steve Heffernan
16eea0a1df Merge branch 'feature/fix-timeupdates' of github.com:heff/video-js into heff-feature/tech-error 2014-04-25 15:39:45 -07:00
Steve Heffernan
f4704ee74f Merge branch 'feature/tech-error' of github.com:heff/video-js into heff-feature/tech-error 2014-04-25 15:38:20 -07:00
Steve Heffernan
8c9a4cc434 Merge branch 'mousespam' of github.com:download13/video.js into download13-mousespam 2014-04-25 15:31:31 -07:00
Steve Heffernan
f98012a471 Trigger one last timepudate when stopping manual timeupdates. fixes #1002 2014-04-25 13:42:11 -07:00
Steve Heffernan
65833f5231 Making sure a tech exists when starting manual progress and timeupdate events 2014-04-25 13:14:03 -07:00
Andrew Pitt
e8722ff522 Included self-hosting MIME type instructions 2014-04-18 11:42:14 +02:00
Andrew Pitt
c1029eab16 Update setup.md 2014-04-18 11:35:42 +02:00
Steve Heffernan
46605739e2 Merge branch 'feature/fix-menu-title' of github.com:coursera/video.js into coursera-feature/fix-menu-title 2014-04-17 22:55:16 -07:00
Andrew Pitt
31918fc46d Included self-hosting MIME type instructions
Added information on MIME type server configuration to self-hosting instructions in setup.md
2014-04-16 11:13:46 +02:00
Steve Heffernan
3bafdeef51 Merge branch 'master' of github.com:videojs/video.js 2014-04-12 14:05:28 -07:00
Steve Heffernan
2473d5bf7a Merge branch 'stable'
Conflicts:
	dist/video-js/video-js.css
	dist/video-js/video-js.min.css
	dist/video-js/video.js
2014-04-12 14:05:13 -07:00