plyr.git - A fork of plyr without nonfree parts

	Commit message (Collapse)	Author	Age	Files	Lines
...
* \| \|	Formatting	Sam Potts	2017-04-15	3	-22/+43
\|/ /
* \|	Merge branch 'develop' of github.com:Selz/plyr into develop	Sam Potts	2017-03-29	5	-15/+26
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # dist/plyr.js # src/js/plyr.js
\| * \	Merge branch 'develop' of https://github.com/Selz/plyr into develop	Sam Potts	2017-03-28	5	-92/+199
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # dist/plyr.js # src/js/plyr.js
\| * \| \|	Tweaks	Sam Potts	2017-03-28	5	-18/+26
\| \| \| \|
* \| \| \|	Namespacing	Sam Potts	2017-03-29	2	-566/+578
\| \|/ / \|/\| \|
* \| \|	Menu creation (WIP)	Sam Potts	2017-03-28	5	-98/+202
\|/ /
* \|	Controls rewrite	Sam Potts	2017-03-27	2	-313/+321
\| \|
* \|	WIP on new controls creation	Sam Potts	2017-03-26	4	-493/+661
\| \|
* \|	Merge branch 'develop' of https://github.com/Selz/plyr into develop	Sam Potts	2017-03-25	2	-27/+90
\|\ \
\| * \	Merge pull request #520 from platformpurple/feature/subtitles	Sam Potts	2017-03-25	2	-27/+90
\| \|\ \ \| \| \| \| \| \| \| \|	Feature/subtitles
\| \| * \	Merge branch 'develop' into feature/subtitles	Sam Potts	2017-03-25	13	-131/+275
\| \| \|\ \ \| \| \|/ / \| \|/\| \|
\| \| * \|	remove commented out code	Marios Tasos	2017-03-24	1	-7/+2
\| \| \| \|
\| \| * \|	toggle quality options	Marios Tasos	2017-03-24	1	-4/+13
\| \| \| \|
\| \| * \|	make config.captions.selectedIndex number	Marios Tasos	2017-03-22	1	-2/+2
\| \| \| \|
\| \| * \|	set captionExists to true if selectedIndex is bigger than capt source	Marios Tasos	2017-03-22	1	-1/+1
\| \| \| \|
\| \| * \|	fix data typo in language button	Marios Tasos	2017-03-18	1	-1/+1
\| \| \| \|
\| \| * \|	check if captions exists	Marios Tasos	2017-03-15	1	-13/+16
\| \| \| \|
\| \| * \|	Conflicts and tracks array on config	Chrysa Papadopoulou	2017-02-24	3	-67/+68
\| \| \|\ \
\| \| * \| \|	Subtitles tracks	Chrysa Papadopoulou	2017-02-24	2	-13/+59
\| \| \| \| \|
* \| \| \| \|	Notes	Sam Potts	2017-03-25	1	-3/+5
\|/ / / /
* \| \| \|	Merge branch 'master' into develop	Sam Potts	2017-03-25	10	-26/+76
\|\ \ \ \ \| \| \|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # dist/plyr.css # dist/plyr.js # src/js/plyr.js # src/less/plyr.less # src/scss/plyr.scss
\| * \| \|	Version bump to 2.0.12	Sam Potts	2017-03-25	7	-11/+11
\| \| \| \|
\| * \| \|	Changelog update	Sam Potts	2017-03-25	1	-0/+4
\| \| \| \|
\| * \| \|	Merge pull request #468 from jronallo/captions-listener	Sam Potts	2017-03-25	1	-1/+1
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \|	allow for setting additional listener for captions
\| \| * \| \|	allow for setting additional listener for captions	Jason Ronallo	2016-12-26	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Merge pull request #504 from ShimShamSam/master	Sam Potts	2017-03-25	6	-6/+13
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Add blankUrl option to set the URL for blank.mp4
\| \| * \| \| \|	Generated dist files	Samuel Hodge	2017-02-12	4	-5/+5
\| \| \| \| \| \|
\| \| * \| \| \|	Documented the blankUrl option	Samuel Hodge	2017-02-11	1	-0/+6
\| \| \| \| \| \|
\| \| * \| \| \|	Allow configuration of the blank.mp4 URL	Samuel Hodge	2017-02-11	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is useful for people behind firewalls who need to host a blank mp4 themselves.
\| * \| \| \| \|	Update readme.md	Sam Potts	2017-03-09	1	-2/+2
\| \|/ / / /
\| * \| \| \|	Update readme.md	Sam Potts	2017-02-10	1	-0/+1
\| \| \| \| \|
\| * \| \| \|	Update readme.md	Sam Potts	2017-02-10	1	-1/+3
\| \| \| \| \|
\| * \| \| \|	Update readme.md	Sam Potts	2017-02-09	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Update readme.md	Sam Potts	2017-02-09	1	-0/+6
\| \| \| \| \|
\| * \| \| \|	Merge pull request #437 from tv2/playground	Sam Potts	2017-01-10	1	-1/+1
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Fixed typo
\| \| * \| \| \|	Fixed typo	Morten Vestergaard Hansen	2016-11-30	1	-1/+1
\| \| \|/ / /
\| * \| \| \|	Merge pull request #477 from iamrobert/patch-1	Sam Potts	2017-01-10	1	-2/+2
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Update index.html
\| \| * \| \| \|	Update index.html	Robert Stark	2017-01-10	1	-2/+2
\| \|/ / / / \| \| \| \| \| \| \| \| \| \|	Just missing the closing </li>
\| * \| \| \|	Update issue_template.md	Sam Potts	2017-01-10	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Update issue_template.md	Sam Potts	2017-01-10	1	-1/+11
\| \|/ / /
\| * \| \|	v2.0.11	Sam Potts	2016-11-27	5	-19/+23
\| \| \| \|
\| * \| \|	Merge branch 'master' of https://github.com/Selz/plyr	Sam Potts	2016-11-27	2	-4/+8
\| \|\ \ \
\| \| * \ \	Merge pull request #425 from sebastiancarlsson/cleanup-called-twice-bug	Sam Potts	2016-11-18	1	-49/+51
\| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	fixes bug where cleanUp would be called twice
\| \| \| * \| \|	fixes bug where cleanUp would be called twice	Sebastian Carlsson	2016-11-17	1	-49/+51
\| \| \|/ / /
\| \| * \| \|	Update	Sam Potts	2016-11-16	1	-1/+1
\| \| \| \| \|
\| \| * \| \|	Update readme.md	Sam Potts	2016-11-16	1	-3/+5
\| \| \| \| \|
\| * \| \| \|	Fix for iPad and YouTube issues	Sam Potts	2016-11-27	6	-91/+121
\| \|/ / /
* \| \| \|	Manual merge of #509	Sam Potts	2017-03-25	3	-1/+5
\| \| \| \|
* \| \| \|	Clean up	Sam Potts	2017-03-25	2	-53/+41
\| \| \| \|
* \| \| \|	Merge branch 'develop' of https://github.com/Selz/plyr into develop	Sam Potts	2017-03-25	3	-6/+62
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # dist/plyr.js