aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into developSam Potts2018-07-1816-46/+460
|\ | | | | | | | | | | | | | | | | | | # Conflicts: # changelog.md # dist/plyr.js.map # dist/plyr.min.js.map # dist/plyr.polyfilled.js.map # dist/plyr.polyfilled.min.js.map # package.json
| * Merge pull request #1094 from friday/remarkSam Potts2018-07-113-13/+414
| |\ | | | | | | Verify internal documentation links with "remark"
| | * Fix internal link for the source setterAlbin Larsson2018-07-101-1/+1
| | |
| | * Add 'remark' and plugin to verify internal links in markdownAlbin Larsson2018-07-102-12/+413
| |/
| * Merge pull request #1092 from friday/readme-streaming-linkSam Potts2018-07-101-1/+1
| |\ | | | | | | Fix streaming link in docs
| | * Fix streaming linkAlbin Larsson2018-07-091-1/+1
| |/
| * Update pull_request_template.mdSam Potts2018-07-051-1/+1
| |
| * Update issue_template.mdSam Potts2018-07-051-4/+2
| |
| * Merge branch 'develop'Sam Potts2018-06-2935-323/+486
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # changelog.md # demo/dist/demo.css # demo/dist/demo.js.map # demo/dist/demo.min.js # demo/dist/demo.min.js.map # dist/plyr.css # dist/plyr.js.map # dist/plyr.min.js.map # dist/plyr.polyfilled.js.map # dist/plyr.polyfilled.min.js # dist/plyr.polyfilled.min.js.map # package.json # readme.md # src/js/plyr.js # src/js/plyr.polyfilled.js
| * | Fix for bug where controls wouldn't show on hover over YouTube videoSam Potts2018-06-2112-14/+18
| | |
| * | Remove `pointer-events: none` on embed `<iframe>` to comply with YouTube ToSSam Potts2018-06-2112-18/+17
| | |
| * | Merge branch 'develop'Sam Potts2018-06-2121-274/+320
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # dist/plyr.js.map # dist/plyr.min.js # dist/plyr.min.js.map # dist/plyr.polyfilled.js.map # dist/plyr.polyfilled.min.js # dist/plyr.polyfilled.min.js.map
| * \ \ Merge pull request #1057 from meyt/patch-1Sam Potts2018-06-201-1/+1
| |\ \ \ | | | | | | | | | | Fix i18n defaults path on README
| | * | | Fix i18n defaults pathMeyti2018-06-201-1/+1
| |/ / /
| * | | v3.3.17Sam Potts2018-06-197-10/+10
| | | |
| * | | v3.3.17Sam Potts2018-06-1910-51/+56
| | | | | | | | | | | | | | | | | | | | - Fix YouTube muting after seeking with the progress slider - Respect preload="none" when setting quality if the media hasn't been loaded some other way
| * | | Merge branch 'develop'Sam Potts2018-06-192-14/+16
| |\ \ \
| * | | | v3.3.16Sam Potts2018-06-199-12/+16
| | | | |
* | | | | 3.3.17Sam Potts2018-07-1815-44/+160
| | | | |
* | | | | Merge pull request #1080 from gurupras/html5-quality-source-setter-readmeSam Potts2018-07-181-0/+2
|\ \ \ \ \ | | | | | | | | | | | | Updated README.md to show how to add quality options to HTML5 videos
| * | | | | Updated README.md to show up to add quality options to HTML5 videosGuru Prasad Srinivasa2018-06-301-0/+2
| | |_|_|/ | |/| | | | | | | | | | | | | initialized via the source setter
* | | | | Merge pull request #1095 from friday/sticklerSam Potts2018-07-111-0/+5
|\ \ \ \ \ | | | | | | | | | | | | Add stickler config
| * | | | | Add stickler configAlbin Larsson2018-07-101-0/+5
|/ / / / /
* | | | | Merge pull request #1093 from friday/travis-2Sam Potts2018-07-103-4/+15
|\ \ \ \ \ | | | | | | | | | | | | Verify PR instructions with Travis
| * | | | | Add travis check for the base branch (only permit develop for code changes)Albin Larsson2018-07-102-0/+6
| | | | | |
| * | | | | Add travis check for omitting dist in development branchAlbin Larsson2018-07-102-0/+6
| | | | | |
| * | | | | Simplify travis confAlbin Larsson2018-07-101-4/+3
|/ / / / /
* | | | | Merge pull request #1091 from friday/1085Sam Potts2018-07-101-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Add navigator.languages fallback for ios 9
| * | | | | Add navigator.languages fallback for ios 9Albin Larsson2018-07-091-1/+1
|/ / / / /
* | | | | Merge pull request #1083 from friday/fix-travisSam Potts2018-07-021-0/+1
|\ \ \ \ \ | | | | | | | | | | | | Change "no-cycle" lint-error to warning
| * | | | | Change linting import/no-cycle to warning (not error)Albin Larsson2018-07-011-0/+1
| |/ / / /
* | | | | Merge pull request #1082 from friday/yarn-error.logSam Potts2018-07-021-1/+2
|\ \ \ \ \ | |/ / / / |/| | | | Gitignore yarn-error.log
| * | | | Gitignore yarn-error.logAlbin Larsson2018-07-011-1/+2
|/ / / /
* | | | 3.3.16Sam Potts2018-06-2921-230/+390
| | | |
* | | | Merge branch 'develop' of github.com:sampotts/plyr into developSam Potts2018-06-292-1/+12
|\ \ \ \
| * \ \ \ Merge pull request #1075 from mimse/feature/handle_live_streamSam Potts2018-06-282-1/+12
| |\ \ \ \ | | | | | | | | | | | | Hide currentTime and progress
| | * | | | Hide currentTime and progressmimse2018-06-282-1/+12
| |/ / / /
* / / / / Linting, housekeeping, duration fix (fixes #1074)Sam Potts2018-06-2926-109/+105
|/ / / /
* | | | Merge pull request #1070 from mimse/fix_condition_checkSam Potts2018-06-271-1/+1
|\ \ \ \ | | | | | | | | | | Fixed condition check
| * | | | Fixed condition checkMorten Vestergaard Hansen2018-06-271-1/+1
| | | | | | | | | | | | | | | If class includes "control" it will add it again.
* | | | | Merge branch 'develop' of github.com:sampotts/plyr into developSam Potts2018-06-252-5/+9
|\ \ \ \ \
| * \ \ \ \ Merge pull request #1063 from klassicd/developSam Potts2018-06-251-3/+5
| |\ \ \ \ \ | | | | | | | | | | | | | | Handle undefined this.player.elements.buttons.play
| | * | | | | handle undefined player.elements.buttons.playMichael DePetrillo2018-06-251-3/+5
| |/ / / / /
| * | | | | Merge pull request #1061 from friday/captions-no-toggle-buttonSam Potts2018-06-221-2/+4
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | Fix captions.toggle() if there is no toggle button
| | * | | | Fix captions.toggle() if there is no toggle buttonAlbin Larsson2018-06-211-2/+4
| | | | | |
* | | | | | Linting and package tweakSam Potts2018-06-252-4/+5
|/ / / / /
* / / / / Ads only on HTML5 and .is cleanupSam Potts2018-06-2110-262/+312
|/ / / /
* | | | Merge pull request #1056 from friday/volumeSam Potts2018-06-202-30/+13
|\ \ \ \ | |_|_|/ |/| | | Minor increaseVolume and decreaseVolume changes
| * | | Avoid conditions in volume scroll event listenerAlbin Larsson2018-06-191-27/+11
| | | |
| * | | Make decreaseVolume wrap increaseVolume for code reuseAlbin Larsson2018-06-191-2/+1
| | | |
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-19 15:17:52 +0000