aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | Fix PreviewThumbnailsOptions typeTakeshi2020-07-131-1/+1
| |/ / | | | | | | According to the docs, the `src` should also accept an array of strings.
| * | Merge pull request #1823 from theprojectsomething/features/fullscreen-containerSam Potts2020-05-051-1/+3
|/| | | | | | | | force fullscreen events to trigger on plyr element
| * | force fullscreen events to trigger on plyr element (media element in iOS) ↵Som Meaden2020-05-051-1/+3
|/ / | | | | | | and not fullscreen container
* | v3.6.2Sam Potts2020-05-042-2/+8
| |
* | Package upgradesSam Potts2020-05-042-170/+149
| |
* | Merge pull request #1818 from Bashev/patch-1Sam Potts2020-05-041-1/+2
|\ \ | | | | | | Update tooltips.scss
| * | Update tooltips.scssKostadin Bashev2020-05-011-1/+2
| | |
* | | Merge pull request #1819 from Bashev/patch-2Sam Potts2020-05-041-1/+2
|\ \ \ | | | | | | | | Update controls.scss
| * | | Update controls.scssKostadin Bashev2020-05-011-1/+2
| |/ /
* | | Merge pull request #1815 from taylorchu/progbarSam Potts2020-04-291-0/+10
|\ \ \ | | | | | | | | add missing previewThumbnails options
| * | | add missing previewThumbnails optionstaylorchu2020-04-281-0/+10
|/ / /
* | | Merge pull request #1811 from taylorchu/better-control-2Sam Potts2020-04-292-5/+3
|\ \ \ | | | | | | | | allow custom control as element
| * | | allow custom control as elementtaylorchu2020-04-282-5/+3
| | | |
* | | | Merge pull request #1813 from sampotts/masterSam Potts2020-04-2927-153/+161
|\ \ \ \ | |/ / / |/| / / | |/ / Merge back
| * | v3.6.1Sam Potts2020-04-2826-152/+160
| | |
| * | 2 spacesSam Potts2020-04-281-1/+1
| | |
| * | Merge pull request #1796 from sampotts/developSam Potts2020-04-28142-19204/+23423
| |\ \ | |/ / |/| | v3.6.0
* | | Use new feature to set thumbnails on source change in the demoSam Potts2020-04-244-3/+9
| | |
* | | v3.6.0Sam Potts2020-04-2419-346/+998
| | |
* | | HousekeepingSam Potts2020-04-2415-1523/+1530
| | |
* | | Fix linting issuesSam Potts2020-04-242-1/+3
| | |
* | | Merge branch 'master' into developSam Potts2020-04-243-6/+10
|\| | | | | | | | | | | | | | # Conflicts: # readme.md
| * | Merge pull request #1789 from likev/patch-1Sam Potts2020-04-221-2/+0
| |\ \ | | | | | | | | Update readme.md
| | * | Update readme.mdxufanglu2020-04-211-2/+0
| | | | | | | | | | | | There is another same Note below
| * | | Merge pull request #1790 from likev/patch-2Sam Potts2020-04-221-1/+1
| |\ \ \ | | |/ / | |/| | Update readme.md
| | * | Update readme.mdxufanglu2020-04-211-1/+1
| |/ / | | | | | | fixed code logic error
| * | Merge pull request #1731 from nisarhassan12/masterSam Potts2020-03-292-3/+9
| |\ \ | | | | | | | | update the gitpod setup description to be more precise.
| | * | update the gitpod setup description to be more precise.Nisar Hassan Naqvi2020-03-162-3/+9
| |/ /
* | | Merge branch 'develop' of github.com:sampotts/plyr into developSam Potts2020-04-24128-14595/+17795
|\ \ \ | | | | | | | | | | | | | | | | | | | | # Conflicts: # package.json # yarn.lock
| * \ \ Merge pull request #1770 from sampotts/css-variablesSam Potts2020-04-24130-14965/+18098
| |\ \ \ | | | | | | | | | | Allow customization via CSS Custom Properties
| | * \ \ Merge branch 'develop' into css-variablesSam Potts2020-04-248-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 documentationSam Potts2020-04-2418-223/+290
| | | | |
| | * | | Use custom properties in demoSam Potts2020-04-232-22/+17
| | | | |
| | * | | Migrate custom properties from media to parentSam Potts2020-04-232-0/+23
| | | | |
| | * | | Poster image fix (fixes #1763)Sam Potts2020-04-196-21/+13
| | | | |
| | * | | Vimeo ratio fixesSam Potts2020-04-196-42/+51
| | | | |
| | * | | Converted to 2 space indentationSam Potts2020-04-11125-10889/+10785
| | | | |
| | * | | Sentry upgrade for demoSam Potts2020-03-3011-4035/+7014
| | | | |
| | * | | Formatting fixesSam Potts2020-03-305-13/+25
| | | | |
| | * | | Merge branch 'develop' into css-variablesSam Potts2020-03-30110-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
| | * | | | BuildSam Potts2019-06-015-5/+5
| | | | | |
| | * | | | Fixed mergeSam Potts2019-06-011-0/+30
| | | | | |
| | * | | | Clean upSam Potts2019-06-011-1/+0
| | | | | |
| | * | | | Merge branch 'develop' into css-variablesSam Potts2019-06-0152-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 usageSam Potts2019-04-1113-85/+69
| | | | | | |
| | * | | | | Fix mergeSam Potts2019-03-1611-6/+24664
| | | | | | |
| | * | | | | Merge branch 'develop' into css-variablesSam Potts2019-03-1656-14895/+24950
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # demo/dist/demo.css # demo/index.html # dist/plyr.css # gulpfile.js # package.json # yarn.lock
| | * | | | | | Work on outline/focus stylesSam Potts2018-12-087-190/+291
| | | | | | | |
| | * | | | | | Merge branch 'develop' into css-variablesSam Potts2018-11-11113-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
| | * | | | | | | WIPSam Potts2018-05-2624-619/+1398
| | | | | | | | |