johannes 
							
						 
					 
					
						
						
							
						
						f936a3d5c2 
					 
					
						
						
							
							stuff  
						
						
						
						
					 
					
						2017-02-03 14:10:19 +01:00 
						 
				 
			
				
					
						
							
							
								johannes 
							
						 
					 
					
						
						
							
						
						453cd25ab8 
					 
					
						
						
							
							Merge branch 'master' of  https://github.com/Johannes-Larsson/qmk_firmware  
						
						
						
						
					 
					
						2017-02-03 10:49:46 +01:00 
						 
				 
			
				
					
						
							
							
								johannes 
							
						 
					 
					
						
						
							
						
						8a7daf34a2 
					 
					
						
						
							
							initial keymap  
						
						
						
						
					 
					
						2017-02-03 10:47:37 +01:00 
						 
				 
			
				
					
						
							
							
								Erez Zukerman 
							
						 
					 
					
						
						
							
						
						f0633f2540 
					 
					
						
						
							
							Merge pull request  #1063  from osamuaoki/master  
						
						... 
						
						
						
						Typo fixes 
						
						
					 
					
						2017-02-02 18:33:04 -05:00 
						 
				 
			
				
					
						
							
							
								Erez Zukerman 
							
						 
					 
					
						
						
							
						
						404f79ef14 
					 
					
						
						
							
							Merge pull request  #1058  from edasque/master  
						
						... 
						
						
						
						Reverted Dockerfile to put the CMD back 
						
						
					 
					
						2017-02-02 18:31:25 -05:00 
						 
				 
			
				
					
						
							
							
								Osamu Aoki 
							
						 
					 
					
						
						
							
						
						f787f4291a 
					 
					
						
						
							
							Typo fixes  
						
						
						
						
					 
					
						2017-02-02 23:15:08 +09:00 
						 
				 
			
				
					
						
							
							
								Erez Zukerman 
							
						 
					 
					
						
						
							
						
						45e5b32781 
					 
					
						
						
							
							Merge pull request  #1049  from SjB/tap_dance_save_oneshot_mods  
						
						... 
						
						
						
						race condition between oneshot_mods and tap_dance 
						
						
					 
					
						2017-02-01 20:12:44 -05:00 
						 
				 
			
				
					
						
							
							
								Erez Zukerman 
							
						 
					 
					
						
						
							
						
						a5d10e8c2e 
					 
					
						
						
							
							Merge pull request  #1054  from deadcyclo/master  
						
						... 
						
						
						
						Adds support for ergodox shine and unicode and emoji support to the deadcyclo layout 
						
						
					 
					
						2017-02-01 20:11:37 -05:00 
						 
				 
			
				
					
						
							
							
								Brendan Johan Lee 
							
						 
					 
					
						
						
							
						
						02a95ee08c 
					 
					
						
						
							
							Merge remote-tracking branch 'upstream/master'  
						
						
						
						
					 
					
						2017-02-01 08:56:35 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Dasque 
							
						 
					 
					
						
						
							
						
						407f949e4b 
					 
					
						
						
							
							Reverted Dockerfile to put the CMD back  
						
						
						
						
					 
					
						2017-01-31 19:59:59 -05:00 
						 
				 
			
				
					
						
							
							
								Erez Zukerman 
							
						 
					 
					
						
						
							
						
						748316fc43 
					 
					
						
						
							
							Merge pull request  #1039  from zabereer/albert_ergodox_keymap  
						
						... 
						
						
						
						albert ergodox keymap 
						
						
					 
					
						2017-01-31 19:29:19 -05:00 
						 
				 
			
				
					
						
							
							
								Erez Zukerman 
							
						 
					 
					
						
						
							
						
						0081101c30 
					 
					
						
						
							
							Merge pull request  #1055  from matzebond/master  
						
						... 
						
						
						
						update my neo2 keymap 
						
						
					 
					
						2017-01-31 19:25:46 -05:00 
						 
				 
			
				
					
						
							
							
								Matthias Schmitt 
							
						 
					 
					
						
						
							
						
						4c3630dc17 
					 
					
						
						
							
							update my neo2 keymap  
						
						
						
						
					 
					
						2017-01-30 23:10:28 +01:00 
						 
				 
			
				
					
						
							
							
								Brendan Johan Lee 
							
						 
					 
					
						
						
							
						
						f70758622b 
					 
					
						
						
							
							[deadcyclo layout] Refactoring. Use custom functions and macros  
						
						
						
						
					 
					
						2017-01-30 19:42:27 +01:00 
						 
				 
			
				
					
						
							
							
								Brendan Johan Lee 
							
						 
					 
					
						
						
							
						
						f400ac1d7d 
					 
					
						
						
							
							[deadcyclo layout] fixed failing tests  
						
						
						
						
					 
					
						2017-01-30 15:45:16 +01:00 
						 
				 
			
				
					
						
							
							
								Brendan Johan Lee 
							
						 
					 
					
						
						
							
						
						d43f4a5f57 
					 
					
						
						
							
							Merge remote-tracking branch 'upstream/master'  
						
						
						
						
					 
					
						2017-01-30 12:59:17 +01:00 
						 
				 
			
				
					
						
							
							
								SjB 
							
						 
					 
					
						
						
							
						
						5a860b71a1 
					 
					
						
						
							
							race condition between oneshot_mods and tap_dance  
						
						... 
						
						
						
						since the keycode for a tap dance process gets process only after the
TAPPING_TERM timeout, you really only have ONESHOT_TIMEOUT -
TAPPING_TERM time to tap or double tap on the key. This fix save the
oneshot_mods into the action.state structure and applies the mods with
the keycode when it's registered. It also unregisters the mod when the
the tap dance process gets reset. 
						
						
					 
					
						2017-01-29 13:26:31 -05:00 
						 
				 
			
				
					
						
							
							
								skullydazed 
							
						 
					 
					
						
						
							
						
						ec05f65421 
					 
					
						
						
							
							Merge pull request  #1043  from potz/patch-1  
						
						... 
						
						
						
						Clarify license on abnt2 keymap (#1038 ) 
						
						
					 
					
						2017-01-27 18:40:59 -08:00 
						 
				 
			
				
					
						
							
							
								Potiguar Faga 
							
						 
					 
					
						
						
							
						
						2fe18a50ec 
					 
					
						
						
							
							Clarify license on abnt2 keymap ( #1038 )  
						
						
						
						
					 
					
						2017-01-27 18:22:44 -02:00 
						 
				 
			
				
					
						
							
							
								Jack Humbert 
							
						 
					 
					
						
						
							
						
						a28f689387 
					 
					
						
						
							
							Merge pull request  #869  from dylanjgscott/master  
						
						... 
						
						
						
						Use `type cmp` to test for cmp in Makefile 
						
						
					 
					
						2017-01-27 11:23:02 -05:00 
						 
				 
			
				
					
						
							
							
								Brendan Johan Lee 
							
						 
					 
					
						
						
							
						
						d7aa4724fb 
					 
					
						
						
							
							Merge remote-tracking branch 'upstream/master'  
						
						
						
						
					 
					
						2017-01-27 15:24:08 +01:00 
						 
				 
			
				
					
						
							
							
								Brendan Johan Lee 
							
						 
					 
					
						
						
							
						
						13fa63b192 
					 
					
						
						
							
							[deadcyclo layout] Added more unicode keys and ibus unicode compose trigger keys  
						
						
						
						
					 
					
						2017-01-27 13:53:02 +01:00 
						 
				 
			
				
					
						
							
							
								Jack Humbert 
							
						 
					 
					
						
						
							
						
						712f3de16f 
					 
					
						
						
							
							Merge pull request  #1035  from qmk/qmk_org_changes  
						
						... 
						
						
						
						Updated urls due to transfer to qmk org 
						
						
					 
					
						2017-01-27 00:28:46 -05:00 
						 
				 
			
				
					
						
							
							
								Albert Pretorius 
							
						 
					 
					
						
						
							
						
						fffe76a7b7 
					 
					
						
						
							
							albert ergodox keymap  
						
						
						
						
					 
					
						2017-01-26 20:07:47 +00:00 
						 
				 
			
				
					
						
							
							
								Brendan Johan Lee 
							
						 
					 
					
						
						
							
						
						8a645aa9ad 
					 
					
						
						
							
							Merge remote-tracking branch 'upstream/master'  
						
						
						
						
					 
					
						2017-01-26 11:56:32 +01:00 
						 
				 
			
				
					
						
							
							
								Jack Humbert 
							
						 
					 
					
						
						
							
						
						c9ca368008 
					 
					
						
						
							
							replace jackhumbert with qmk  
						
						
						
						
					 
					
						2017-01-26 01:52:43 -05:00 
						 
				 
			
				
					
						
							
							
								Jack Humbert 
							
						 
					 
					
						
						
							
						
						aac7c0aa4d 
					 
					
						
						
							
							Merge pull request  #1029  from SjB/qmk_infinity60  
						
						... 
						
						
						
						fix: infinity60 keyboard was not using quantum features. 
						
						
					 
					
						2017-01-26 01:28:44 -05:00 
						 
				 
			
				
					
						
							
							
								Jack Humbert 
							
						 
					 
					
						
						
							
						
						0212a30aa6 
					 
					
						
						
							
							Merge pull request  #1033  from smt/smt/preonic  
						
						... 
						
						
						
						Add smt's keymap for Preonic 
						
						
					 
					
						2017-01-26 01:27:51 -05:00 
						 
				 
			
				
					
						
							
							
								Jack Humbert 
							
						 
					 
					
						
						
							
						
						1b20243092 
					 
					
						
						
							
							Add gitter image, start update to qmk org  
						
						
						
						
					 
					
						2017-01-26 01:26:17 -05:00 
						 
				 
			
				
					
						
							
							
								Stephen Tudor 
							
						 
					 
					
						
						
							
						
						6546dddddb 
					 
					
						
						
							
							Remove COLEMAK from preonic_keycodes enum  
						
						
						
						
					 
					
						2017-01-25 10:57:42 -05:00 
						 
				 
			
				
					
						
							
							
								Jack Humbert 
							
						 
					 
					
						
						
							
						
						7e3962f36a 
					 
					
						
						
							
							Merge branch 'master' of github.com:jackhumbert/qmk_firmware  
						
						
						
						
					 
					
						2017-01-25 10:02:06 -05:00 
						 
				 
			
				
					
						
							
							
								Jack Humbert 
							
						 
					 
					
						
						
							
						
						938422ce99 
					 
					
						
						
							
							layer defines to enum  
						
						
						
						
					 
					
						2017-01-25 10:02:01 -05:00 
						 
				 
			
				
					
						
							
							
								Brendan Johan Lee 
							
						 
					 
					
						
						
							
						
						8af48194f2 
					 
					
						
						
							
							[deadcyclo layout] Added lotsof new emojis and some new unicode keys  
						
						
						
						
					 
					
						2017-01-25 15:16:38 +01:00 
						 
				 
			
				
					
						
							
							
								Stephen Tudor 
							
						 
					 
					
						
						
							
						
						51fe4f0d34 
					 
					
						
						
							
							Update readme for smt Preonic keymap  
						
						
						
						
					 
					
						2017-01-25 01:08:51 -05:00 
						 
				 
			
				
					
						
							
							
								Stephen Tudor 
							
						 
					 
					
						
						
							
						
						b3cf96ec2e 
					 
					
						
						
							
							Add smt keymap for Preonic  
						
						
						
						
					 
					
						2017-01-25 00:47:45 -05:00 
						 
				 
			
				
					
						
							
							
								Brendan Johan Lee 
							
						 
					 
					
						
						
							
						
						d0db044164 
					 
					
						
						
							
							Merge remote-tracking branch 'upstream/master'  
						
						
						
						
					 
					
						2017-01-24 21:56:18 +01:00 
						 
				 
			
				
					
						
							
							
								Brendan Johan Lee 
							
						 
					 
					
						
						
							
						
						37ed3d13a4 
					 
					
						
						
							
							[deadcyclo layout] Added unicode layer  
						
						
						
						
					 
					
						2017-01-24 21:54:34 +01:00 
						 
				 
			
				
					
						
							
							
								Brendan Johan Lee 
							
						 
					 
					
						
						
							
						
						3c32e38036 
					 
					
						
						
							
							[deadcyclo layout] Added support for ergodox ez shine  
						
						
						
						
					 
					
						2017-01-24 19:10:35 +01:00 
						 
				 
			
				
					
						
							
							
								Jack Humbert 
							
						 
					 
					
						
						
							
						
						71137deba2 
					 
					
						
						
							
							Merge pull request  #1014  from SjB/lcd_mods_status  
						
						... 
						
						
						
						added mods status bit to visualizer. 
						
						
					 
					
						2017-01-24 00:34:55 -05:00 
						 
				 
			
				
					
						
							
							
								SjB 
							
						 
					 
					
						
						
							
						
						9111cc00f5 
					 
					
						
						
							
							updated all the other keymaps to support the new changes.  
						
						... 
						
						
						
						qmk firmware requires the matrix_init_user and matrix_scan_user
function to be implementated. Added these function to all the existing
keymaps. 
						
						
					 
					
						2017-01-24 00:24:01 -05:00 
						 
				 
			
				
					
						
							
							
								SjB 
							
						 
					 
					
						
						
							
						
						a777495683 
					 
					
						
						
							
							fix: infinity60 keyboard was not using quantum features.  
						
						... 
						
						
						
						the quantum matrix codes where not being initialized or/and called
so no feature of the quantum firmware could be used. These codes have
been added and now we can enjoy the quantum firmware goodness. 
						
						
					 
					
						2017-01-23 23:15:31 -05:00 
						 
				 
			
				
					
						
							
							
								Dylan Scott 
							
						 
					 
					
						
						
							
						
						245f77b863 
					 
					
						
						
							
							Compare Makefile with itself instead of using --help  
						
						
						
						
					 
					
						2017-01-24 13:53:46 +11:00 
						 
				 
			
				
					
						
							
							
								Jack Humbert 
							
						 
					 
					
						
						
							
						
						841d7e6a1d 
					 
					
						
						
							
							turn off rgb_midi in ez  
						
						
						
						
					 
					
						2017-01-23 13:55:24 -05:00 
						 
				 
			
				
					
						
							
							
								Jack Humbert 
							
						 
					 
					
						
						
							
						
						6d377bcc9c 
					 
					
						
						
							
							Merge pull request  #1026  from TerryMathews/master  
						
						... 
						
						
						
						Let's Split: More code cleanup 
						
						
					 
					
						2017-01-23 00:33:29 -05:00 
						 
				 
			
				
					
						
							
							
								TerryMathews 
							
						 
					 
					
						
						
							
						
						372af5e3f6 
					 
					
						
						
							
							More code cleanup  
						
						... 
						
						
						
						Missed a few commented out vestigal defines in revx/config.h that had
been moved to keymap/serial and i2c. 
						
						
					 
					
						2017-01-22 22:06:53 -05:00 
						 
				 
			
				
					
						
							
							
								Jack Humbert 
							
						 
					 
					
						
						
							
						
						0026f4ec09 
					 
					
						
						
							
							Merge pull request  #1018  from hot-leaf-juice/master  
						
						... 
						
						
						
						simplified my keymap 
						
						
					 
					
						2017-01-22 19:01:34 -05:00 
						 
				 
			
				
					
						
							
							
								Christopher Browne 
							
						 
					 
					
						
						
							
						
						89461e743e 
					 
					
						
						
							
							More keyboard map tweaking ( #1019 )  
						
						... 
						
						
						
						* Add HOME/END keys as upper/lower on arrow-up/down
* Reduce .hex file size by turning off unneeded options
* Put digit keypad onto left hand upon RAISE; this will sometimes be preferable to double-hits of right hand 
						
						
					 
					
						2017-01-22 19:01:07 -05:00 
						 
				 
			
				
					
						
							
							
								Jack Humbert 
							
						 
					 
					
						
						
							
						
						79a823d802 
					 
					
						
						
							
							Merge pull request  #1020  from remigius42/master  
						
						... 
						
						
						
						Swiss German layout for Ergodox EZ & Infinity 
						
						
					 
					
						2017-01-22 18:59:57 -05:00 
						 
				 
			
				
					
						
							
							
								Jack Humbert 
							
						 
					 
					
						
						
							
						
						a8a1fbbac8 
					 
					
						
						
							
							Merge pull request  #1022  from lucwastiaux/master  
						
						... 
						
						
						
						Improvements to Dvorak Programmer Ergodox keymap 
						
						
					 
					
						2017-01-22 18:59:12 -05:00 
						 
				 
			
				
					
						
							
							
								Jack Humbert 
							
						 
					 
					
						
						
							
						
						a54944ac33 
					 
					
						
						
							
							Merge pull request  #1021  from luizribeiro/ps2avrGB  
						
						... 
						
						
						
						Support for ps2avrGB / winkeyless.kr boards 
						
						
					 
					
						2017-01-22 18:58:46 -05:00