 Sam Potts
|
b3d798eeee
|
Gulp tweak
|
2017-04-25 22:39:14 +10:00 |
|
 Sam Potts
|
b499622eb8
|
Started on Vimeo captions
|
2017-04-25 20:45:25 +10:00 |
|
|
Sam Potts
|
04b8d0bac8
|
Tweaks
|
2017-04-25 19:31:34 +10:00 |
|
|
Sam Potts
|
8ea4cbd942
|
Tidy up
|
2017-04-25 18:43:09 +10:00 |
|
|
Sam Potts
|
7889ae1126
|
Built JS
|
2017-04-25 18:37:56 +10:00 |
|
|
Sam Potts
|
897d49ad87
|
Merge branch 'develop' of https://github.com/Selz/plyr into develop
|
2017-04-25 18:37:36 +10:00 |
|
|
Sam Potts
|
1960d35d8b
|
More work on menus and tidy up
|
2017-04-25 18:37:31 +10:00 |
|
 Sam Potts
|
0b7d0dedf6
|
Merge pull request #545 from silverwind/blank-mp4
Add blank.mp4 to dist files
|
2017-04-25 12:40:20 +10:00 |
|
|
Sam Potts
|
948e2cc66c
|
Merge branch 'develop' into blank-mp4
|
2017-04-25 12:40:13 +10:00 |
|
|
Sam Potts
|
396b816a1f
|
Merge pull request #563 from stormrockwell/master
removed vimeo id parsing because it is not necessary
|
2017-04-25 12:37:43 +10:00 |
|
|
Sam Potts
|
0a58cbfd59
|
Merge branch 'develop' into master
|
2017-04-25 12:37:35 +10:00 |
|
|
Sam Potts
|
bbe4b7e565
|
Notes
|
2017-04-22 14:55:03 +10:00 |
|
 stormrockwell
|
2ecca2cbe3
|
removed vimeo id parsing because it is not necessary
|
2017-04-19 15:16:03 -04:00 |
|
|
Sam Potts
|
f5d80fa888
|
Notes
|
2017-04-19 22:40:32 +10:00 |
|
|
Sam Potts
|
f2bbe4eb12
|
Looping menu (WIP)
|
2017-04-19 22:34:52 +10:00 |
|
|
Sam Potts
|
60e51b7077
|
Added notes
|
2017-04-19 21:33:23 +10:00 |
|
|
Sam Potts
|
01d1ac9ab9
|
Toggle menu
|
2017-04-17 21:05:35 +10:00 |
|
|
Sam Potts
|
9b2396f5ff
|
Airplay and PiP
|
2017-04-17 01:28:52 +10:00 |
|
|
Sam Potts
|
da15980b8a
|
ID fix and styling fix
|
2017-04-17 00:32:41 +10:00 |
|
|
Sam Potts
|
452678867f
|
More work on menus
|
2017-04-16 20:38:45 +10:00 |
|
|
Sam Potts
|
ff2d27f8e5
|
Cleanup events and references
|
2017-04-16 13:00:57 +10:00 |
|
|
Sam Potts
|
546cdaad92
|
Merge branch 'develop' of https://github.com/Selz/plyr into develop
# Conflicts:
# dist/plyr.js
|
2017-04-15 23:22:35 +10:00 |
|
|
Sam Potts
|
5d38497f07
|
Formatting
|
2017-04-15 23:22:14 +10:00 |
|
|
Sam Potts
|
808a3af3cf
|
Formatting
|
2017-04-15 23:21:18 +10:00 |
|
|
Sam Potts
|
889712761a
|
Merge branch 'develop' of github.com:Selz/plyr into develop
# Conflicts:
# dist/plyr.js
# src/js/plyr.js
|
2017-03-29 09:05:25 +11:00 |
|
|
Sam Potts
|
46fab972a0
|
Namespacing
|
2017-03-29 09:03:33 +11:00 |
|
|
Sam Potts
|
535c046b62
|
Merge branch 'develop' of https://github.com/Selz/plyr into develop
# Conflicts:
# dist/plyr.js
# src/js/plyr.js
|
2017-03-28 09:30:37 +11:00 |
|
|
Sam Potts
|
55dfab8394
|
Tweaks
|
2017-03-28 09:19:58 +11:00 |
|
|
Sam Potts
|
18bf4d84b9
|
Menu creation (WIP)
|
2017-03-28 00:12:33 +11:00 |
|
|
Sam Potts
|
ef1d73df15
|
Controls rewrite
|
2017-03-27 00:25:41 +11:00 |
|
|
Sam Potts
|
684107da5c
|
WIP on new controls creation
|
2017-03-26 21:32:41 +11:00 |
|
 silverwind
|
2a97a9a9c5
|
Add blank.mp4 to dist files
For a complete "offline" experience, it's necessary to self-host the
file, so include it in the dist files for that purpose.
|
2017-03-25 10:58:36 +01:00 |
|
|
Sam Potts
|
ca12343b16
|
Merge branch 'develop' of https://github.com/Selz/plyr into develop
|
2017-03-25 18:44:17 +11:00 |
|
|
Sam Potts
|
a974fbf31c
|
Notes
|
2017-03-25 18:44:10 +11:00 |
|
|
Sam Potts
|
6eaf33ec6c
|
Merge pull request #520 from platformpurple/feature/subtitles
Feature/subtitles
|
2017-03-25 18:43:45 +11:00 |
|
|
Sam Potts
|
33fef7faee
|
Merge branch 'develop' into feature/subtitles
|
2017-03-25 18:43:36 +11:00 |
|
|
Sam Potts
|
b083bf4297
|
Merge branch 'master' into develop
# Conflicts:
# dist/plyr.css
# dist/plyr.js
# src/js/plyr.js
# src/less/plyr.less
# src/scss/plyr.scss
|
2017-03-25 11:24:38 +11:00 |
|
|
Sam Potts
|
4957e4d80c
|
Version bump to 2.0.12
v2.0.12
|
2017-03-25 10:58:41 +11:00 |
|
|
Sam Potts
|
605f8a8249
|
Changelog update
|
2017-03-25 10:57:52 +11:00 |
|
|
Sam Potts
|
7490a7e7f3
|
Merge pull request #468 from jronallo/captions-listener
allow for setting additional listener for captions
|
2017-03-25 10:51:54 +11:00 |
|
|
Sam Potts
|
f32527feb4
|
Merge pull request #504 from ShimShamSam/master
Add blankUrl option to set the URL for blank.mp4
|
2017-03-25 10:50:55 +11:00 |
|
|
Sam Potts
|
ebc7ed538a
|
Manual merge of #509
|
2017-03-25 10:49:04 +11:00 |
|
|
Sam Potts
|
a60868bfe8
|
Clean up
|
2017-03-25 10:47:37 +11:00 |
|
|
Sam Potts
|
4a2866d05f
|
Merge branch 'develop' of https://github.com/Selz/plyr into develop
# Conflicts:
# dist/plyr.js
|
2017-03-25 10:37:21 +11:00 |
|
|
Sam Potts
|
1a05f352c7
|
Code formatting
|
2017-03-25 10:37:00 +11:00 |
|
|
Sam Potts
|
ba27de0669
|
Merge pull request #510 from platformpurple/feature/loop-events
Added key bindings for loop
|
2017-03-25 10:35:15 +11:00 |
|
|
Sam Potts
|
e21e7054ce
|
Merge branch 'develop' into feature/loop-events
|
2017-03-25 10:35:08 +11:00 |
|
|
Sam Potts
|
bc323e905c
|
Manual merge of #543 PR
|
2017-03-25 10:27:03 +11:00 |
|
|
Sam Potts
|
afa1fe9d5f
|
Merge pull request #514 from platformpurple/improvement/loop-color-area
Improvement/loop color area
|
2017-03-25 10:22:10 +11:00 |
|
|
Sam Potts
|
2444efc834
|
Merge branch 'develop' into improvement/loop-color-area
|
2017-03-25 10:22:02 +11:00 |
|