Will Wolff-Myren 
								
							 
						 
						
							
							
								
							
							
	abe8bfa3a6  
						 
						
							
							
								
								
								Update .gitignore to include VSCode setting.  
							
							
							
							
						 
						
							2016-07-17 13:50:36 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mazin Bokhari 
								
							 
						 
						
							
							
								
							
							
	6cd2b48fed  
						 
						
							
							
								
								
								Merge branch 'master' of  https://github.com/mazinbokhari/qmk_firmware  
							
							
							
							
						 
						
							2016-07-17 15:35:05 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mazin Bokhari 
								
							 
						 
						
							
							
								
							
							
	1336b0198c  
						 
						
							
							
								
								
								Add caps lock; sucks that there is no light for it...  
							
							
							
							
						 
						
							2016-07-17 15:32:53 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mazin Bokhari 
								
							 
						 
						
							
							
								
							
							
	cb25f1ad93  
						 
						
							
							
								
								
								Remove more keys  
							
							
							
							
						 
						
							2016-07-17 14:56:32 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mazin Bokhari 
								
							 
						 
						
							
							
								
							
							
	cfa5a475d0  
						 
						
							
							
								
								
								Move dot in symbol layer  
							
							
							
							
						 
						
							2016-07-17 14:44:37 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mazin Bokhari 
								
							 
						 
						
							
							
								
							
							
	7a5b7233f2  
						 
						
							
							
								
								
								Move modifier kyes around  
							
							
							
							
						 
						
							2016-07-17 14:43:21 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mazin Bokhari 
								
							 
						 
						
							
							
								
							
							
	266eacc9ec  
						 
						
							
							
								
								
								Remove more unnecessary buttons  
							
							
							
							
						 
						
							2016-07-17 14:29:37 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mazin Bokhari 
								
							 
						 
						
							
							
								
							
							
	76b5dc84af  
						 
						
							
							
								
								
								Add page up/down and home/end to arrow  
							
							
							
							
						 
						
							2016-07-17 14:11:08 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mazin Bokhari 
								
							 
						 
						
							
							
								
							
							
	f83591cff0  
						 
						
							
							
								
								
								Change visual  
							
							
							
							
						 
						
							2016-07-17 14:02:46 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mazin Bokhari 
								
							 
						 
						
							
							
								
							
							
	742d6dbdc2  
						 
						
							
							
								
								
								Reorganize media keys  
							
							
							
							
						 
						
							2016-07-17 13:55:10 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mazin Bokhari 
								
							 
						 
						
							
							
								
							
							
	ec505d07d2  
						 
						
							
							
								
								
								Remove unnecessary modifiers  
							
							
							
							
						 
						
							2016-07-17 13:35:47 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mazin Bokhari 
								
							 
						 
						
							
							
								
							
							
	d7b1cee2df  
						 
						
							
							
								
								
								Edit visual keymap  
							
							
							
							
						 
						
							2016-07-17 13:19:11 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mazin Bokhari 
								
							 
						 
						
							
							
								
							
							
	f76f5af853  
						 
						
							
							
								
								
								Add arrow keys to layer  
							
							
							
							
						 
						
							2016-07-17 13:14:04 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mazin Bokhari 
								
							 
						 
						
							
							
								
							
							
	6dc5aba315  
						 
						
							
							
								
								
								Minor changes  
							
							
							
							
						 
						
							2016-07-17 13:09:54 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mazin Bokhari 
								
							 
						 
						
							
							
								
							
							
	8c8f2f898b  
						 
						
							
							
								
								
								Add empty arrow layer, reorder some keys in media, map layer keys  
							
							
							
							
						 
						
							2016-07-17 13:02:54 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Seth Chandler 
								
							 
						 
						
							
							
								
							
							
	d40d18ab1a  
						 
						
							
							
								
								
								don't believe the hex files are posted to qmk.fm  
							
							
							
							
						 
						
							2016-07-17 10:37:45 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Toni 
								
							 
						 
						
							
							
								
							
							
	db7aa91e76  
						 
						
							
							
								
								
								helper file for me to stay up-to-date with master  
							
							
							
							
						 
						
							2016-07-17 15:10:14 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Toni 
								
							 
						 
						
							
							
								
							
							
	de96513ff2  
						 
						
							
							
								
								
								changes needed for a ISO satan PCB including a split right-shift key  
							
							
							
							
						 
						
							2016-07-17 14:57:56 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Seth Chandler 
								
							 
						 
						
							
							
								
							
							
	f6aeaac5b5  
						 
						
							
							
								
								
								update more non-existent readmes for QMK.fm  
							
							
							
							
						 
						
							2016-07-17 03:53:34 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Seth Chandler 
								
							 
						 
						
							
							
								
							
							
	0a2653bac8  
						 
						
							
							
								
								
								update broken link  
							
							
							
							
						 
						
							2016-07-17 03:38:53 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Seth Chandler 
								
							 
						 
						
							
							
								
							
							
	68b1affbbd  
						 
						
							
							
								
								
								update audio links  
							
							
							
							
						 
						
							2016-07-17 03:32:02 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Seth Chandler 
								
							 
						 
						
							
							
								
							
							
	45414fed7b  
						 
						
							
							
								
								
								update tmk link  
							
							
							
							
						 
						
							2016-07-17 03:28:48 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Seth Chandler 
								
							 
						 
						
							
							
								
							
							
	a95ab37162  
						 
						
							
							
								
								
								update link to Vagrant docfile  
							
							
							
							
						 
						
							2016-07-17 03:24:36 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Seth Chandler 
								
							 
						 
						
							
							
								
							
							
	38508180c7  
						 
						
							
							
								
								
								update readmes in certain directories to work with qmk.fm  
							
							
							
							
						 
						
							2016-07-17 03:24:00 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Pavlos Vinieratos 
								
							 
						 
						
							
							
								
							
							
	d3091faf36  
						 
						
							
							
								
								
								change naming, and remove extraneous definition  
							
							
							
							
						 
						
							2016-07-17 08:28:03 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Seth Chandler 
								
							 
						 
						
							
							
								
							
							
	6289332759  
						 
						
							
							
								
								
								add custom makefile for sethbc keymap  
							
							
							
							
						 
						
							2016-07-16 23:52:02 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Seth Chandler 
								
							 
						 
						
							
							
								
							
							
	f954223749  
						 
						
							
							
								
								
								update makefile to default to no virtual dip switches  
							
							
							
							
						 
						
							2016-07-16 23:51:27 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Seth Chandler 
								
							 
						 
						
							
							
								
							
							
	dddaebfa98  
						 
						
							
							
								
								
								update readme images  
							
							
							
							
						 
						
							2016-07-16 23:41:20 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jonathan Lucas 
								
							 
						 
						
							
							
								
							
							
	2877b858d3  
						 
						
							
							
								
								
								Fix erroneous character  
							
							... 
							
							
							
							
							Must have been keeb testing :) 
							
						 
						
							2016-07-16 20:38:55 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jonathan Lucas 
								
							 
						 
						
							
							
								
							
							
	f13f48a35e  
						 
						
							
							
								
								
								Added CMD60 keymap  
							
							
							
							
						 
						
							2016-07-16 20:24:14 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Joshua T 
								
							 
						 
						
							
							
								
							
							
	0642126720  
						 
						
							
							
								
								
								Merge branch 'master' of  https://github.com/replicaJunction/qmk_firmware  
							
							
							
							
						 
						
							2016-07-15 18:02:38 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Joshua T 
								
							 
						 
						
							
							
								
							
							
	243ae75256  
						 
						
							
							
								
								
								Added default layer switch QWERTY to Colemak  
							
							
							
							
						 
						
							2016-07-15 18:02:23 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Joshua T 
								
							 
						 
						
							
							
								
							
							
	c5768a5f32  
						 
						
							
							
								
								
								Added default layer switch QWERTY to Colemak  
							
							
							
							
						 
						
							2016-07-15 17:49:14 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Joshua T 
								
							 
						 
						
							
							
								
							
							
	77377e2784  
						 
						
							
							
								
								
								Fixed a merge conflict  
							
							
							
							
						 
						
							2016-07-15 17:44:39 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Pavlos Vinieratos 
								
							 
						 
						
							
							
								
							
							
	f3b56701ed  
						 
						
							
							
								
								
								add an anyway and a reset callback  
							
							... 
							
							
							
							
							when using tap dance, we have the `regular` callback that is called on
the last tap. this commit adds an `anyway` callback that is called on
every tap, and a `reset` callback that is called on reset of the tap
dance taps. 
							
						 
						
							2016-07-16 00:04:12 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Pavlos Vinieratos 
								
							 
						 
						
							
							
								
							
							
	1a7e954f9f  
						 
						
							
							
								
								
								in case its NULL  
							
							
							
							
						 
						
							2016-07-16 00:04:12 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Erik Dasque 
								
							 
						 
						
							
							
								
							
							
	aa2a79bbfa  
						 
						
							
							
								
								
								Further simplyfying the docker usage  
							
							... 
							
							
							
							
							We'll be able to change the image user name if we set up the initial repo to trigger Docker images rebuilds on hub.docker.com 
							
						 
						
							2016-07-15 13:26:34 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Erik Dasque 
								
							 
						 
						
							
							
								
							
							
	0446263935  
						 
						
							
							
								
								
								Adding Docker build system & documentation  
							
							
							
							
						 
						
							2016-07-15 12:55:40 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Christopher Browne 
								
							 
						 
						
							
							
								
							
							
	ba0d81f270  
						 
						
							
							
								
								
								Merge branch 'master' of  https://github.com/jackhumbert/qmk_firmware  
							
							
							
							
						 
						
							2016-07-15 11:19:52 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Travis La Marr 
								
							 
						 
						
							
							
								
							
							
	d48a4cf1eb  
						 
						
							
							
								
								
								Fix OS X Recognizing keyboard as Mouse/Tablet  
							
							... 
							
							
							
							
							Modified the LUFA USB HID Descriptor to change the logical/usage
minimums for System Control from 0x01 (Mouse) to 0x81 (System Power
Down), this fixes OS X recognizing the Planck as having a mouse and
tablet, even with mousekeys off. 
							
						 
						
							2016-07-15 10:41:32 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Travis La Marr 
								
							 
						 
						
							
							
								
							
							
	0b8c448b30  
						 
						
							
							
								
								
								Make DFU wait for bootloader  
							
							... 
							
							
							
							
							Added a loop for waiting for the keyboard to be put in bootloader mode,
rather than failing out. Makes building keymaps easier. 
							
						 
						
							2016-07-15 10:28:23 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Joshua T 
								
							 
						 
						
							
							
								
							
							
	42843d9b62  
						 
						
							
							
								
								
								Merge remote-tracking branch 'upstream/master'  
							
							
							
							
						 
						
							2016-07-15 01:01:19 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jonathan A. Kollasch 
								
							 
						 
						
							
							
								
							
							
	4278d88615  
						 
						
							
							
								
								
								keymap_dvorak.h: add missing shifted keys, fix whitespace  
							
							
							
							
						 
						
							2016-07-14 11:32:43 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jonathan A. Kollasch 
								
							 
						 
						
							
							
								
							
							
	25938a09a6  
						 
						
							
							
								
								
								extra_keymaps: use RALT() instead of 0x1400 for AltGr  
							
							
							
							
						 
						
							2016-07-14 11:13:35 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jonathan A. Kollasch 
								
							 
						 
						
							
							
								
							
							
	010dd13084  
						 
						
							
							
								
								
								keymap_extras: add newline at end of files  
							
							
							
							
						 
						
							2016-07-14 11:10:05 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jack Humbert 
								
							 
						 
						
							
							
								
							
							
	9ecf9073b9  
						 
						
							
							
								
								
								Merge pull request  #489  from Skrymir/master  
							
							... 
							
							
							
							
							New ergodox-ez layout 
							
						 
						
							2016-07-14 10:59:23 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jack Humbert 
								
							 
						 
						
							
							
								
							
							
	8bbbbcddf9  
						 
						
							
							
								
								
								Merge pull request  #515  from pvinis/reset-function  
							
							... 
							
							
							
							
							extract reset keyboard into a function 
							
						 
						
							2016-07-14 10:53:51 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Will Wolff-Myren 
								
							 
						 
						
							
							
								
							
							
	76469ebbcf  
						 
						
							
							
								
								
								Replaced ordinary-media.{png|json} with new media layout  
							
							
							
							
						 
						
							2016-07-14 01:22:15 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Will Wolff-Myren 
								
							 
						 
						
							
							
								
							
							
	1b776f0f33  
						 
						
							
							
								
								
								Replaced ordinary-symbol.{png|json} with new base layout.  
							
							
							
							
						 
						
							2016-07-14 01:03:45 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Will Wolff-Myren 
								
							 
						 
						
							
							
								
							
							
	b587245430  
						 
						
							
							
								
								
								Replaced ordinary-base.{png|json} with new base layout.  
							
							
							
							
						 
						
							2016-07-14 00:39:01 -07:00