aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| |
* | Merge branch 'master' of github.com:selz/plyrSam Potts2016-02-133-16/+30
|\| | | | | | | | | # Conflicts: # dist/plyr.js
| * Update readme.mdSam Potts2016-02-091-2/+2
| |
| * Update readme.mdSam Potts2016-02-091-2/+2
| |
| * Update readme.mdSam Potts2016-02-091-2/+2
| |
| * Update readme.mdSam Potts2016-02-091-1/+1
| |
| * Update readme.mdSam Potts2016-02-051-0/+6
| |
| * Update readme.mdSam Potts2016-02-041-1/+12
| |
| * Update readme.mdSam Potts2016-02-041-4/+0
| |
| * Merge pull request #156 from mortonfox/patch-1Sam Potts2016-02-021-1/+1
| |\ | | | | | | Fix the svgfixer.js link
| | * Fix the svgfixer.js linkMorton Fox2016-02-011-1/+1
| |/
| * Update readme.mdSam Potts2016-01-291-0/+1
| |
| * Merge pull request #154 from marvinhagemeister/fix_window_usageSam Potts2016-01-281-1/+1
| |\ | | | | | | Get the proper reference to window on initialization.
| | * Get the proper window reference on initialization.Marvin Hagemeister2016-01-271-1/+1
| |/ | | | | | | | | | | | | | | | | | | The previous code assumed that `this` points to the browsers window object, which is not the case when using a module bundler. So we check for the variable `window` first, before falling back to `this`. (taken from jQuery's codebase)
| * Merge pull request #152 from marvinhagemeister/fix_commonjsSam Potts2016-01-272-6/+6
| |\ | | | | | | Swap CommonJS and AMD module check so that CommonJS is checked first
| | * Check for module.exports as well for CommonJS ModulesMarvin Hagemeister2016-01-262-3/+3
| | |
| | * Swap CommonJS and AMD module check so that CommonJS is checked first. Fixes ↵Marvin Hagemeister2016-01-262-5/+5
| |/ | | | | | | Webpack module bundling
* | iOS fix (Fixes #166), Edge Progress Tip (Fixes #160), SASS fix (Fixes #158)Sam Potts2016-02-1310-33/+57
| |
* | 1.5.10Sam Potts2016-01-261-1/+1
|/
* Merge pull request #151 from marvinhagemeister/fix_npmSam Potts2016-01-261-1/+1
|\ | | | | Fix broken npm require/import
| * NPM package main must always be the main source file. Fixes broken ↵Marvin Hagemeister2016-01-261-1/+1
|/ | | | require/import
* Update readme.mdSam Potts2016-01-261-0/+3
|
* NPM updates and published (fixes #146)Sam Potts2016-01-262-4/+17
|
* Npm changesSam Potts2016-01-262-7/+7
|
* Merge pull request #150 from marvinhagemeister/remove_globalSam Potts2016-01-261-3/+0
|\ | | | | Remove global preinstall script
| * Remove global preinstall script. Gulp does not have to be globally installed ↵Marvin Hagemeister2016-01-251-3/+0
|/ | | | to build plyr
* Seek fixes for touchSam Potts2016-01-258-14/+54
|
* Fix for control tooltips always showingSam Potts2016-01-258-12/+15
|
* SASS fix (fixes #149)Sam Potts2016-01-251-23/+23
|
* Seek tooltip, bug fixes for SASS, fullscreen and iconsSam Potts2016-01-2424-106/+198
|
* CommentSam Potts2016-01-231-0/+1
|