plyr.git - A fork of plyr without nonfree parts

	Commit message (Collapse)	Author	Age	Files	Lines
*	v3.6.2	Sam Potts	2020-05-04	2	-2/+8
\|
*	Package upgrades	Sam Potts	2020-05-04	2	-170/+149
\|
*	Merge pull request #1818 from Bashev/patch-1	Sam Potts	2020-05-04	1	-1/+2
\|\ \| \| \| \|	Update tooltips.scss
\| *	Update tooltips.scss	Kostadin Bashev	2020-05-01	1	-1/+2
\| \|
* \|	Merge pull request #1819 from Bashev/patch-2	Sam Potts	2020-05-04	1	-1/+2
\|\ \ \| \| \| \| \| \|	Update controls.scss
\| * \|	Update controls.scss	Kostadin Bashev	2020-05-01	1	-1/+2
\| \|/
* \|	Merge pull request #1815 from taylorchu/progbar	Sam Potts	2020-04-29	1	-0/+10
\|\ \ \| \| \| \| \| \|	add missing previewThumbnails options
\| * \|	add missing previewThumbnails options	taylorchu	2020-04-28	1	-0/+10
\|/ /
* \|	Merge pull request #1811 from taylorchu/better-control-2	Sam Potts	2020-04-29	2	-5/+3
\|\ \ \| \| \| \| \| \|	allow custom control as element
\| * \|	allow custom control as element	taylorchu	2020-04-28	2	-5/+3
\| \| \|
* \| \|	Merge pull request #1813 from sampotts/master	Sam Potts	2020-04-29	27	-153/+161
\|\ \ \ \| \|/ / \|/\| / \| \|/	Merge back
\| *	v3.6.1	Sam Potts	2020-04-28	26	-152/+160
\| \|
\| *	2 spaces	Sam Potts	2020-04-28	1	-1/+1
\| \|
\| *	Merge pull request #1796 from sampotts/develop	Sam Potts	2020-04-28	142	-19204/+23423
\| \|\ \| \|/ \|/\|	v3.6.0
* \|	Use new feature to set thumbnails on source change in the demo	Sam Potts	2020-04-24	4	-3/+9
\| \|
* \|	v3.6.0	Sam Potts	2020-04-24	19	-346/+998
\| \|
* \|	Housekeeping	Sam Potts	2020-04-24	15	-1523/+1530
\| \|
* \|	Fix linting issues	Sam Potts	2020-04-24	2	-1/+3
\| \|
* \|	Merge branch 'master' into develop	Sam Potts	2020-04-24	3	-6/+10
\|\\| \| \| \| \| \| \| \| \|	# Conflicts: # readme.md
\| *	Merge pull request #1789 from likev/patch-1	Sam Potts	2020-04-22	1	-2/+0
\| \|\ \| \| \| \| \| \|	Update readme.md
\| \| *	Update readme.md	xufanglu	2020-04-21	1	-2/+0
\| \| \| \| \| \| \| \| \|	There is another same Note below
\| * \|	Merge pull request #1790 from likev/patch-2	Sam Potts	2020-04-22	1	-1/+1
\| \|\ \ \| \| \|/ \| \|/\|	Update readme.md
\| \| *	Update readme.md	xufanglu	2020-04-21	1	-1/+1
\| \|/ \| \| \| \|	fixed code logic error
\| *	Merge pull request #1731 from nisarhassan12/master	Sam Potts	2020-03-29	2	-3/+9
\| \|\ \| \| \| \| \| \|	update the gitpod setup description to be more precise.
\| \| *	update the gitpod setup description to be more precise.	Nisar Hassan Naqvi	2020-03-16	2	-3/+9
\| \|/
* \|	Merge branch 'develop' of github.com:sampotts/plyr into develop	Sam Potts	2020-04-24	128	-14595/+17795
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # package.json # yarn.lock
\| * \	Merge pull request #1770 from sampotts/css-variables	Sam Potts	2020-04-24	130	-14965/+18098
\| \|\ \ \| \| \| \| \| \| \| \|	Allow customization via CSS Custom Properties
\| \| * \	Merge branch 'develop' into css-variables	Sam Potts	2020-04-24	8	-10/+61
\| \| \|\ \ \| \| \|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # src/js/captions.js # src/js/config/defaults.js # src/js/fullscreen.js # src/js/listeners.js # src/js/plyr.js
\| \| * \|	More work on custom properties and documentation	Sam Potts	2020-04-24	18	-223/+290
\| \| \| \|
\| \| * \|	Use custom properties in demo	Sam Potts	2020-04-23	2	-22/+17
\| \| \| \|
\| \| * \|	Migrate custom properties from media to parent	Sam Potts	2020-04-23	2	-0/+23
\| \| \| \|
\| \| * \|	Poster image fix (fixes #1763)	Sam Potts	2020-04-19	6	-21/+13
\| \| \| \|
\| \| * \|	Vimeo ratio fixes	Sam Potts	2020-04-19	6	-42/+51
\| \| \| \|
\| \| * \|	Converted to 2 space indentation	Sam Potts	2020-04-11	125	-10889/+10785
\| \| \| \|
\| \| * \|	Sentry upgrade for demo	Sam Potts	2020-03-30	11	-4035/+7014
\| \| \| \|
\| \| * \|	Formatting fixes	Sam Potts	2020-03-30	5	-13/+25
\| \| \| \|
\| \| * \|	Merge branch 'develop' into css-variables	Sam Potts	2020-03-30	110	-10305/+27343
\| \| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # demo/dist/demo.css # demo/dist/demo.min.js.map # demo/index.html # dist/plyr.css # dist/plyr.min.js.map # dist/plyr.min.mjs.map # dist/plyr.polyfilled.min.js.map # dist/plyr.polyfilled.min.mjs.map # gulpfile.js # src/sass/base.scss # src/sass/components/control.scss # src/sass/settings/colors.scss # src/sass/settings/controls.scss
\| \| * \| \|	Build	Sam Potts	2019-06-01	5	-5/+5
\| \| \| \| \|
\| \| * \| \|	Fixed merge	Sam Potts	2019-06-01	1	-0/+30
\| \| \| \| \|
\| \| * \| \|	Clean up	Sam Potts	2019-06-01	1	-1/+0
\| \| \| \| \|
\| \| * \| \|	Merge branch 'develop' into css-variables	Sam Potts	2019-06-01	52	-8084/+14652
\| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # .eslintrc # demo/dist/demo.css # demo/dist/demo.js # demo/dist/demo.min.js # demo/dist/demo.min.js.map # dist/plyr.css # dist/plyr.js # dist/plyr.min.js # dist/plyr.min.js.map # dist/plyr.min.mjs # dist/plyr.min.mjs.map # dist/plyr.mjs # dist/plyr.polyfilled.js # dist/plyr.polyfilled.min.js # dist/plyr.polyfilled.min.js.map # dist/plyr.polyfilled.min.mjs # dist/plyr.polyfilled.min.mjs.map # dist/plyr.polyfilled.mjs # gulpfile.js # package.json
\| \| * \| \| \|	More work on variable usage	Sam Potts	2019-04-11	13	-85/+69
\| \| \| \| \| \|
\| \| * \| \| \|	Fix merge	Sam Potts	2019-03-16	11	-6/+24664
\| \| \| \| \| \|
\| \| * \| \| \|	Merge branch 'develop' into css-variables	Sam Potts	2019-03-16	56	-14895/+24950
\| \| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # demo/dist/demo.css # demo/index.html # dist/plyr.css # gulpfile.js # package.json # yarn.lock
\| \| * \| \| \| \|	Work on outline/focus styles	Sam Potts	2018-12-08	7	-190/+291
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Merge branch 'develop' into css-variables	Sam Potts	2018-11-11	113	-29655/+27341
\| \| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # demo/dist/demo.css # demo/dist/demo.js # demo/dist/demo.js.map # demo/dist/demo.min.js # demo/dist/demo.min.js.map # dist/plyr.css # dist/plyr.js # dist/plyr.js.map # dist/plyr.min.js # dist/plyr.min.js.map # dist/plyr.polyfilled.js # dist/plyr.polyfilled.js.map # dist/plyr.polyfilled.min.js # dist/plyr.polyfilled.min.js.map # gulpfile.js # src/sass/components/captions.scss # src/sass/components/control.scss
\| \| * \| \| \| \| \|	WIP	Sam Potts	2018-05-26	24	-619/+1398
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge	Sam Potts	2020-04-24	2	-604/+548
\|/ / / / / / /
* \| \| \| \| \| \|	Merge pull request #1793 from theprojectsomething/features/postload-captions	Sam Potts	2020-04-23	1	-1/+13
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Preload TextTracks as per default video element
\| * \| \| \| \| \| \|	This commit addresses preloading TextTracks as outlined in feature request #1791	Som Meaden	2020-04-23	1	-1/+13
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	These changes bring Plyr captions download behaviour in line with that of the default video element in major browsers. Specifically text tracks only download as they are required for display. Previously all text tracks would download when the Plyr instance was instantiated - which could become an issue when e.g. many translations are available. For a track to be downloaded it must either be the default track, the active track when captions are toggled on, or selected from the captions menu.