plyr.git - A fork of plyr without nonfree parts

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| * \| \| \| \| \| \| \|	Manual merge of #543 PR	Sam Potts	2017-03-25	4	-26/+23
\| \|/ / / / / / /
\| * \| \| \| \| \| \|	Merge pull request #514 from platformpurple/improvement/loop-color-area	Sam Potts	2017-03-25	2	-4/+23
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improvement/loop color area
\| \| * \ \ \ \ \ \	Merge branch 'develop' into improvement/loop-color-area	Sam Potts	2017-03-25	5	-71/+87
\| \| \|\ \ \ \ \ \ \ \| \| \|/ / / / / / / \| \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge branch 'develop' of https://github.com/Selz/plyr into develop	Sam Potts	2017-03-25	2	-5/+5
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # dist/plyr.js
\| \| * \ \ \ \ \ \ \	Merge pull request #511 from platformpurple/develop	Sam Potts	2017-03-25	2	-4/+4
\| \| \|\ \ \ \ \ \ \ \ \| \| \| \|_\|/ / / / / / \| \| \|/\| \| \| \| \| \| \|	Fix on typo
\| * / \| \| \| \| \| \| \|	Loop variable naming	Sam Potts	2017-03-25	5	-60/+81
\| \|/ / / / / / / /
\| \| \| * / / / / /	Colored strip indicating looped area	Chrysa Papadopoulou	2017-02-15	2	-3/+27
\| \| \|/ / / / / /
\| \| * \| \| \| \| \|	Fix on typo and gulp	Chrysa Papadopoulou	2017-02-14	1	-1/+1
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Fix on typo	Chrysa Papadopoulou	2017-02-14	1	-3/+3
\| \|/ / / / / /
\| * \| \| \| \| \|	Merge branch 'develop' of https://github.com/Selz/plyr into develop	Sam Potts	2017-02-05	4	-21/+165
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # dist/plyr.js # src/js/plyr.js
\| \| * \ \ \ \ \	Merge pull request #490 from platformpurple/develop	Sam Potts	2017-02-05	4	-20/+165
\| \| \|\ \ \ \ \ \ \| \| \| \| \|/ / / / \| \| \| \|/\| \| \| \|	Playback speed and looping controls
\| \| \| * \| \| \| \|	Removed not needed functions + reverted demo.js to previous	Chrysa Papadopoulou	2017-02-03	3	-62/+3
\| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \|	Refactored loop event buttons + on 'No Loop' cleared displayed timing	Chrysa Papadopoulou	2017-02-02	3	-32/+16
\| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \|	Loop functionality	Chrysa Papadopoulou	2017-02-01	4	-10/+203
\| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \|	Playback speed control settings	Chrysa Papadopoulou	2017-01-31	4	-15/+42
\| \| \|/ / / / /
\| * / / / / /	Menu work	Sam Potts	2017-02-05	3	-36/+37
\| \|/ / / / /
\| * \| \| \| \|	Merge branch 'develop' of https://github.com/Selz/plyr into develop	Sam Potts	2017-01-11	0	-0/+0
\| \|\ \ \ \ \
\| \| * \ \ \ \	Merge branch 'develop' of github.com:Selz/plyr into develop	Sam Potts	2017-01-10	2	-873/+892
\| \| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # dist/plyr.js # src/js/plyr.js
\| \| * \| \| \| \| \|	JsBeautifier	Sam Potts	2017-01-10	3	-1158/+1296
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	ToDo notes, code tidy up	Sam Potts	2017-01-11	6	-709/+827
\| \| \|/ / / / / \| \|/\| \| \| \| \|
\| * \| \| \| \| \|	JsBeautifier in use, syntax tweaks	Sam Potts	2017-01-10	3	-464/+620
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge pull request #457 from amowu/patch-3	Sam Potts	2017-01-04	1	-8/+5
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix: Firefox can not display captions
\| \| * \| \| \| \| \|	fix: Firefox can not display captions	Amo Wu	2016-12-15	1	-8/+5
\| \| \|/ / / / /
\| * \| \| \| \| \|	Merge pull request #458 from amowu/patch-4	Sam Potts	2017-01-04	1	-2/+6
\| \|\ \ \ \ \ \ \| \| \|/ / / / / \| \|/\| \| \| \| \|	fix: parse webVTT time NaN
\| \| * \| \| \| \|	fix: parse webVTT time NaN	Amo Wu	2016-12-16	1	-2/+6
\| \|/ / / / /
\| * \| \| \| \|	Merge pull request #427 from amowu/patch-2	Sam Potts	2016-11-27	1	-0/+3
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix cannot scroll after destroyed
\| \| * \| \| \| \|	Fix cannot scroll after destroyed	Amo Wu	2016-11-24	1	-0/+3
\| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \|	In single page application, switch router when plyr is fullscreen mode, page cannot scroll, because `document.body.style.overflow` is `hidden`
\| * \| \| \| \|	Merge pull request #419 from amowu/patch-1	Sam Potts	2016-11-18	1	-0/+1
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	refactor: miss prefix
\| \| * \| \| \| \|	refactor: miss prefix	Amo Wu	2016-11-10	1	-0/+1
\| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \|	fix _fullscreen.prefix can't work
\| * \| \| \| \|	Quality WIP	Sam Potts	2016-11-06	4	-144/+217
\| \| \| \| \| \|
\| * \| \| \| \|	Merge branch 'master' into develop	Sam Potts	2016-11-06	5	-22/+83
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # demo/index.html # dist/plyr.js
\| * \| \| \| \| \|	PiP	Sam Potts	2016-11-01	7	-25/+37
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Fullscreen fix, styling	Sam	2016-10-24	6	-22/+27
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge branch 'develop' of https://github.com/Selz/plyr into develop	Sam	2016-10-23	7	-37/+96
\| \|\ \ \ \ \ \
\| \| * \| \| \| \| \|	Work on PiP	Sam Potts	2016-10-23	7	-37/+96
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'develop' of https://github.com/Selz/plyr into develop	Sam	2016-10-23	16	-53/+123
\| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # src/js/plyr.js
\| \| * \| \| \| \| \|	Merge branch 'master' into develop	Sam Potts	2016-10-23	14	-33/+104
\| \| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # demo/dist/demo.js # dist/plyr.css # dist/plyr.js
\| \| * \| \| \| \| \| \|	Fixed for array passed to _on and _off	Sam Potts	2016-10-03	6	-25/+24
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Tweaks	Sam	2016-10-23	1	-14/+11
\| \|/ / / / / / /
\| * \| \| \| \| \| \|	Merge branch 'master' into develop	Sam	2016-10-01	1	-3/+14
\| \|\ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Code style	Sam	2016-10-01	1	-7/+5
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Manually merged #385	Sam	2016-10-01	8	-28/+134
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Menu animation	Sam	2016-09-26	4	-87/+138
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Menu	Sam	2016-09-25	5	-10/+10
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	More menu work	Sam Potts	2016-09-25	7	-63/+200
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge branch 'develop' of https://github.com/Selz/plyr into develop	Sam Potts	2016-09-14	7	-118/+128
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # dist/plyr.css # dist/plyr.js
\| \| * \| \| \| \| \| \| \|	Started on PIP support	Sam	2016-09-13	5	-113/+121
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Expanded	Sam Potts	2016-09-13	4	-6/+6
\| \|/ / / / / / / /
\| * \| \| \| \| \| \| \|	Added quality in menu	Sam Potts	2016-09-07	6	-12/+23
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Icon fix	Sam	2016-09-06	2	-13/+7
\| \| \| \| \| \| \| \| \|