Toni 
							
						 
					 
					
						
						
						
						
							
						
						
							5cd6d607fc 
							
						 
					 
					
						
						
							
							changed ctrl back to enter. "j" interfered with my vimming  
						
						
						
						
					 
					
						2016-07-19 09:17:31 +02:00 
						 
				 
			
				
					
						
							
							
								Toni 
							
						 
					 
					
						
						
						
						
							
						
						
							1988c180e3 
							
						 
					 
					
						
						
							
							small cosmetic change  
						
						
						
						
					 
					
						2016-07-19 09:16:55 +02:00 
						 
				 
			
				
					
						
							
							
								Christopher Browne 
							
						 
					 
					
						
						
						
						
							
						
						
							82f768e6c0 
							
						 
					 
					
						
						
							
							Notes about changes  
						
						
						
						
					 
					
						2016-07-18 16:07:00 -04:00 
						 
				 
			
				
					
						
							
							
								Toni 
							
						 
					 
					
						
						
						
						
							
						
						
							4b32a161d0 
							
						 
					 
					
						
						
							
							renamed keymap  
						
						
						
						
					 
					
						2016-07-18 10:50:45 +02:00 
						 
				 
			
				
					
						
							
							
								Toni 
							
						 
					 
					
						
						
						
						
							
						
						
							36242d5ac5 
							
						 
					 
					
						
						
							
							reduced makefile size. not so much needed due to "inheritance"  
						
						
						
						
					 
					
						2016-07-18 10:50:19 +02:00 
						 
				 
			
				
					
						
							
							
								Gergely Nagy 
							
						 
					 
					
						
						
						
						
							
						
						
							53eb36c085 
							
						 
					 
					
						
						
							
							ergodox_ez: Update my keymap to v1.3  
						
						... 
						
						
						
						This updates my ErgoDox EZ layout to v1.3, which has the following
noteworthy changes:
* Added support for logging keys, by pressing `LEAD d`. Also included is
  a tool to generate a **heatmap** out of the logs.
* The arrow and navigation keys were rearranged again, and now require
  an additional key being held to activate. See the **base layer** for
  an image that shows where arrows are.
* The **experimental** layer has been redone, and is now
  called **ADORE**, and as such, can be enabled by `LEAD a` now.
* Switching between Dvorak and ADORE is now persisted into EEPROM, and
  survives a reboot.
Signed-off-by: Gergely Nagy <algernon@madhouse-project.org> 
						
						
					 
					
						2016-07-18 08:57:30 +02:00 
						 
				 
			
				
					
						
							
							
								Will Wolff-Myren 
							
						 
					 
					
						
						
						
						
							
						
						
							3c4620bf81 
							
						 
					 
					
						
						
							
							Update readme.md  
						
						... 
						
						
						
						* Markdown cleanup 
						
						
					 
					
						2016-07-17 15:08:04 -07:00 
						 
				 
			
				
					
						
							
							
								Will Wolff-Myren 
							
						 
					 
					
						
						
						
						
							
						
						
							8fb4074578 
							
						 
					 
					
						
						
							
							Update readme.md  
						
						... 
						
						
						
						* Updated layout images, json from Keyboard Layout Designer
* Added links to Keyboard Layout Designer templates.
* Added images of TECK, Kinesis layouts. 
						
						
					 
					
						2016-07-17 15:04:50 -07:00 
						 
				 
			
				
					
						
							
							
								Will Wolff-Myren 
							
						 
					 
					
						
						
						
						
							
						
						
							ea2b1670f6 
							
						 
					 
					
						
						
							
							Update description comment.  
						
						
						
						
					 
					
						2016-07-17 14:56:37 -07:00 
						 
				 
			
				
					
						
							
							
								Will Wolff-Myren 
							
						 
					 
					
						
						
						
						
							
						
						
							5bf40bfb36 
							
						 
					 
					
						
						
							
							[MEDIA]: Remove Power, Sleep, Mail, MyComp  
						
						... 
						
						
						
						I kept hitting these on accident while attempting to move the cursor or
mouse. =P 
						
						
					 
					
						2016-07-17 14:19:22 -07:00 
						 
				 
			
				
					
						
							
							
								Will Wolff-Myren 
							
						 
					 
					
						
						
						
						
							
						
						
							ecc0fce210 
							
						 
					 
					
						
						
							
							[BASE]: Meh, Hyper now have symbols on both sides  
						
						... 
						
						
						
						Left: MEH_T(KC_BSLS),ALL_T(KC_SLSH)
Right: ALL_T(KC_LBRC),MEH_T(KC_RBRC) 
						
						
					 
					
						2016-07-17 14:16:31 -07:00 
						 
				 
			
				
					
						
							
							
								Toni 
							
						 
					 
					
						
						
						
						
							
						
						
							11bf8355cf 
							
						 
					 
					
						
						
							
							new modifier "J" is crtl  
						
						
						
						
					 
					
						2016-07-17 23:13:49 +02:00 
						 
				 
			
				
					
						
							
							
								Will Wolff-Myren 
							
						 
					 
					
						
						
						
						
							
						
						
							e9453b3fdc 
							
						 
					 
					
						
						
							
							Update Base Layer comment to match new layout.  
						
						
						
						
					 
					
						2016-07-17 14:08:22 -07:00 
						 
				 
			
				
					
						
							
							
								Will Wolff-Myren 
							
						 
					 
					
						
						
						
						
							
						
						
							11f8d167ec 
							
						 
					 
					
						
						
							
							[BASE]: KC_MINS -> KC_GRV  
						
						
						
						
					 
					
						2016-07-17 14:07:14 -07:00 
						 
				 
			
				
					
						
							
							
								Will Wolff-Myren 
							
						 
					 
					
						
						
						
						
							
						
						
							e900c39669 
							
						 
					 
					
						
						
							
							RSpec: KC_EQL -> KC_MINS  
						
						
						
						
					 
					
						2016-07-17 14:01:41 -07:00 
						 
				 
			
				
					
						
							
							
								Will Wolff-Myren 
							
						 
					 
					
						
						
						
						
							
						
						
							973ea2f917 
							
						 
					 
					
						
						
							
							LSpec: KC_GRV -> KC_EQL  
						
						
						
						
					 
					
						2016-07-17 13:58:43 -07: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 
							
						 
					 
					
						
						
						
						
							
						
						
							38508180c7 
							
						 
					 
					
						
						
							
							update readmes in certain directories to work with qmk.fm  
						
						
						
						
					 
					
						2016-07-17 03:24:00 -04: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 
						 
				 
			
				
					
						
							
							
								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 
							
						 
					 
					
						
						
						
						
							
						
						
							243ae75256 
							
						 
					 
					
						
						
							
							Added default layer switch QWERTY to Colemak  
						
						
						
						
					 
					
						2016-07-15 18:02:23 -05:00 
						 
				 
			
				
					
						
							
							
								Joshua T 
							
						 
					 
					
						
						
						
						
							
						
						
							77377e2784 
							
						 
					 
					
						
						
							
							Fixed a merge conflict  
						
						
						
						
					 
					
						2016-07-15 17:44:39 -05:00 
						 
				 
			
				
					
						
							
							
								Christopher Browne 
							
						 
					 
					
						
						
						
						
							
						
						
							ba0d81f270 
							
						 
					 
					
						
						
							
							Merge branch 'master' of  https://github.com/jackhumbert/qmk_firmware  
						
						
						
						
					 
					
						2016-07-15 11:19:52 -04:00 
						 
				 
			
				
					
						
							
							
								Joshua T 
							
						 
					 
					
						
						
						
						
							
						
						
							42843d9b62 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'upstream/master'  
						
						
						
						
					 
					
						2016-07-15 01:01:19 -05: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 
						 
				 
			
				
					
						
							
							
								Will Wolff-Myren 
							
						 
					 
					
						
						
						
						
							
						
						
							825aead3bd 
							
						 
					 
					
						
						
							
							Replaced readme.md with stub  
						
						... 
						
						
						
						(incl. reference to original layout) 
						
						
					 
					
						2016-07-14 00:38:00 -07:00 
						 
				 
			
				
					
						
							
							
								Joshua T 
							
						 
					 
					
						
						
						
						
							
						
						
							92e7291ad7 
							
						 
					 
					
						
						
							
							Corrected merge conflict  
						
						
						
						
					 
					
						2016-07-13 22:41:02 -05:00 
						 
				 
			
				
					
						
							
							
								Joshua T 
							
						 
					 
					
						
						
						
						
							
						
						
							f90d89458c 
							
						 
					 
					
						
						
							
							Created replicaJunction keymaps.  
						
						
						
						
					 
					
						2016-07-13 22:37:34 -05:00 
						 
				 
			
				
					
						
							
							
								Will Wolff-Myren 
							
						 
					 
					
						
						
						
						
							
						
						
							8f3cdea357 
							
						 
					 
					
						
						
							
							Created "teckinesis" keymap folder  
						
						... 
						
						
						
						(Based on "ordinary" keymap by Nicholas Keene) 
						
						
					 
					
						2016-07-13 13:17:55 -07:00 
						 
				 
			
				
					
						
							
							
								Josh Colbeck 
							
						 
					 
					
						
						
						
						
							
						
						
							fb46eb2de1 
							
						 
					 
					
						
						
							
							Added open resource macro  
						
						... 
						
						
						
						tap to type, hold for resource 
						
						
					 
					
						2016-07-12 23:52:02 -05:00 
						 
				 
			
				
					
						
							
							
								Joshua Colbeck 
							
						 
					 
					
						
						
						
						
							
						
						
							68ceffe53e 
							
						 
					 
					
						
						
							
							Merge pull request  #2  from jackhumbert/master  
						
						... 
						
						
						
						Pull from upstream 
						
						
					 
					
						2016-07-12 23:14:30 -05:00 
						 
				 
			
				
					
						
							
							
								Christopher Browne 
							
						 
					 
					
						
						
						
						
							
						
						
							f4fbfe6e54 
							
						 
					 
					
						
						
							
							Merge branch 'master' of  https://github.com/jackhumbert/qmk_firmware  
						
						
						
						
					 
					
						2016-07-12 11:57:15 -04:00 
						 
				 
			
				
					
						
							
							
								Christopher Browne 
							
						 
					 
					
						
						
						
						
							
						
						
							477ed703c8 
							
						 
					 
					
						
						
							
							I did not like Space Cadet paren; it jumps in in way too many extra cases  
						
						
						
						
					 
					
						2016-07-12 11:57:05 -04:00 
						 
				 
			
				
					
						
							
							
								Joshua T 
							
						 
					 
					
						
						
						
						
							
						
						
							32725dae5b 
							
						 
					 
					
						
						
							
							Created replicaJunction keymaps.  
						
						
						
						
					 
					
						2016-07-11 17:49:12 -05:00 
						 
				 
			
				
					
						
							
							
								Jack Humbert 
							
						 
					 
					
						
						
						
						
							
						
						
							a998a48673 
							
						 
					 
					
						
						
							
							Merge pull request  #477  from Smilliam/master  
						
						... 
						
						
						
						Canceling Space Cadet state with opposite shift key 
						
						
					 
					
						2016-07-11 09:14:43 -04:00 
						 
				 
			
				
					
						
							
							
								Jack Humbert 
							
						 
					 
					
						
						
						
						
							
						
						
							076de6fa75 
							
						 
					 
					
						
						
							
							Merge pull request  #506  from stanleylai/master  
						
						... 
						
						
						
						Added my custom keymap for Satan 
						
						
					 
					
						2016-07-11 09:14:11 -04:00 
						 
				 
			
				
					
						
							
							
								Ruiqi Mao 
							
						 
					 
					
						
						
						
						
							
						
						
							cb0e102adb 
							
						 
					 
					
						
						
							
							fixed clueboard LED pin assignments and matrix documentation  
						
						
						
						
					 
					
						2016-07-11 01:18:35 -07:00 
						 
				 
			
				
					
						
							
							
								Smilliam 
							
						 
					 
					
						
						
						
						
							
						
						
							5e58e2281a 
							
						 
					 
					
						
						
							
							amended extraneous file edits  
						
						
						
						
					 
					
						2016-07-10 19:10:00 -07:00 
						 
				 
			
				
					
						
							
							
								Smilliam 
							
						 
					 
					
						
						
						
						
							
						
						
							b12fe6abb2 
							
						 
					 
					
						
						
							
							Made rollover behavior for space cadet optional  
						
						
						
						
					 
					
						2016-07-10 19:04:01 -07:00 
						 
				 
			
				
					
						
							
							
								Stanley Lai 
							
						 
					 
					
						
						
						
						
							
						
						
							753cbee5c0 
							
						 
					 
					
						
						
							
							Added my custom keymap for Satan  
						
						
						
						
					 
					
						2016-07-10 12:07:56 -07:00 
						 
				 
			
				
					
						
							
							
								Max Whittingham 
							
						 
					 
					
						
						
						
						
							
						
						
							df958a2dbc 
							
						 
					 
					
						
						
							
							Update keymap.c  
						
						
						
						
					 
					
						2016-07-09 18:58:16 -05:00 
						 
				 
			
				
					
						
							
							
								Max Whittingham 
							
						 
					 
					
						
						
						
						
							
						
						
							1ab527a4db 
							
						 
					 
					
						
						
							
							Cleaning up repo  
						
						
						
						
					 
					
						2016-07-09 03:20:58 -05:00 
						 
				 
			
				
					
						
							
							
								TerryMathews 
							
						 
					 
					
						
						
						
						
							
						
						
							4decdd2b18 
							
						 
					 
					
						
						
							
							Merge pull request  #1  from jackhumbert/master  
						
						... 
						
						
						
						Catch up with jack's master 
						
						
					 
					
						2016-07-09 16:46:00 -04:00