aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Code formattingSam Potts2017-03-251-8/+8
* Manual merge of #543 PRSam Potts2017-03-254-26/+23
* Merge pull request #514 from platformpurple/improvement/loop-color-areaSam Potts2017-03-252-4/+23
|\
| * Merge branch 'develop' into improvement/loop-color-areaSam Potts2017-03-255-71/+87
| |\ | |/ |/|
* | Merge branch 'develop' of https://github.com/Selz/plyr into developSam Potts2017-03-252-5/+5
|\ \
| * \ Merge pull request #511 from platformpurple/developSam Potts2017-03-252-4/+4
| |\ \
* | | | Loop variable namingSam Potts2017-03-255-60/+81
|/ / /
| | * Colored strip indicating looped areaChrysa Papadopoulou2017-02-152-3/+27
| |/
| * Fix on typo and gulpChrysa Papadopoulou2017-02-141-1/+1
| * Fix on typoChrysa Papadopoulou2017-02-141-3/+3
|/
* Merge branch 'develop' of https://github.com/Selz/plyr into developSam Potts2017-02-054-21/+165
|\
| * Merge pull request #490 from platformpurple/developSam Potts2017-02-054-20/+165
| |\
| | * Removed not needed functions + reverted demo.js to previousChrysa Papadopoulou2017-02-033-62/+3
| | * Refactored loop event buttons + on 'No Loop' cleared displayed timingChrysa Papadopoulou2017-02-023-32/+16
| | * Loop functionalityChrysa Papadopoulou2017-02-014-10/+203
| | * Playback speed control settingsChrysa Papadopoulou2017-01-314-15/+42
| |/
* / Menu workSam Potts2017-02-053-36/+37
|/
* Merge branch 'develop' of https://github.com/Selz/plyr into developSam Potts2017-01-110-0/+0
|\
| * Merge branch 'develop' of github.com:Selz/plyr into developSam Potts2017-01-102-873/+892
| |\
| * | JsBeautifierSam Potts2017-01-103-1158/+1296
* | | ToDo notes, code tidy upSam Potts2017-01-116-709/+827
| |/ |/|
* | JsBeautifier in use, syntax tweaksSam Potts2017-01-103-464/+620
* | Merge pull request #457 from amowu/patch-3Sam Potts2017-01-041-8/+5
|\ \
| * | fix: Firefox can not display captionsAmo Wu2016-12-151-8/+5
| |/
* | Merge pull request #458 from amowu/patch-4Sam Potts2017-01-041-2/+6
|\ \ | |/ |/|
| * fix: parse webVTT time NaNAmo Wu2016-12-161-2/+6
|/
* Merge pull request #427 from amowu/patch-2Sam Potts2016-11-271-0/+3
|\
| * Fix cannot scroll after destroyedAmo Wu2016-11-241-0/+3
|/
* Merge pull request #419 from amowu/patch-1Sam Potts2016-11-181-0/+1
|\
| * refactor: miss prefixAmo Wu2016-11-101-0/+1
|/
* Quality WIPSam Potts2016-11-064-144/+217
* Merge branch 'master' into developSam Potts2016-11-065-22/+83
|\
| * Update readme.mdSam Potts2016-11-021-4/+5
| * Cache bustSam Potts2016-11-021-1/+1
| * v2.0.10Sam Potts2016-11-024-6/+10
| * Added seek event fixes (fixes #409), Added support for URLs (fixes #345)Sam Potts2016-11-025-37/+74
| * Merge pull request #408 from gurupras/urlparserSam Potts2016-11-021-0/+19
| |\
| | * Added logic to parse youtube video idGuru Prasad Srinivasa2016-10-301-0/+19
| |/
* | PiPSam Potts2016-11-017-25/+37
* | Fullscreen fix, stylingSam2016-10-246-22/+27
* | Merge branch 'develop' of https://github.com/Selz/plyr into developSam2016-10-237-37/+96
|\ \
| * | Work on PiPSam Potts2016-10-237-37/+96
* | | Merge branch 'develop' of https://github.com/Selz/plyr into developSam2016-10-2316-53/+123
|\| |
| * | Merge branch 'master' into developSam Potts2016-10-2314-33/+104
| |\|
| | * v2.0.9Sam Potts2016-10-234-6/+9
| | * Temporary patch for the YouTube API issues with `getDuration()` (relates to #...Sam Potts2016-10-232-2/+10
| | * v2.0.8Sam Potts2016-10-237-18/+31
| | * Fix for caption size (fixes #390), Fix for Firefox Dev (fixes #392)Sam Potts2016-10-235-15/+24
| | * Add Issue and PR templatesSam Potts2016-10-232-0/+26
| | * Manually merged #395Sam Potts2016-10-232-1/+12