57b3b9e3f6 
					 
					
						
						
							
							Audio styles  
						
						
						
						
							
						
					 
					
						2016-04-26 21:15:36 +10:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						6c8d118f83 
					 
					
						
						
							
							WIP  
						
						
						
						
							
						
					 
					
						2016-04-26 19:14:42 +10:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						48399f6364 
					 
					
						
						
							
							Merge remote-tracking branch 'org/develop' into develop  
						
						
						
						
							
						
					 
					
						2016-04-25 22:43:44 -07:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						e26694c322 
					 
					
						
						
							
							Work on Audio UI  
						
						
						
						
							
						
					 
					
						2016-04-25 22:48:40 +10:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						d41249bd90 
					 
					
						
						
							
							WIP  
						
						
						
						
							
						
					 
					
						2016-04-25 21:24:07 +10:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						833d3ac36f 
					 
					
						
						
							
							Tweaks  
						
						
						
						
							
						
					 
					
						2016-04-25 20:05:01 +10:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						fdaeecbb06 
					 
					
						
						
							
							Merge branch 'master' into develop  
						
						
						
						
							
						
					 
					
						2016-04-25 19:11:00 +10:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						70297321c3 
					 
					
						
						
							
							Merge branch 'develop' of github.com:selz/plyr into develop  
						
						... 
						
						
						
						# 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 
						
						
							
						
					 
					
						2016-04-25 19:10:10 +10:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						a02609c3e3 
					 
					
						
						
							
							ignore  
						
						
						
						
							
						
					 
					
						2016-04-25 19:07:17 +10:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						ffebc7b077 
					 
					
						
						
							
							UI tweaks  
						
						
						
						
							
						
					 
					
						2016-04-25 19:06:55 +10:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						47e0800f02 
					 
					
						
						
							
							Add support for soundcloud  
						
						
						
						
							
						
					 
					
						2016-04-17 20:57:55 -07:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						c7c7902769 
					 
					
						
						
							
							Merge pull request  #179  from prince-0203/update-readme-outdated-contents  
						
						... 
						
						
						
						Update outdated contents in readme.md 
						
						
							
						
					 
					
						2016-04-18 10:25:23 +10:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						5bb4d70cf7 
					 
					
						
						
							
							Merge branch 'master' of github.com:selz/plyr  
						
						
						
						
							
 
						
					 
					
						2016-03-27 18:30:20 +11:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						67b2f2510b 
					 
					
						
						
							
							Bug fix for embeds: play not being defined ( fixes   #185  and  #186 )  
						
						
						
						
							
						
					 
					
						2016-03-27 18:29:58 +11:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						ba9434b6f2 
					 
					
						
						
							
							Merge pull request  #184  from iamvlado/patch-1  
						
						... 
						
						
						
						fix type error 
						
						
							
						
					 
					
						2016-03-20 15:26:25 +11:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						26469452e1 
					 
					
						
						
							
							fix type error  
						
						
						
						
							
						
					 
					
						2016-03-19 17:29:15 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						6ae2655923 
					 
					
						
						
							
							Version bump  
						
						
						
						
							
 
						
					 
					
						2016-03-14 22:53:11 +11:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						815100cff8 
					 
					
						
						
							
							Autoplay bug fixes  
						
						
						
						
							
						
					 
					
						2016-03-14 22:50:34 +11:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						33771ef8c0 
					 
					
						
						
							
							Merge branch 'master' of github.com:selz/plyr  
						
						
						
						
							
 
						
					 
					
						2016-03-14 22:34:44 +11:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						b51a1684dc 
					 
					
						
						
							
							Fix for embed property not being set  
						
						
						
						
							
						
					 
					
						2016-03-14 22:34:28 +11:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						ba9abdc1d3 
					 
					
						
						
							
							Update readme.md  
						
						
						
						
							
						
					 
					
						2016-03-13 22:45:47 +11:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						6a8803ec9f 
					 
					
						
						
							
							Update readme.md  
						
						
						
						
							
						
					 
					
						2016-03-13 22:45:27 +11:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						bcb5b981f9 
					 
					
						
						
							
							Update readme.md  
						
						
						
						
							
						
					 
					
						2016-03-13 22:44:14 +11:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						5ea9e59d71 
					 
					
						
						
							
							SASS fixes, docs changes ( fixes   #180 ), 'ready' event  
						
						
						
						
							
 
						
					 
					
						2016-03-13 21:45:57 +11:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						01b45e7d97 
					 
					
						
						
							
							Merge branch 'master' of github.com:selz/plyr  
						
						
						
						
							
						
					 
					
						2016-03-13 21:23:00 +11:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						c41e5320c8 
					 
					
						
						
							
							SASS fixes, Default font stack added  
						
						
						
						
							
						
					 
					
						2016-03-13 21:22:51 +11:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						426c0f5559 
					 
					
						
						
							
							Merge pull request  #181  from shakeelmohamed/bugfix/youtube-autoplay  
						
						... 
						
						
						
						Dynamically set YouTube autoplay from config 
						
						
							
						
					 
					
						2016-03-13 18:29:49 +11:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						c636f0e69e 
					 
					
						
						
							
							Dynamically set YouTube autoplay from config  
						
						... 
						
						
						
						The YouTube autoplay doesn't work without this
change. 
						
						
							
						
					 
					
						2016-03-12 14:05:33 -08:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						58342cfae8 
					 
					
						
						
							
							Update outdated contents in readme.md  
						
						
						
						
							
						
					 
					
						2016-03-12 14:07:37 +09:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						193103cb2d 
					 
					
						
						
							
							Update readme.md  
						
						
						
						
							
						
					 
					
						2016-03-07 23:18:56 +11:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						f9c593d2f9 
					 
					
						
						
							
							Update readme.md  
						
						
						
						
							
						
					 
					
						2016-03-07 23:16:46 +11:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						87d174ac2c 
					 
					
						
						
							
							Bug fixes and native APIs exposed for embeds  
						
						
						
						
							
 
						
					 
					
						2016-03-07 22:28:30 +11:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						cd83a2670b 
					 
					
						
						
							
							Cancel requests on source change ( Fixes   #174 )  
						
						
						
						
							
 
						
					 
					
						2016-02-28 12:50:34 +11:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						1bbc47c64f 
					 
					
						
						
							
							CustomEvent polyfill ( Fixes   #172 )  
						
						
						
						
							
 
						
					 
					
						2016-02-28 11:22:11 +11:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						7a1a5830aa 
					 
					
						
						
							
							Remove version from source  
						
						
						
						
							
						
					 
					
						2016-02-25 19:36:14 +11:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						1ecbec4044 
					 
					
						
						
							
							Volume storage fix ( Fixes   #171 )  
						
						
						
						
							
 
						
					 
					
						2016-02-25 19:35:03 +11:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						ab329b99df 
					 
					
						
						
							
							Merge branch 'master' of github.com:selz/plyr  
						
						
						
						
							
						
					 
					
						2016-02-23 15:11:48 +11:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						54af43dd75 
					 
					
						
						
							
							Docs code  
						
						
						
						
							
						
					 
					
						2016-02-23 15:11:35 +11:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						188a2e72eb 
					 
					
						
						
							
							Update readme.md  
						
						
						
						
							
						
					 
					
						2016-02-21 14:34:49 +11:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						b7a14be2ac 
					 
					
						
						
							
							Removed npm log  
						
						
						
						
							
						
					 
					
						2016-02-21 14:33:34 +11:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						c99f20d5d8 
					 
					
						
						
							
							Fix for manual captions  
						
						
						
						
							
 
						
					 
					
						2016-02-21 14:28:01 +11:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						5b968c97f4 
					 
					
						
						
							
							v1.5.12  
						
						
						
						
							
 
						
					 
					
						2016-02-21 14:07:17 +11:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						d538cdcdf6 
					 
					
						
						
							
							1.5.12  
						
						
						
						
							
						
					 
					
						2016-02-21 14:04:49 +11:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						cad142fe85 
					 
					
						
						
							
							Merge branch 'master' of github.com:selz/plyr  
						
						... 
						
						
						
						# Conflicts:
#	src/js/plyr.js 
						
						
							
						
					 
					
						2016-02-21 14:04:13 +11:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						b18ed03384 
					 
					
						
						
							
							WIP on captions bug, manual duration option, reset media object  
						
						
						
						
							
						
					 
					
						2016-02-21 13:17:30 +11:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						6a0b3dc823 
					 
					
						
						
							
							Merge pull request  #168  from gurupras/fix-captions  
						
						... 
						
						
						
						Fixes for captions 
						
						
							
						
					 
					
						2016-02-21 11:28:15 +11:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						402c45ee2b 
					 
					
						
						
							
							Updated manual caption split pattern  
						
						... 
						
						
						
						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. 
						
						
							
						
					 
					
						2016-02-16 20:17:10 -05:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						67f19166ac 
					 
					
						
						
							
							Some WebVTT fixes to allow manual captions  
						
						... 
						
						
						
						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. 
						
						
							
						
					 
					
						2016-02-16 19:52:08 -05:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						32b7b6b886 
					 
					
						
						
							
							Merge pull request  #167  from ivanvermeyen/patch-1  
						
						... 
						
						
						
						Allow player control colors to be overridden #158  
						
						
							
						
					 
					
						2016-02-15 11:50:38 +11:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						96df8fbc85 
					 
					
						
						
							
							Update readme.md  
						
						
						
						
							
						
					 
					
						2016-02-14 14:04:30 +11:00