8464ffe6ad 
					 
					
						
						
							
							Conflicts and tracks array on config  
						
						
						
						
							
						
					 
					
						2017-02-24 16:38:00 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						6537225c61 
					 
					
						
						
							
							Subtitles tracks  
						
						
						
						
							
						
					 
					
						2017-02-24 16:32:17 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						9c599884a8 
					 
					
						
						
							
							Merge branch 'develop' of  https://github.com/Selz/plyr  into develop  
						
						... 
						
						
						
						# Conflicts:
#	dist/plyr.js
#	src/js/plyr.js 
						
						
							
						
					 
					
						2017-02-05 11:36:53 +11:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						cbef45841c 
					 
					
						
						
							
							Menu work  
						
						
						
						
							
						
					 
					
						2017-02-05 11:34:33 +11:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						96d9f302c2 
					 
					
						
						
							
							Merge pull request  #490  from platformpurple/develop  
						
						... 
						
						
						
						Playback speed and looping controls 
						
						
							
						
					 
					
						2017-02-05 11:31:58 +11:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						afcdf17a72 
					 
					
						
						
							
							Removed not needed functions + reverted demo.js to previous  
						
						
						
						
							
						
					 
					
						2017-02-03 14:52:38 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						1bcdbe4c00 
					 
					
						
						
							
							Refactored loop event buttons + on 'No Loop' cleared displayed timing  
						
						
						
						
							
						
					 
					
						2017-02-02 11:38:08 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						45c0ded88c 
					 
					
						
						
							
							Loop functionality  
						
						
						
						
							
						
					 
					
						2017-02-01 19:16:39 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						ea30ad9494 
					 
					
						
						
							
							Playback speed control settings  
						
						
						
						
							
						
					 
					
						2017-01-31 17:21:33 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						7608615702 
					 
					
						
						
							
							Merge branch 'develop' of  https://github.com/Selz/plyr  into develop  
						
						
						
						
							
						
					 
					
						2017-01-11 20:14:48 +11:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						cc5f37392f 
					 
					
						
						
							
							ToDo notes, code tidy up  
						
						
						
						
							
						
					 
					
						2017-01-11 20:14:41 +11:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						413fcbcb8c 
					 
					
						
						
							
							Merge branch 'develop' of github.com:Selz/plyr into develop  
						
						... 
						
						
						
						# Conflicts:
#	dist/plyr.js
#	src/js/plyr.js 
						
						
							
						
					 
					
						2017-01-10 21:47:49 +11:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						c49d0a99e4 
					 
					
						
						
							
							JsBeautifier  
						
						
						
						
							
						
					 
					
						2017-01-10 21:43:28 +11:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						5a0cb9289c 
					 
					
						
						
							
							JsBeautifier in use, syntax tweaks  
						
						
						
						
							
						
					 
					
						2017-01-10 20:22:18 +11:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						bce1d983cb 
					 
					
						
						
							
							Merge pull request  #457  from amowu/patch-3  
						
						... 
						
						
						
						fix: Firefox can not display captions 
						
						
							
						
					 
					
						2017-01-04 08:45:40 +11:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						047fc43f8f 
					 
					
						
						
							
							Merge pull request  #458  from amowu/patch-4  
						
						... 
						
						
						
						fix: parse webVTT time NaN 
						
						
							
						
					 
					
						2017-01-04 08:45:06 +11:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						0cbfc9252c 
					 
					
						
						
							
							fix: parse webVTT time NaN  
						
						
						
						
							
						
					 
					
						2016-12-16 14:32:04 +08:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						d02e57bdb3 
					 
					
						
						
							
							fix: Firefox can not display captions  
						
						
						
						
							
						
					 
					
						2016-12-15 16:38:46 +08:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						663c1fb627 
					 
					
						
						
							
							Merge pull request  #427  from amowu/patch-2  
						
						... 
						
						
						
						Fix cannot scroll after destroyed 
						
						
							
						
					 
					
						2016-11-27 20:09:49 +11:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						a7969b8e9e 
					 
					
						
						
							
							Fix cannot scroll after destroyed  
						
						... 
						
						
						
						In single page application, switch router when plyr is fullscreen mode, page cannot scroll, because `document.body.style.overflow` is `hidden` 
						
						
							
						
					 
					
						2016-11-24 11:21:43 +08:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						4ca3f030cc 
					 
					
						
						
							
							Merge pull request  #419  from amowu/patch-1  
						
						... 
						
						
						
						refactor: miss prefix 
						
						
							
						
					 
					
						2016-11-18 09:48:40 +11:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						02bc8c8445 
					 
					
						
						
							
							refactor: miss prefix  
						
						... 
						
						
						
						fix _fullscreen.prefix can't work 
						
						
							
						
					 
					
						2016-11-10 16:27:10 +08:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						7965b82cca 
					 
					
						
						
							
							Quality WIP  
						
						
						
						
							
						
					 
					
						2016-11-06 21:47:44 +11:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						bae04a492a 
					 
					
						
						
							
							Merge branch 'master' into develop  
						
						... 
						
						
						
						# Conflicts:
#	demo/index.html
#	dist/plyr.js 
						
						
							
						
					 
					
						2016-11-06 15:55:55 +11:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						73a1391f2f 
					 
					
						
						
							
							Update readme.md  
						
						
						
						
							
						
					 
					
						2016-11-02 18:45:37 +11:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						660ff0434d 
					 
					
						
						
							
							Cache bust  
						
						
						
						
							
						
					 
					
						2016-11-02 18:29:38 +11:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						94208dce76 
					 
					
						
						
							
							v2.0.10  
						
						... 
						
						
						
						- Added seek event fixes for Vimeo and YouTube (fixes  #409 )
- Added support for embed URLs rather than ID only (fixes  #345 ) 
						
						
							
 
						
					 
					
						2016-11-02 18:14:06 +11:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						efe54fbba4 
					 
					
						
						
							
							Added seek event fixes ( fixes   #409 ), Added support for URLs ( fixes   #345 )  
						
						
						
						
							
						
					 
					
						2016-11-02 18:09:40 +11:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						10561d6c83 
					 
					
						
						
							
							Merge pull request  #408  from gurupras/urlparser  
						
						... 
						
						
						
						Added logic to parse youtube video id 
						
						
							
						
					 
					
						2016-11-02 16:59:28 +11:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						72404e77e5 
					 
					
						
						
							
							PiP  
						
						
						
						
							
						
					 
					
						2016-11-01 12:00:16 +11:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						0ef87f93a6 
					 
					
						
						
							
							Added logic to parse youtube video id  
						
						... 
						
						
						
						This commit is targetted at solving issue#345 and adds
    functionality to parse youtube video IDs from various
    types of youtube video URLs.
    Other embed types like vimeo/soundcloud can be extended by
    following a similar structure as implemented in this commit. 
						
						
							
						
					 
					
						2016-10-30 00:49:17 -04:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						c7310c21fb 
					 
					
						
						
							
							Fullscreen fix, styling  
						
						
						
						
							
						
					 
					
						2016-10-24 00:11:47 +11:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						ed9e27b64f 
					 
					
						
						
							
							Merge branch 'develop' of  https://github.com/Selz/plyr  into develop  
						
						
						
						
							
						
					 
					
						2016-10-23 21:42:18 +11:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						801ed63be5 
					 
					
						
						
							
							Work on PiP  
						
						
						
						
							
						
					 
					
						2016-10-23 21:21:42 +11:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						2aa9b267ab 
					 
					
						
						
							
							Merge branch 'develop' of  https://github.com/Selz/plyr  into develop  
						
						... 
						
						
						
						# Conflicts:
#	src/js/plyr.js 
						
						
							
						
					 
					
						2016-10-23 21:16:49 +11:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						90338d9600 
					 
					
						
						
							
							Tweaks  
						
						
						
						
							
						
					 
					
						2016-10-23 21:15:19 +11:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						5cecf16d4f 
					 
					
						
						
							
							Merge branch 'master' into develop  
						
						... 
						
						
						
						# Conflicts:
#	demo/dist/demo.js
#	dist/plyr.css
#	dist/plyr.js 
						
						
							
						
					 
					
						2016-10-23 15:27:28 +11:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						a3ed309342 
					 
					
						
						
							
							v2.0.9  
						
						... 
						
						
						
						- Temporary patch for the YouTube API issues with `getDuration()` (relates to #374 ) 
						
						
							
 
						
					 
					
						2016-10-23 15:18:53 +11:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						08b4c09b89 
					 
					
						
						
							
							Temporary patch for the YouTube API issues with getDuration() (relates to  #374 )  
						
						
						
						
							
						
					 
					
						2016-10-23 15:18:08 +11:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						a509a5e1bc 
					 
					
						
						
							
							v2.0.8  
						
						... 
						
						
						
						- Added `isPaused()` API method (thanks to @darrena092)
- Allowed `.on()` API method to be chainable (thanks to @gurupras) (fixes  #357 )
- Improved the "awful" rendering of captions on small screens in fullscreen mode (fixes  #390 )
- Fix for Firefox VTT compatibility (thanks to @magourex)
- Fix for Firefox Developer Edition blank video due to `-webkit-mask-image` issue (fixes  #392 )
- Added Issue and PR templates with the aim of reducing duplicate or duff issues 
						
						
							
 
						
					 
					
						2016-10-23 13:48:05 +11:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						bec10e7836 
					 
					
						
						
							
							Fix for caption size ( fixes   #390 ), Fix for Firefox Dev ( fixes   #392 )  
						
						
						
						
							
						
					 
					
						2016-10-23 13:35:49 +11:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						f9a184800b 
					 
					
						
						
							
							Add Issue and PR templates  
						
						
						
						
							
						
					 
					
						2016-10-23 13:34:44 +11:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						f428c3ff8b 
					 
					
						
						
							
							Manually merged  #395  
						
						
						
						
							
						
					 
					
						2016-10-23 12:19:39 +11:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						97eb40a8e3 
					 
					
						
						
							
							Merge pull request  #389  from darrena092/master  
						
						... 
						
						
						
						Added .isPaused(). 
						
						
							
						
					 
					
						2016-10-23 11:51:10 +11:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						8211631950 
					 
					
						
						
							
							Gulp build done.  
						
						
						
						
							
						
					 
					
						2016-10-06 15:43:41 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						a17cbb0e8b 
					 
					
						
						
							
							Added .isPaused to API  
						
						
						
						
							
						
					 
					
						2016-10-06 15:33:49 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						21a30f1b6f 
					 
					
						
						
							
							Fixed for array passed to _on and _off  
						
						
						
						
							
						
					 
					
						2016-10-03 17:16:05 +11:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						613c45ede9 
					 
					
						
						
							
							Merge branch 'master' into develop  
						
						
						
						
							
						
					 
					
						2016-10-01 22:18:40 +10:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						8743c6a08d 
					 
					
						
						
							
							Code style  
						
						
						
						
							
						
					 
					
						2016-10-01 22:18:01 +10:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						8098be6f93 
					 
					
						
						
							
							Merge pull request  #379  from magourex/master  
						
						... 
						
						
						
						Support WebVTT with CRLF or LF Line separator with firefox #378  
						
						
							
						
					 
					
						2016-10-01 22:10:35 +10:00