|  | 38f10d4cc6 | WIP | 2018-06-11 16:19:11 +10:00 |  | 
			
				
					|  | 7c6d4666e9 | Merge branch 'develop' into a11y-improvements # Conflicts:
#	demo/dist/demo.css
#	dist/plyr.css
#	dist/plyr.js.map
#	dist/plyr.min.js
#	dist/plyr.min.js.map
#	dist/plyr.polyfilled.js
#	dist/plyr.polyfilled.js.map
#	dist/plyr.polyfilled.min.js
#	dist/plyr.polyfilled.min.js.map
#	src/js/captions.js
#	src/js/plyr.js | 2018-06-09 17:03:16 +10:00 |  | 
			
				
					|  | 76bb299c68 | Restore default | 2018-06-09 12:05:37 +10:00 |  | 
			
				
					|  | 0c03accd41 | Fix Sprite issue | 2018-06-09 12:04:53 +10:00 |  | 
			
				
					|  | 8e634862ff | Merge pull request #1007 from cky917/master fix:  After clicking on the progress bar, keyboard operations will not work. | 2018-06-08 10:54:16 +10:00 |  | 
			
				
					|  | 84424f7f67 | fix: when the seek input is focused and the video is playing, the space key can't make the video pause, because after 'keyup', it always make the video play | 2018-06-06 19:27:07 +08:00 |  | 
			
				
					|  | c95d9923f7 | fix: https://github.com/sampotts/plyr/issues/1006 | 2018-06-06 16:59:42 +08:00 |  | 
			
				
					|  | 05b85da3f4 | Update controls.md (fixes #996) | 2018-06-02 19:48:48 +10:00 |  | 
			
				
					|  | a4caba120c | Merge branch 'master' of github.com:sampotts/plyr # Conflicts:
#	demo/dist/demo.css
#	dist/plyr.css
#	dist/plyr.js.map
#	dist/plyr.min.js
#	dist/plyr.min.js.map
#	dist/plyr.polyfilled.js.map
#	dist/plyr.polyfilled.min.js
#	dist/plyr.polyfilled.min.js.mapv3.3.10 | 2018-05-31 23:43:40 +10:00 |  | 
			
				
					|  | 969a877a34 | v3.3.10 | 2018-05-31 23:41:48 +10:00 |  | 
			
				
					|  | fb22a90d33 | Merge pull request #993 from sampotts/develop v3.3.10 | 2018-05-31 23:39:51 +10:00 |  | 
			
				
					|  | 108bd3dfa0 | Fixed incorrect BEM formatting, fixed buffer alignment | 2018-05-31 23:33:59 +10:00 |  | 
			
				
					|  | 5a445ae647 | Merge pull request #988 from kim-company/translate-qualities Translate quality badges and quality names | 2018-05-31 22:43:31 +10:00 |  | 
			
				
					|  | 56668f58b6 | Rename qualityName to label | 2018-05-31 14:40:56 +02:00 |  | 
			
				
					|  | eec96e5879 | Merge pull request #990 from friday/travis Travis integration | 2018-05-31 18:33:00 +10:00 |  | 
			
				
					|  | c6c9d877e4 | Merge pull request #992 from philipgiuliani/quality-resume-time Wait for the metadata to be loaded before setting the currentTime | 2018-05-31 18:32:10 +10:00 |  | 
			
				
					|  | 61f4b998e1 | Wait for the metadata to be loaded before setting the currentTime | 2018-05-31 10:17:41 +02:00 |  | 
			
				
					|  | 25a319d884 | Merge pull request #989 from friday/pr-template Proposed changes to PR template | 2018-05-31 08:34:02 +10:00 |  | 
			
				
					|  | 4bf678fe6c | Proposed changes to PR template (develop as base branch, exclude build and typo fix) | 2018-05-30 19:52:15 +02:00 |  | 
			
				
					|  | 359acd6bb9 | Lint and build in travis | 2018-05-30 19:40:17 +02:00 |  | 
			
				
					|  | 2fce385691 | Add npm scripts for linting and building | 2018-05-30 19:40:17 +02:00 |  | 
			
				
					|  | a82c61c539 | Gulp: Add option to build only | 2018-05-30 19:39:57 +02:00 |  | 
			
				
					|  | a8fa125a96 | Refactor getDeep method | 2018-05-30 17:30:10 +02:00 |  | 
			
				
					|  | 6435ced707 | Return undefined when the key is not present. | 2018-05-30 17:10:38 +02:00 |  | 
			
				
					|  | 94dc0d176c | Rebuild | 2018-05-30 17:03:41 +02:00 |  | 
			
				
					|  | 23c21252e8 | Rebuild | 2018-05-30 17:02:07 +02:00 |  | 
			
				
					|  | 41c7dff0e8 | Add getDeep method to utils | 2018-05-30 17:02:07 +02:00 |  | 
			
				
					|  | e3bae562fc | Rebuild | 2018-05-30 17:02:07 +02:00 |  | 
			
				
					|  | 1c1668bfc3 | Implement translation support for qualityName and qualityBadge | 2018-05-30 17:02:07 +02:00 |  | 
			
				
					|  | e0c09c51f2 | Allow nested translations | 2018-05-30 17:02:07 +02:00 |  | 
			
				
					|  | 8de06fb862 | Accept quality 0 | 2018-05-30 17:02:07 +02:00 |  | 
			
				
					|  | 64412868d8 | ESLint tweak | 2018-05-30 17:02:07 +02:00 |  | 
			
				
					|  | 450958c290 | Merge pull request #981 from friday/hls-captions Improve captions handling for streaming | 2018-05-30 21:44:42 +10:00 |  | 
			
				
					|  | 963fe11ad6 | Update readme.md | 2018-05-30 00:22:01 +10:00 |  | 
			
				
					|  | ce199e4b6b | Merge pull request #986 from friday/701 Call duration update method manually if user config has duration | 2018-05-30 00:20:15 +10:00 |  | 
			
				
					|  | 9d798893b5 | Call duration update method manually if user config has duration | 2018-05-29 16:06:07 +02:00 |  | 
			
				
					|  | 64399e0717 | Defer initial captions update to next tick, to avoid event being triggered to early | 2018-05-28 17:54:25 +02:00 |  | 
			
				
					|  | f58e23b325 | Change to using addtrack and removetrack listeners since 'change' didn't trigger in firefox for embedded captions (may also be a hls.js issue) | 2018-05-28 16:19:44 +02:00 |  | 
			
				
					|  | 812e07b734 | Replace browser language detection in defaults.js with explicit 'auto' option | 2018-05-28 07:43:37 +02:00 |  | 
			
				
					|  | c9298fde76 | Fix typo | 2018-05-28 07:08:38 +02:00 |  | 
			
				
					|  | 0109454a34 | Ensure language is set in case the track is added after initialization, and trigger languagechange event when language is initially set | 2018-05-28 06:08:03 +02:00 |  | 
			
				
					|  | 813f703211 | Add option to watch caption track changes and update language options | 2018-05-28 06:08:03 +02:00 |  | 
			
				
					|  | 7aad747c25 | Optimize captions code reused and ensure captionsenabled/captionsdisabled will be sent on initial setup | 2018-05-28 05:44:54 +02:00 |  | 
			
				
					|  | d70a787af1 | Merge branch 'develop'
						
						
						
						
						
						
							
 v3.3.9 | 2018-05-28 10:42:11 +10:00 |  | 
			
				
					|  | 69bb0917ad | v3.3.9 | 2018-05-28 10:41:51 +10:00 |  | 
			
				
					|  | 90c5735904 | WIP | 2018-05-28 10:19:07 +10:00 |  | 
			
				
					|  | 6f256d09b2 | ESLint tweak | 2018-05-28 10:18:04 +10:00 |  | 
			
				
					|  | e9684c2021 | Merge pull request #979 from friday/respect-storage Respect storage being disabled for storage getter | 2018-05-28 10:09:02 +10:00 |  | 
			
				
					|  | bf91a0e73f | Merge pull request #977 from friday/utils.is.icue-ie11 Restore utils.is.cue() | 2018-05-28 10:08:42 +10:00 |  | 
			
				
					|  | 14b6309aef | Merge pull request #978 from friday/ie-issues Fix InvalidStateError and IE11 issues | 2018-05-28 10:08:24 +10:00 |  |