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 |
|
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
|
2017-03-25 10:58:41 +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
|
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
|
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
|
2444efc834
|
Merge branch 'develop' into improvement/loop-color-area
|
2017-03-25 10:22:02 +11:00 |
|
Sam Potts
|
7b6257ff20
|
Merge branch 'develop' of https://github.com/Selz/plyr into develop
# Conflicts:
# dist/plyr.js
|
2017-03-25 10:09:14 +11:00 |
|
Sam Potts
|
13973125fb
|
Loop variable naming
|
2017-03-25 10:08:39 +11:00 |
|
Marios Tasos
|
47b53fffb4
|
remove commented out code
|
2017-03-24 17:29:48 +02:00 |
|
Marios Tasos
|
9ba3753f80
|
toggle quality options
|
2017-03-24 17:25:09 +02:00 |
|
Marios Tasos
|
a353194fe1
|
make config.captions.selectedIndex number
|
2017-03-22 15:50:56 +02:00 |
|
Marios Tasos
|
c205c47509
|
set captionExists to true if selectedIndex is bigger than capt source
|
2017-03-22 13:38:08 +02:00 |
|
Marios Tasos
|
9c867edfbc
|
fix data typo in language button
|
2017-03-18 01:59:20 +02:00 |
|
Marios Tasos
|
9919d80782
|
check if captions exists
|
2017-03-15 17:18:34 +02:00 |
|
Chrysa Papadopoulou
|
8464ffe6ad
|
Conflicts and tracks array on config
|
2017-02-24 16:38:00 +02:00 |
|
Chrysa Papadopoulou
|
6537225c61
|
Subtitles tracks
|
2017-02-24 16:32:17 +02:00 |
|
Chrysa Papadopoulou
|
dcbf59bd89
|
Colored strip indicating looped area
|
2017-02-15 17:41:04 +02:00 |
|
Chrysa Papadopoulou
|
21d478d396
|
Add looping key bindings to allowed array
|
2017-02-14 17:15:27 +02:00 |
|
Chrysa Papadopoulou
|
d57e453541
|
Fix on typo
|
2017-02-14 16:42:40 +02:00 |
|
Chrysa Papadopoulou
|
3f45ef4908
|
Removed console
|
2017-02-14 16:29:05 +02:00 |
|
Chrysa Papadopoulou
|
1fd742464d
|
Added key bindings for loop
|
2017-02-14 16:04:58 +02:00 |
|
Samuel Hodge
|
7d5c507f16
|
Allow configuration of the blank.mp4 URL
This is useful for people behind firewalls who need to host a blank mp4 themselves.
|
2017-02-11 23:50:49 -05:00 |
|
Sam Potts
|
9c599884a8
|
Merge branch 'develop' of https://github.com/Selz/plyr into develop
# Conflicts:
# dist/plyr.js
# src/js/plyr.js
|
2017-02-05 11:36:53 +11:00 |
|
Sam Potts
|
cbef45841c
|
Menu work
|
2017-02-05 11:34:33 +11:00 |
|
Chrysa Papadopoulou
|
afcdf17a72
|
Removed not needed functions + reverted demo.js to previous
|
2017-02-03 14:52:38 +02:00 |
|
Chrysa Papadopoulou
|
1bcdbe4c00
|
Refactored loop event buttons + on 'No Loop' cleared displayed timing
|
2017-02-02 11:38:08 +02:00 |
|
Chrysa Papadopoulou
|
45c0ded88c
|
Loop functionality
|
2017-02-01 19:16:39 +02:00 |
|
Chrysa Papadopoulou
|
ea30ad9494
|
Playback speed control settings
|
2017-01-31 17:21:33 +02:00 |
|
Sam Potts
|
cc5f37392f
|
ToDo notes, code tidy up
|
2017-01-11 20:14:41 +11:00 |
|
Sam Potts
|
5a0cb9289c
|
JsBeautifier in use, syntax tweaks
|
2017-01-10 20:22:18 +11:00 |
|
Sam Potts
|
bce1d983cb
|
Merge pull request #457 from amowu/patch-3
fix: Firefox can not display captions
|
2017-01-04 08:45:40 +11:00 |
|
Jason Ronallo
|
96ae866baa
|
allow for setting additional listener for captions
|
2016-12-26 17:06:59 -05:00 |
|
Amo Wu
|
0cbfc9252c
|
fix: parse webVTT time NaN
|
2016-12-16 14:32:04 +08:00 |
|
Amo Wu
|
d02e57bdb3
|
fix: Firefox can not display captions
|
2016-12-15 16:38:46 +08:00 |
|