Commit graph

149 commits

Author SHA1 Message Date
Kasper Moskwiak
83d268d652 Merge branch 'H1D-patch-1' 2015-10-28 15:59:12 +01:00
Kasper Moskwiak
63bd92ffeb Merge branch 'patch-1' of git://github.com/H1D/videojs-resolution-switcher into H1D-patch-1
Conflicts:
	lib/videojs-resolution-switcher.js
2015-10-28 15:58:58 +01:00
Kasper Moskwiak
3551739bc0 bower.json fix 2015-10-28 15:34:20 +01:00
Kasper Moskwiak
cc927b402e Merge branch 'bower-support' 2015-10-28 15:30:05 +01:00
Kasper Moskwiak
6309278e2e bower support 2015-10-28 15:29:57 +01:00
Kasper Moskwiak
b933216c53 Merge branch 'fix-flash-paused-bug' 2015-10-28 15:18:23 +01:00
Kasper Moskwiak
0033246639 Hide loading spinner (flash issue) 2015-10-28 15:18:08 +01:00
Artem Suschev
c2c9b10a58 added AMD support 2015-10-26 19:25:56 +03:00
Kasper Moskwiak
5858c346b8 readme 2015-10-18 22:05:03 +02:00
Kasper Moskwiak
07ad5a1f2e 0.1.2 2015-10-18 01:04:03 +02:00
Kasper Moskwiak
20ed1fd503 package.json updated 2015-10-18 01:02:24 +02:00
Kasper Moskwiak
b09025742b Hide loading spinner after playing (flash issue). Added example with flash. 2015-10-18 00:23:16 +02:00
Kasper Moskwiak
9807328dc0 move plugin back to lib directory 2015-10-18 00:18:56 +02:00
Kasper Moskwiak
8d2c34ec14 Merge branch 'YouPic-master' 2015-10-18 00:14:12 +02:00
Kasper Moskwiak
f84178908d Group multiple sources for same label and select label when video loads #4 2015-10-18 00:13:06 +02:00
Pierre Kraft
9e3550963d Try to follow the Apache license 2015-10-05 16:32:41 +02:00
Pierre Kraft
800cd83e86 Move code out from the videoJsResolutionSwitcher function 2015-10-05 16:32:26 +02:00
Pierre Kraft
157cd3b211 Make the selected label selected from the beginning 2015-10-05 16:31:35 +02:00
Pierre Kraft
7ed92d2d00 Fix: handle labels with multiple sources
Also did some cleanup of the code to make it more clear
2015-10-05 12:58:45 +02:00
Pierre Kraft
223dd5e0db Move videojs-resolution-switcher.js to index.js
This makes it possible to include it as a require (even though videojs needs to be global first)
2015-10-02 17:24:52 +02:00
Kasper Moskwiak
83225fbd2f 0.1.1 2015-09-29 21:04:37 +02:00
Kasper Moskwiak
f812701f86 package.json repo added 2015-09-29 21:04:28 +02:00
Kasper Moskwiak
5eac36a0c9 videojs 5 2015-09-29 20:59:10 +02:00
Kasper Moskwiak
05566ba701 Upgrade to v5.0.0-rc101. Rename extends to extend 2015-09-25 23:27:44 +02:00
Kasper Moskwiak
b7240e98e4 readme update (videojs version) 2015-09-16 19:04:50 +02:00
Kasper Moskwiak
7b3ca93469 jshint issues 2015-09-16 19:02:07 +02:00
Kasper Moskwiak
baf3f1340e update videojs to 5.0.0-rc.90 2015-09-16 18:59:33 +02:00
Kasper Moskwiak
66ea5a7d9c git ignore 2015-09-16 18:04:30 +02:00
Kasper Moskwiak
8e856a8e12 videojs update 2015-09-03 19:36:19 +02:00
Kasper Moskwiak
10735641e1 59rc update 2015-08-21 08:26:41 +02:00
Kasper Moskwiak
7153217cb5 dynamic label hot fix 2015-08-20 18:00:32 +02:00
Kasper Moskwiak
b120a90942 dynamic label 2015-08-20 17:57:31 +02:00
Kasper Moskwiak
60c666e15c example fix 2015-08-20 16:22:28 +02:00
Kasper Moskwiak
38436a4f93 videojs rc52 update 2015-08-18 18:42:16 +02:00
Kasper Moskwiak
d45e486fd4 touch on mobile support 2015-08-13 23:35:59 +02:00
Kasper Moskwiak
d678f5b13d demo fix 2015-08-08 16:40:23 +02:00
Kasper Moskwiak
a38af49a3c demo readme 2015-08-08 16:39:40 +02:00
Kasper Moskwiak
68f485f21c redme update 2015-08-01 15:50:16 +02:00
Kasper Moskwiak
3103da56f7 default src 2015-08-01 15:16:26 +02:00
Kasper Moskwiak
6889d02fe7 sorting sourcec 2015-08-01 14:07:43 +02:00
Kasper Moskwiak
3183bbaf1c readme fix 2015-07-28 15:16:00 +02:00
Kasper Moskwiak
99559207f1 readme 2015-07-28 14:35:31 +02:00
Kasper Moskwiak
23405ab6c4 set sources inside video tag 2015-07-28 14:24:07 +02:00
Kasper Moskwiak
e45af2a522 readme: label fix 2015-07-27 19:02:42 +02:00
Kasper Moskwiak
00a0f1534a Merge branch 'develop' 2015-07-27 19:00:29 +02:00
Kasper Moskwiak
5d907840e0 readme 2015-07-27 19:00:23 +02:00
Kasper Moskwiak
26fd89ecb0 readme, version 2015-07-27 18:58:59 +02:00
Kasper Moskwiak
940c95ae67 init 2015-07-27 18:12:42 +02:00
Kasper Moskwiak
2ef9608d5a Initial commit 2015-07-27 18:10:32 +02:00