Commit graph

158 commits

Author SHA1 Message Date
Kasper Moskwiak
dba17d2e5b merge hls-tech into master
+ update videojs and videojs-hls-contrib
2016-09-13 22:44:42 +02:00
Kasper Moskwiak
85f1e51c8b update readme 2016-07-09 21:49:27 +02:00
Kasper Moskwiak
0eeed9352e Merge branch 'timonbandit-master' 2016-07-09 19:33:08 +02:00
Kasper Moskwiak
dc22099421 Merge branch 'master' of git://github.com/timonbandit/videojs-resolution-switcher into timonbandit-master
Conflicts:
	lib/videojs-resolution-switcher.js
2016-07-09 19:30:08 +02:00
Kasper Moskwiak
d14048dff5 Merge branch 'hartman-canplaytype' 2016-07-09 19:18:59 +02:00
Kasper Moskwiak
59744c42ec resolve conflicts 2016-07-09 19:17:46 +02:00
Kasper Moskwiak
89c85ff04a Merge branch 'hartman-rewrite' 2016-07-09 18:57:21 +02:00
Kasper Moskwiak
b928c07378 resolve conflicts 2016-07-09 18:55:24 +02:00
Kasper Moskwiak
26bfcd6dbd Merged hartman-css into master 2016-07-08 19:17:53 +02:00
Kasper Moskwiak
a8703b16e7 keep font-family when .vjs-menu-icon is applied 2016-07-08 19:05:32 +02:00
Kasper Moskwiak
e3556aeaa3 hls 2016-07-08 18:42:08 +02:00
Dmitriy Lunkin
3cea1487b8 fix bug with disabled bigPlayButton 2016-06-18 13:32:00 +03:00
Derk-Jan Hartman
d5aec7c6c6 Only add sources if the type is supported by a Tech
There is not much use in adding sources that we cannot play, so filter
them out. Backwards compatible with Tech's that do not yet support
canPlayType().

Fixes #15
2016-05-23 23:25:43 +02:00
Derk-Jan Hartman
033dfe291c A big rewrite of the plugin
* Stricter separation between functionality and UI
* Option to disable the UI
* Scoping per instance. #29
* Cleaned up inheritence etc of the UI components
2016-05-02 00:47:28 +02:00
Derk-Jan Hartman
c1a41a4635 Cleanup styling
- Remove color override
- Simplify how the dynamic label vs cog icon is styled
- Don't use !important, but specificity to override video.js
- Use more isolated method to center the menu.
2016-04-23 17:43:25 +02:00
Derk-Jan Hartman
dc3383cc48 Fix indentation 2016-04-23 15:34:06 +02:00
Kasper Moskwiak
9ac272f905 currently hls does not support default resolution - removed form example 2016-04-13 23:35:10 +02:00
Kasper Moskwiak
409007d9d7 updateSrc for HLS 2016-04-13 23:17:17 +02:00
Kasper Moskwiak
f8218598f6 jshint fix 2016-04-13 22:39:04 +02:00
Kasper Moskwiak
a160db7fc5 auto resolution select 2016-04-13 22:37:43 +02:00
Kasper Moskwiak
18466b0b3b hls support 2016-04-09 18:02:07 +02:00
Kasper Moskwiak
2e5bb5ade7 hls init 2016-04-05 23:09:56 +02:00
Kasper Moskwiak
56760f6314 0.4.2 2016-04-05 19:21:39 +02:00
Kasper Moskwiak
15ef6c0b6f bower version 2016-04-05 19:20:55 +02:00
Kasper Moskwiak
6aaf286f59 Merge branch 'issue-41-fix' 2016-04-05 19:20:17 +02:00
Kasper Moskwiak
08db8f10f3 fix #41 2016-04-05 19:19:57 +02:00
Kasper Moskwiak
c3f4769ce6 0.4.1 2016-03-13 21:22:53 +01:00
Kasper Moskwiak
b4352cd833 bower version 2016-03-13 21:22:40 +01:00
Kasper Moskwiak
4f751b593d jshint problems 2016-03-13 21:22:25 +01:00
Kasper Moskwiak
85fb021388 0.4.0 2016-03-13 21:13:09 +01:00
Kasper Moskwiak
e02c1cd8b2 use sans-serif fonts 2016-03-13 21:12:35 +01:00
Kasper Moskwiak
7288f228d1 example fix 2016-03-13 21:05:06 +01:00
Kasper Moskwiak
65287036bb readme 2016-03-13 21:05:00 +01:00
Kasper Moskwiak
4988f51d52 bower version 2016-03-13 21:00:06 +01:00
Kasper Moskwiak
cf2095d03a moved examples 2016-03-13 20:59:38 +01:00
Kasper Moskwiak
cf4e05ef9d Merge branch 'youtube' 2016-03-13 20:58:30 +01:00
Kasper Moskwiak
92477a26db youtube tech 2016-03-13 20:57:55 +01:00
Kasper Moskwiak
46c88bcc41 0.3.4 2016-03-13 20:06:23 +01:00
Kasper Moskwiak
e1cf38e16c bower version 2016-03-13 20:06:20 +01:00
Kasper Moskwiak
42c6498597 fix #24 2016-03-13 20:05:31 +01:00
Kasper Moskwiak
f19f33caf9 0.3.3 2016-03-13 19:19:57 +01:00
Kasper Moskwiak
eb189a02a9 bower version 0.3.3 2016-03-13 19:19:14 +01:00
Kasper Moskwiak
2294e32dde Merge branch 'kmagiera-patch-1' 2016-03-13 19:18:35 +01:00
Kasper Moskwiak
bcff5176f1 grunt in dev 2016-03-13 19:18:18 +01:00
Kasper Moskwiak
afc90ed436 Merge branch 'Yurifag-master' 2016-03-13 19:10:28 +01:00
Kasper Moskwiak
7a5fe76ba8 videojs upgrade 2016-03-13 19:07:25 +01:00
Yurifag
694392ab05 implement dispose method 2016-03-02 17:25:43 +01:00
Kasper Moskwiak
9b231adcf8 0.3.2 2016-02-08 11:42:50 +01:00
Kasper Moskwiak
dd389e900c bower version 2016-02-08 11:42:15 +01:00
Kasper Moskwiak
b964dd0c0f Merge branch 'feature/disable-text-transform-for-resolution-menu' of git://github.com/gkralik/videojs-resolution-switcher into gkralik-feature/disable-text-transform-for-resolution-menu 2016-02-06 11:39:37 +01:00