Jack Humbert 
							
						 
					 
					
						
						
						
						
							
						
						
							be265decae 
							
						 
					 
					
						
						
							
							Merge pull request  #892  from fredizzimo/disable_ergodox_lcd  
						
						... 
						
						
						
						Always initialize the Infinity Ergodox backlight 
						
						
					 
					
						2016-11-21 19:59:39 -05:00 
						 
				 
			
				
					
						
							
							
								Jack Humbert 
							
						 
					 
					
						
						
						
						
							
						
						
							377583d9f3 
							
						 
					 
					
						
						
							
							Merge pull request  #891  from g-sam/galson-keymap  
						
						... 
						
						
						
						adds galson keymap 
						
						
					 
					
						2016-11-21 19:59:17 -05:00 
						 
				 
			
				
					
						
							
							
								Jack Humbert 
							
						 
					 
					
						
						
						
						
							
						
						
							132c079534 
							
						 
					 
					
						
						
							
							Merge pull request  #890  from algernon/f/space-cadet/timeout  
						
						... 
						
						
						
						Add a timeout to space-cadet shift. 
						
						
					 
					
						2016-11-21 19:58:55 -05:00 
						 
				 
			
				
					
						
							
							
								Jack Humbert 
							
						 
					 
					
						
						
						
						
							
						
						
							e0fc186c28 
							
						 
					 
					
						
						
							
							Merge pull request  #888  from climbalima/master  
						
						... 
						
						
						
						Added pro micro to maxipad 
						
						
					 
					
						2016-11-21 19:58:24 -05:00 
						 
				 
			
				
					
						
							
							
								Jack Humbert 
							
						 
					 
					
						
						
						
						
							
						
						
							ea472fb018 
							
						 
					 
					
						
						
							
							Merge pull request  #887  from profet23/atreus62  
						
						... 
						
						
						
						atreus62 Keyboard Support 
						
						
					 
					
						2016-11-21 19:58:00 -05:00 
						 
				 
			
				
					
						
							
							
								Jack Humbert 
							
						 
					 
					
						
						
						
						
							
						
						
							664c0a036b 
							
						 
					 
					
						
						
							
							cleaning up new code  
						
						
						
						
					 
					
						2016-11-21 19:50:55 -05:00 
						 
				 
			
				
					
						
							
							
								Jack Humbert 
							
						 
					 
					
						
						
						
						
							
						
						
							27ebacb15d 
							
						 
					 
					
						
						
							
							merging lets_split  
						
						
						
						
					 
					
						2016-11-21 19:18:47 -05:00 
						 
				 
			
				
					
						
							
							
								Jack Humbert 
							
						 
					 
					
						
						
						
						
							
						
						
							c1037b1dc0 
							
						 
					 
					
						
						
							
							working with helper, qmk_helper_windows@05b0105  
						
						
						
						
					 
					
						2016-11-21 18:05:06 -05:00 
						 
				 
			
				
					
						
							
							
								Jack Humbert 
							
						 
					 
					
						
						
						
						
							
						
						
							b57cf3c0c8 
							
						 
					 
					
						
						
							
							more structure to the package  
						
						
						
						
					 
					
						2016-11-21 12:54:06 -05:00 
						 
				 
			
				
					
						
							
							
								Sihui Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							b75538c0bf 
							
						 
					 
					
						
						
							
							add del to new cmd  
						
						
						
						
					 
					
						2016-11-20 14:45:51 -08:00 
						 
				 
			
				
					
						
							
							
								Sihui Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							390a1bda8b 
							
						 
					 
					
						
						
							
							add space to NewCmd layer  
						
						
						
						
					 
					
						2016-11-20 13:32:25 -08:00 
						 
				 
			
				
					
						
							
							
								Sihui Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							ccc34851f2 
							
						 
					 
					
						
						
							
							add space to NewCmd layer  
						
						
						
						
					 
					
						2016-11-20 13:31:41 -08:00 
						 
				 
			
				
					
						
							
							
								Didier Chagniot 
							
						 
					 
					
						
						
						
						
							
						
						
							6f24344be7 
							
						 
					 
					
						
						
							
							typo fix  
						
						
						
						
					 
					
						2016-11-20 20:51:05 +01:00 
						 
				 
			
				
					
						
							
							
								Sihui Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							23f63ed1b9 
							
						 
					 
					
						
						
							
							Update README.md  
						
						
						
						
					 
					
						2016-11-20 11:18:08 -08:00 
						 
				 
			
				
					
						
							
							
								Sihui Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							34aa59c6d5 
							
						 
					 
					
						
						
							
							Update README.md  
						
						
						
						
					 
					
						2016-11-20 11:13:57 -08:00 
						 
				 
			
				
					
						
							
							
								Sihui Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							11f17e3b23 
							
						 
					 
					
						
						
							
							Update README.md  
						
						
						
						
					 
					
						2016-11-20 11:12:48 -08:00 
						 
				 
			
				
					
						
							
							
								Sihui Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							a8b1c47f0f 
							
						 
					 
					
						
						
							
							add sh-hhkb-jp layers  
						
						
						
						
					 
					
						2016-11-20 11:10:26 -08:00 
						 
				 
			
				
					
						
							
							
								Fred Sundvik 
							
						 
					 
					
						
						
						
						
							
						
						
							c86bbf474e 
							
						 
					 
					
						
						
							
							Always initialze the Infinity Ergodox backlight  
						
						... 
						
						
						
						Otherwise it will stay lit. The set_led functionality is also disabled
since it doesn't work properly for slaves. 
						
						
					 
					
						2016-11-20 19:28:10 +02:00 
						 
				 
			
				
					
						
							
							
								Jack Humbert 
							
						 
					 
					
						
						
						
						
							
						
						
							3b990c08dc 
							
						 
					 
					
						
						
							
							Merge pull request  #878  from sethbc/add_sethbc_gh60_keymap  
						
						... 
						
						
						
						add sethbc keymap for gh60 and update macro expansion 
						
						
					 
					
						2016-11-19 13:05:30 -05:00 
						 
				 
			
				
					
						
							
							
								xyverz 
							
						 
					 
					
						
						
						
						
							
						
						
							f9cf4f75ae 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'upstream/master'  
						
						
						
						
					 
					
						2016-11-19 09:31:34 -08:00 
						 
				 
			
				
					
						
							
							
								Seth Chandler 
							
						 
					 
					
						
						
						
						
							
						
						
							df8724ce08 
							
						 
					 
					
						
						
							
							remove KC expansion from GH60  
						
						
						
						
					 
					
						2016-11-19 12:19:21 -05:00 
						 
				 
			
				
					
						
							
							
								Gergely Nagy 
							
						 
					 
					
						
						
						
						
							
						
						
							74a1f00713 
							
						 
					 
					
						
						
							
							Fix the Space Cadet timeout code  
						
						... 
						
						
						
						Define a default TAPPING_TERM in quantum.c, for keyboards that do not
have it set. Fixes the CI failure.
Signed-off-by: Gergely Nagy <algernon@madhouse-project.org> 
						
						
					 
					
						2016-11-19 18:19:18 +01:00 
						 
				 
			
				
					
						
							
							
								Seth Chandler 
							
						 
					 
					
						
						
						
						
							
						
						
							620e4f74d3 
							
						 
					 
					
						
						
							
							move KC expansion to separate macros  
						
						
						
						
					 
					
						2016-11-19 11:37:12 -05:00 
						 
				 
			
				
					
						
							
							
								Seth Chandler 
							
						 
					 
					
						
						
						
						
							
						
						
							ac7d202d4f 
							
						 
					 
					
						
						
							
							merge upstream/master  
						
						
						
						
					 
					
						2016-11-19 11:20:41 -05:00 
						 
				 
			
				
					
						
							
							
								samgalson@gmail.com 
							
						 
					 
					
						
						
						
						
							
						
						
							7f5e71d79f 
							
						 
					 
					
						
						
							
							adds galson keymap  
						
						
						
						
					 
					
						2016-11-19 14:21:12 +00:00 
						 
				 
			
				
					
						
							
							
								Gergely Nagy 
							
						 
					 
					
						
						
						
						
							
						
						
							ffa5b1e7ea 
							
						 
					 
					
						
						
							
							Add a timeout to space-cadet shift.  
						
						... 
						
						
						
						When one holds a Space Cadet shift, to have it act as a shift, so that
mouse behaviour changes, when released without any other key pressed, it
still registers a paren. To remedy this, add a hold timeout: if the key
is held longer than TAPPING_TERM, it will not register the parens.
Fixes  #884 , with the side-effect of not being able to have parens
trigger the OS-side repeat anymore.
Signed-off-by: Gergely Nagy <algernon@madhouse-project.org> 
						
						
					 
					
						2016-11-19 11:32:09 +01:00 
						 
				 
			
				
					
						
							
							
								climbalima 
							
						 
					 
					
						
						
						
						
							
						
						
							102a830bbd 
							
						 
					 
					
						
						
							
							changed readme  
						
						
						
						
					 
					
						2016-11-19 00:49:20 -05:00 
						 
				 
			
				
					
						
							
							
								climbalima 
							
						 
					 
					
						
						
						
						
							
						
						
							e356de2220 
							
						 
					 
					
						
						
							
							added the pinout for pro micro into maxipad  
						
						
						
						
					 
					
						2016-11-19 00:44:52 -05:00 
						 
				 
			
				
					
						
							
							
								climbalima 
							
						 
					 
					
						
						
						
						
							
						
						
							01736a502e 
							
						 
					 
					
						
						
							
							just saving  
						
						
						
						
					 
					
						2016-11-18 23:40:34 -05:00 
						 
				 
			
				
					
						
							
							
								Jack Humbert 
							
						 
					 
					
						
						
						
						
							
						
						
							a06115df19 
							
						 
					 
					
						
						
							
							don't always detect a matrix change (fixes debounce)  
						
						
						
						
					 
					
						2016-11-18 23:20:07 -05:00 
						 
				 
			
				
					
						
							
							
								Jack Humbert 
							
						 
					 
					
						
						
						
						
							
						
						
							ab6557c1a0 
							
						 
					 
					
						
						
							
							wqMerge branch 'wu5y7' of  https://github.com/jackhumbert/qmk_firmware  into wu5y7  
						
						
						
						
					 
					
						2016-11-18 22:22:29 -05:00 
						 
				 
			
				
					
						
							
							
								Jack Humbert 
							
						 
					 
					
						
						
						
						
							
						
						
							161bd5596b 
							
						 
					 
					
						
						
							
							midi back and forth  
						
						
						
						
					 
					
						2016-11-18 22:22:24 -05:00 
						 
				 
			
				
					
						
							
							
								Daniel 
							
						 
					 
					
						
						
						
						
							
						
						
							abee809298 
							
						 
					 
					
						
						
							
							moves brackets to top row.  
						
						
						
						
					 
					
						2016-11-18 11:11:08 -06:00 
						 
				 
			
				
					
						
							
							
								Erez Zukerman 
							
						 
					 
					
						
						
						
						
							
						
						
							285c5a91f2 
							
						 
					 
					
						
						
							
							Groundwork for dedicated color keycodes  
						
						
						
						
					 
					
						2016-11-17 20:56:36 -05:00 
						 
				 
			
				
					
						
							
							
								Erez Zukerman 
							
						 
					 
					
						
						
						
						
							
						
						
							9bbc9a7ce0 
							
						 
					 
					
						
						
							
							Initial Erez Experimental keymap tweaks  
						
						
						
						
					 
					
						2016-11-17 19:47:08 -05:00 
						 
				 
			
				
					
						
							
							
								Jack Humbert 
							
						 
					 
					
						
						
						
						
							
						
						
							3774a7fcda 
							
						 
					 
					
						
						
							
							rgb light through midi  
						
						
						
						
					 
					
						2016-11-17 17:42:14 -05:00 
						 
				 
			
				
					
						
							
							
								xyverz 
							
						 
					 
					
						
						
						
						
							
						
						
							b493f6a4ed 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'upstream/master'  
						
						
						
						
					 
					
						2016-11-16 22:36:36 -08:00 
						 
				 
			
				
					
						
							
							
								Benjamin Grabkowitz 
							
						 
					 
					
						
						
						
						
							
						
						
							6c5fce5c1a 
							
						 
					 
					
						
						
							
							Adding readme placeholder  
						
						
						
						
					 
					
						2016-11-16 23:59:42 -05:00 
						 
				 
			
				
					
						
							
							
								Benjamin Grabkowitz 
							
						 
					 
					
						
						
						
						
							
						
						
							00d88b74ad 
							
						 
					 
					
						
						
							
							Adding Support for atreus62 keyboard.  https://github.com/profet23/atreus62  
						
						
						
						
					 
					
						2016-11-16 23:52:36 -05:00 
						 
				 
			
				
					
						
							
							
								Jack Humbert 
							
						 
					 
					
						
						
						
						
							
						
						
							c38b3e3be9 
							
						 
					 
					
						
						
							
							Merge pull request  #883  from climbalima/master  
						
						... 
						
						
						
						added rev2 lets split after merging with qmk 
						
						
					 
					
						2016-11-16 21:17:51 -05:00 
						 
				 
			
				
					
						
							
							
								climbalima 
							
						 
					 
					
						
						
						
						
							
						
						
							b085a34506 
							
						 
					 
					
						
						
							
							fixed readme conflicts  
						
						
						
						
					 
					
						2016-11-16 20:44:49 -05:00 
						 
				 
			
				
					
						
							
							
								climbalima 
							
						 
					 
					
						
						
						
						
							
						
						
							21b6b4e6c4 
							
						 
					 
					
						
						
							
							should have fixed conflixed  
						
						
						
						
					 
					
						2016-11-16 19:49:38 -05:00 
						 
				 
			
				
					
						
							
							
								climbalima 
							
						 
					 
					
						
						
						
						
							
						
						
							668c739702 
							
						 
					 
					
						
						
							
							Merge branch 'master' of  https://github.com/jackhumbert/qmk_firmware  
						
						
						
						
					 
					
						2016-11-16 19:28:30 -05:00 
						 
				 
			
				
					
						
							
							
								climbalima 
							
						 
					 
					
						
						
						
						
							
						
						
							5cac51a773 
							
						 
					 
					
						
						
							
							Merge  https://github.com/climbalima/qmk_firmware  
						
						
						
						
					 
					
						2016-11-16 19:26:38 -05:00 
						 
				 
			
				
					
						
							
							
								climbalima 
							
						 
					 
					
						
						
						
						
							
						
						
							1dd6ceb45d 
							
						 
					 
					
						
						
							
							Updated my repo to current qmk  
						
						
						
						
					 
					
						2016-11-16 19:18:54 -05:00 
						 
				 
			
				
					
						
							
							
								Jack Humbert 
							
						 
					 
					
						
						
						
						
							
						
						
							72e78a017f 
							
						 
					 
					
						
						
							
							Merge pull request  #882  from seebs/master  
						
						... 
						
						
						
						dvorak/plover keyboard layout 
						
						
					 
					
						2016-11-16 17:15:58 -05:00 
						 
				 
			
				
					
						
							
							
								cbbrowne 
							
						 
					 
					
						
						
						
						
							
						
						
							5b88e7ab9a 
							
						 
					 
					
						
						
							
							Merge branch 'master' of  https://github.com/jackhumbert/qmk_firmware  
						
						
						
						
					 
					
						2016-11-16 17:05:11 -05:00 
						 
				 
			
				
					
						
							
							
								Seebs 
							
						 
					 
					
						
						
						
						
							
						
						
							4da698fda3 
							
						 
					 
					
						
						
							
							dvorak/plover keyboard layout  
						
						... 
						
						
						
						Plover's steno support likes quasi-qwerty, and gaming likes qwerty,
and I like dvorak, so... what if I could have it all?
Signed-off-by: seebs <seebs@seebs.net> 
						
						
					 
					
						2016-11-16 15:44:26 -06:00 
						 
				 
			
				
					
						
							
							
								Jack Humbert 
							
						 
					 
					
						
						
						
						
							
						
						
							9f1b27c5ba 
							
						 
					 
					
						
						
							
							Merge pull request  #880  from psyill/master  
						
						... 
						
						
						
						Added keymap "videck", an ErgoDox keymap for Vi(m) users. 
						
						
					 
					
						2016-11-16 14:54:18 -05:00 
						 
				 
			
				
					
						
							
							
								Jack Humbert 
							
						 
					 
					
						
						
						
						
							
						
						
							e025a94bc2 
							
						 
					 
					
						
						
							
							Merge pull request  #879  from sethbc/update_sethbc_ergodox_keymap  
						
						... 
						
						
						
						update sethbc ergodox keymap 
						
						
					 
					
						2016-11-16 14:53:52 -05:00