| 
						
					 | 
					
						
						
							
						
						1a05f352c7
					 | 
					
						
						
							
							Code formatting
						
						
						
						
						
						
					 | 
					
						2017-03-25 10:37:00 +11:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ba27de0669
					 | 
					
						
						
							
							Merge pull request #510 from platformpurple/feature/loop-events
						
						
						
						
						
						
						
						Added key bindings for loop 
						
						
					 | 
					
						2017-03-25 10:35:15 +11:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						e21e7054ce
					 | 
					
						
						
							
							Merge branch 'develop' into feature/loop-events
						
						
						
						
						
						
					 | 
					
						2017-03-25 10:35:08 +11:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						bc323e905c
					 | 
					
						
						
							
							Manual merge of #543 PR
						
						
						
						
						
						
					 | 
					
						2017-03-25 10:27:03 +11:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						afa1fe9d5f
					 | 
					
						
						
							
							Merge pull request #514 from platformpurple/improvement/loop-color-area
						
						
						
						
						
						
						
						Improvement/loop color area 
						
						
					 | 
					
						2017-03-25 10:22:10 +11:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						2444efc834
					 | 
					
						
						
							
							Merge branch 'develop' into improvement/loop-color-area
						
						
						
						
						
						
					 | 
					
						2017-03-25 10:22:02 +11:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						7b6257ff20
					 | 
					
						
						
							
							Merge branch 'develop' of https://github.com/Selz/plyr into develop
						
						
						
						
						
						
						
						# Conflicts:
#	dist/plyr.js 
						
						
					 | 
					
						2017-03-25 10:09:14 +11:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						13973125fb
					 | 
					
						
						
							
							Loop variable naming
						
						
						
						
						
						
					 | 
					
						2017-03-25 10:08:39 +11:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ddf9104349
					 | 
					
						
						
							
							Merge pull request #511 from platformpurple/develop
						
						
						
						
						
						
						
						Fix on typo 
						
						
					 | 
					
						2017-03-25 10:07:07 +11:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						47b53fffb4
					 | 
					
						
						
							
							remove commented out code
						
						
						
						
						
						
					 | 
					
						2017-03-24 17:29:48 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						9ba3753f80
					 | 
					
						
						
							
							toggle quality options
						
						
						
						
						
						
					 | 
					
						2017-03-24 17:25:09 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a353194fe1
					 | 
					
						
						
							
							make config.captions.selectedIndex number
						
						
						
						
						
						
					 | 
					
						2017-03-22 15:50:56 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						c205c47509
					 | 
					
						
						
							
							set captionExists to true if selectedIndex is bigger than capt source
						
						
						
						
						
						
					 | 
					
						2017-03-22 13:38:08 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						9c867edfbc
					 | 
					
						
						
							
							fix data typo in language button
						
						
						
						
						
						
					 | 
					
						2017-03-18 01:59:20 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						9919d80782
					 | 
					
						
						
							
							check if captions exists
						
						
						
						
						
						
					 | 
					
						2017-03-15 17:18:34 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a971850d26
					 | 
					
						
						
							
							Update readme.md
						
						
						
						
						
						
					 | 
					
						2017-03-09 15:35:29 +11:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						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 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						dcbf59bd89
					 | 
					
						
						
							
							Colored strip indicating looped area
						
						
						
						
						
						
					 | 
					
						2017-02-15 17:41:04 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						21d478d396
					 | 
					
						
						
							
							Add looping key bindings to allowed array
						
						
						
						
						
						
					 | 
					
						2017-02-14 17:15:27 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						054c243416
					 | 
					
						
						
							
							Fix on typo and gulp
						
						
						
						
						
						
					 | 
					
						2017-02-14 16:44:29 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						d57e453541
					 | 
					
						
						
							
							Fix on typo
						
						
						
						
						
						
					 | 
					
						2017-02-14 16:42:40 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						3f45ef4908
					 | 
					
						
						
							
							Removed console
						
						
						
						
						
						
					 | 
					
						2017-02-14 16:29:05 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						1fd742464d
					 | 
					
						
						
							
							Added key bindings for loop
						
						
						
						
						
						
					 | 
					
						2017-02-14 16:04:58 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						382397407f
					 | 
					
						
						
							
							Generated dist files
						
						
						
						
						
						
					 | 
					
						2017-02-12 00:15:21 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						82809235b9
					 | 
					
						
						
							
							Documented the blankUrl option
						
						
						
						
						
						
					 | 
					
						2017-02-11 23:59:14 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						7d5c507f16
					 | 
					
						
						
							
							Allow configuration of the blank.mp4 URL
						
						
						
						
						
						
						
						This is useful for people behind firewalls who need to host a blank mp4 themselves. 
						
						
					 | 
					
						2017-02-11 23:50:49 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						bc139f16a7
					 | 
					
						
						
							
							Update readme.md
						
						
						
						
						
						
					 | 
					
						2017-02-10 11:21:20 +11:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						f6f3284dc5
					 | 
					
						
						
							
							Update readme.md
						
						
						
						
						
						
					 | 
					
						2017-02-10 11:19:37 +11:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						f4d2f1856f
					 | 
					
						
						
							
							Update readme.md
						
						
						
						
						
						
					 | 
					
						2017-02-09 23:38:52 +11:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						871e19ed92
					 | 
					
						
						
							
							Update readme.md
						
						
						
						
						
						
					 | 
					
						2017-02-09 23:37:29 +11: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 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						72998c4c41
					 | 
					
						
						
							
							Merge pull request #437 from tv2/playground
						
						
						
						
						
						
						
						Fixed typo 
						
						
					 | 
					
						2017-01-10 20:21:01 +11:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						da48be495b
					 | 
					
						
						
							
							Merge pull request #477 from iamrobert/patch-1
						
						
						
						
						
						
						
						Update index.html 
						
						
					 | 
					
						2017-01-10 14:51:40 +11:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						c843ed3460
					 | 
					
						
						
							
							Update index.html
						
						
						
						
						
						
						
						Just missing the closing </li> 
						
						
					 | 
					
						2017-01-10 11:50:26 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						4232aa9ea4
					 | 
					
						
						
							
							Update issue_template.md
						
						
						
						
						
						
					 | 
					
						2017-01-10 09:47:46 +11:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						f6612fa78c
					 | 
					
						
						
							
							Update issue_template.md
						
						
						
						
						
						
					 | 
					
						2017-01-10 09:45:41 +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 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 |