| 
						
					 | 
					
						
						
							
						
						948e2cc66c
					 | 
					
						
						
							
							Merge branch 'develop' into blank-mp4
						
						
						
						
						
						
					 | 
					
						2017-04-25 12:40:13 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						f2bbe4eb12
					 | 
					
						
						
							
							Looping menu (WIP)
						
						
						
						
						
						
					 | 
					
						2017-04-19 22:34:52 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						01d1ac9ab9
					 | 
					
						
						
							
							Toggle menu
						
						
						
						
						
						
					 | 
					
						2017-04-17 21:05:35 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						9b2396f5ff
					 | 
					
						
						
							
							Airplay and PiP
						
						
						
						
						
						
					 | 
					
						2017-04-17 01:28:52 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						da15980b8a
					 | 
					
						
						
							
							ID fix and styling fix
						
						
						
						
						
						
					 | 
					
						2017-04-17 00:32:41 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						452678867f
					 | 
					
						
						
							
							More work on menus
						
						
						
						
						
						
					 | 
					
						2017-04-16 20:38:45 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ff2d27f8e5
					 | 
					
						
						
							
							Cleanup events and references
						
						
						
						
						
						
					 | 
					
						2017-04-16 13:00:57 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						546cdaad92
					 | 
					
						
						
							
							Merge branch 'develop' of https://github.com/Selz/plyr into develop
						
						
						
						
						
						
						
						# Conflicts:
#	dist/plyr.js 
						
						
					 | 
					
						2017-04-15 23:22:35 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						5d38497f07
					 | 
					
						
						
							
							Formatting
						
						
						
						
						
						
					 | 
					
						2017-04-15 23:22:14 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						808a3af3cf
					 | 
					
						
						
							
							Formatting
						
						
						
						
						
						
					 | 
					
						2017-04-15 23:21:18 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						889712761a
					 | 
					
						
						
							
							Merge branch 'develop' of github.com:Selz/plyr into develop
						
						
						
						
						
						
						
						# Conflicts:
#	dist/plyr.js
#	src/js/plyr.js 
						
						
					 | 
					
						2017-03-29 09:05:25 +11:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						46fab972a0
					 | 
					
						
						
							
							Namespacing
						
						
						
						
						
						
					 | 
					
						2017-03-29 09:03:33 +11:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						535c046b62
					 | 
					
						
						
							
							Merge branch 'develop' of https://github.com/Selz/plyr into develop
						
						
						
						
						
						
						
						# Conflicts:
#	dist/plyr.js
#	src/js/plyr.js 
						
						
					 | 
					
						2017-03-28 09:30:37 +11:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						55dfab8394
					 | 
					
						
						
							
							Tweaks
						
						
						
						
						
						
					 | 
					
						2017-03-28 09:19:58 +11:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						18bf4d84b9
					 | 
					
						
						
							
							Menu creation (WIP)
						
						
						
						
						
						
					 | 
					
						2017-03-28 00:12:33 +11:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ef1d73df15
					 | 
					
						
						
							
							Controls rewrite
						
						
						
						
						
						
					 | 
					
						2017-03-27 00:25:41 +11:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						684107da5c
					 | 
					
						
						
							
							WIP on new controls creation
						
						
						
						
						
						
					 | 
					
						2017-03-26 21:32:41 +11:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						2a97a9a9c5
					 | 
					
						
						
							
							Add blank.mp4 to dist files
						
						
						
						
						
						
						
						For a complete "offline" experience, it's necessary to self-host the
file, so include it in the dist files for that purpose. 
						
						
					 | 
					
						2017-03-25 10:58:36 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						33fef7faee
					 | 
					
						
						
							
							Merge branch 'develop' into feature/subtitles
						
						
						
						
						
						
					 | 
					
						2017-03-25 18:43:36 +11:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						b083bf4297
					 | 
					
						
						
							
							Merge branch 'master' into develop
						
						
						
						
						
						
						
						# Conflicts:
#	dist/plyr.css
#	dist/plyr.js
#	src/js/plyr.js
#	src/less/plyr.less
#	src/scss/plyr.scss 
						
						
					 | 
					
						2017-03-25 11:24:38 +11:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						4957e4d80c
					 | 
					
						
						
							
							Version bump to 2.0.12
						
						
						
						
						
						
					 | 
					
						2017-03-25 10:58:41 +11:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ebc7ed538a
					 | 
					
						
						
							
							Manual merge of #509
						
						
						
						
						
						
					 | 
					
						2017-03-25 10:49:04 +11:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a60868bfe8
					 | 
					
						
						
							
							Clean up
						
						
						
						
						
						
					 | 
					
						2017-03-25 10:47:37 +11:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						4a2866d05f
					 | 
					
						
						
							
							Merge branch 'develop' of https://github.com/Selz/plyr into develop
						
						
						
						
						
						
						
						# Conflicts:
#	dist/plyr.js 
						
						
					 | 
					
						2017-03-25 10:37:21 +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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						cc5f37392f
					 | 
					
						
						
							
							ToDo notes, code tidy up
						
						
						
						
						
						
					 | 
					
						2017-01-11 20:14:41 +11:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						5a0cb9289c
					 | 
					
						
						
							
							JsBeautifier in use, syntax tweaks
						
						
						
						
						
						
					 | 
					
						2017-01-10 20:22:18 +11:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a9bb8afca4
					 | 
					
						
						
							
							v2.0.11
						
						
						
						
						
						
					 | 
					
						2016-11-27 20:18:30 +11:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a44c7ecc3a
					 | 
					
						
						
							
							Fix for iPad and YouTube issues
						
						
						
						
						
						
					 | 
					
						2016-11-27 20:15:15 +11: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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						efe54fbba4
					 | 
					
						
						
							
							Added seek event fixes (fixes #409), Added support for URLs (fixes #345)
						
						
						
						
						
						
					 | 
					
						2016-11-02 18:09:40 +11:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						72404e77e5
					 | 
					
						
						
							
							PiP
						
						
						
						
						
						
					 | 
					
						2016-11-01 12:00:16 +11:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |