aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Tab shows controlsSam2016-04-266-58/+61
|
* Audio stylesSam2016-04-268-99/+140
|
* WIPSam Potts2016-04-267-59/+42
|
* Work on Audio UISam2016-04-255-75/+82
|
* WIPSam Potts2016-04-255-27/+27
|
* TweaksSam2016-04-256-449/+452
|
* Merge branch 'master' into developSam Potts2016-04-251-15/+3
|\
| * Merge pull request #179 from prince-0203/update-readme-outdated-contentsSam Potts2016-04-181-15/+3
| |\ | | | | | | Update outdated contents in readme.md
| | * Update outdated contents in readme.mdprince2016-03-121-15/+3
| | |
* | | Merge branch 'develop' of github.com:selz/plyr into developSam Potts2016-04-2518-311/+662
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # .gitignore # dist/plyr.css # dist/plyr.js # dist/sprite.svg # docs/dist/docs.css # docs/dist/docs.js # docs/src/less/components/examples.less # src/js/plyr.js # src/less/plyr.less # src/sprite/icon-fast-forward.svg # src/sprite/icon-pause.svg # src/sprite/icon-play.svg # src/sprite/icon-rewind.svg
| * | Merge branch 'master' of github.com:selz/plyrSam Potts2016-03-271-1/+1
| |\ \
| | * \ Merge pull request #184 from iamvlado/patch-1Sam Potts2016-03-201-1/+1
| | |\ \ | | | | | | | | | | fix type error
| | | * | fix type errorvlado2016-03-191-1/+1
| | |/ /
| * / / Bug fix for embeds: `play` not being defined (fixes #185 and #186)Sam Potts2016-03-278-16/+27
| |/ /
| * | Version bumpSam Potts2016-03-143-7/+7
| | |
| * | Autoplay bug fixesSam Potts2016-03-142-22/+18
| | |
| * | Merge branch 'master' of github.com:selz/plyrSam Potts2016-03-141-1/+5
| |\ \
| | * | Update readme.mdSam Potts2016-03-131-0/+2
| | | |
| | * | Update readme.mdSam Potts2016-03-131-4/+3
| | | |
| | * | Update readme.mdSam Potts2016-03-131-0/+3
| | | |
| * | | Fix for embed property not being setSam Potts2016-03-144-13/+35
| |/ /
| * | SASS fixes, docs changes (fixes #180), 'ready' eventSam Potts2016-03-136-14/+28
| | |
| * | Merge branch 'master' of github.com:selz/plyrSam Potts2016-03-133-6/+8
| |\ \
| | * \ Merge pull request #181 from shakeelmohamed/bugfix/youtube-autoplaySam Potts2016-03-132-3/+3
| | |\ \ | | | |/ | | |/| Dynamically set YouTube autoplay from config
| | | * Dynamically set YouTube autoplay from configShakeel Mohamed2016-03-122-3/+3
| | |/ | | | | | | | | | | | | The YouTube autoplay doesn't work without this change.
| | * Update readme.mdSam Potts2016-03-071-0/+2
| | |
| | * Update readme.mdSam Potts2016-03-071-3/+3
| | |
| * | SASS fixes, Default font stack addedSam Potts2016-03-133-9/+11
| |/
| * Bug fixes and native APIs exposed for embedsSam Potts2016-03-075-15/+27
| |
| * Cancel requests on source change (Fixes #174)Sam Potts2016-02-285-10/+56
| |
| * CustomEvent polyfill (Fixes #172)Sam Potts2016-02-285-13/+23
| |
| * Remove version from sourceSam Potts2016-02-251-1/+0
| |
| * Volume storage fix (Fixes #171)Sam Potts2016-02-254-9/+13
| |
| * Merge branch 'master' of github.com:selz/plyrSam Potts2016-02-231-5/+5
| |\
| | * Update readme.mdSam Potts2016-02-211-5/+5
| | |
| * | Docs codeSam Potts2016-02-232-2/+2
| |/
| * Removed npm logSam Potts2016-02-212-20/+1
| |
| * Fix for manual captionsSam Potts2016-02-214-13/+23
| |
| * v1.5.12Sam Potts2016-02-213-7/+27
| |
| * 1.5.12Sam Potts2016-02-211-1/+1
| |
| * Merge branch 'master' of github.com:selz/plyrSam Potts2016-02-219-92/+107
| |\ | | | | | | | | | | | | # Conflicts: # src/js/plyr.js
| | * Merge pull request #168 from gurupras/fix-captionsSam Potts2016-02-211-8/+20
| | |\ | | | | | | | | Fixes for captions
| | | * Updated manual caption split patternGuru Prasad Srinivasa2016-02-161-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | Previously, Plyr was using a fixed pattern of '\n\n' to split contents into captions. This does not always work as some VTT files contain '\r\n'. This commit checks for both.
| | | * Some WebVTT fixes to allow manual captionsGuru Prasad Srinivasa2016-02-161-5/+11
| | |/ | | | | | | | | | | | | | | | WebVTT allows additional parameters along with the line that contains the start and end times. These were not being filtered out while attempting to manually display captions.
| | * Merge pull request #167 from ivanvermeyen/patch-1Sam Potts2016-02-150-0/+0
| | |\ | | | | | | | | Allow player control colors to be overridden #158
| | | * Allow player control colors to be overridden #158Ivan Vermeyen2016-02-121-6/+4
| | | |
| | * | Update readme.mdSam Potts2016-02-141-0/+1
| | | |
| * | | WIP on captions bug, manual duration option, reset media objectSam Potts2016-02-217-450/+509
| |/ /
| * | Version bumpSam Potts2016-02-132-5/+13
| | |
| * | 1.5.11Sam Potts2016-02-131-1/+1
| | |