Fred Sundvik 
								
							 
						 
						
							
							
								
							
							
	9af995c59b  
						 
						
							
							
								
								
								Initial structure for Ergodox as subprojects  
							
							... 
							
							
							
							
							Only the EZ default keymaps compiles at the moment though. 
							
						 
						
							2016-07-29 20:48:04 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Erez Zukerman 
								
							 
						 
						
							
							
								
							
							
	30003d48f9  
						 
						
							
							
								
								
								Merge pull request  #584  from algernon/ergodox-ez/algernon  
							
							... 
							
							
							
							
							ergodox_ez: Upgrade my keymap to v1.4 
							
						 
						
							2016-07-29 08:11:37 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Erez Zukerman 
								
							 
						 
						
							
							
								
							
							
	64e76f6ed3  
						 
						
							
							
								
								
								Merge pull request  #583  from coderkun/coderkun_neo2  
							
							... 
							
							
							
							
							Ergodox EZ: update keymap “coderkun_neo2” 
							
						 
						
							2016-07-29 08:10:46 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Erez Zukerman 
								
							 
						 
						
							
							
								
							
							
	3c235b4bf9  
						 
						
							
							
								
								
								Merge pull request  #580  from MatsLanGoH/patch-1  
							
							... 
							
							
							
							
							Fixed a typo 
							
						 
						
							2016-07-29 08:09:05 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Gergely Nagy 
								
							 
						 
						
							
							
								
							
							
	f82437f08e  
						 
						
							
							
								
								
								ergodox_ez: Upgrade my keymap to v1.4  
							
							... 
							
							
							
							
							* When toggling the key logging on or off, the LEDs will do a little dance.
* The keylogger is now optional, but enabled by default. Use `KEYLOGGER_ENABLE=no` on the `make` command line to disable it.
* The `TAB`/`ARRW` key was turned into a tap-dance key, allowing one to toggle the **ARROW** layer on by double-tapping, and as such, avoid the need to hold the key.
* The `-`/`_` key was turned into a tap-dance key too.
* There is now a way to travel time with the keyboard, toggle the feature on by hitting `LEAD t`.
Signed-off-by: Gergely Nagy <algernon@madhouse-project.org> 
							
						 
						
							2016-07-29 12:24:33 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									coderkun 
								
							 
						 
						
							
							
								
							
							
	3ace37271b  
						 
						
							
							
								
								
								disable sleep LED  
							
							
							
							
						 
						
							2016-07-29 11:28:37 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									coderkun 
								
							 
						 
						
							
							
								
							
							
	70755d6614  
						 
						
							
							
								
								
								complete labels for modifiers in keymap schema  
							
							
							
							
						 
						
							2016-07-29 11:07:50 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									coderkun 
								
							 
						 
						
							
							
								
							
							
	08239aadea  
						 
						
							
							
								
								
								use Ergodox EZ’s third LED for “scroll lock”  
							
							
							
							
						 
						
							2016-07-29 11:07:50 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									coderkun 
								
							 
						 
						
							
							
								
							
							
	61fbb47eb6  
						 
						
							
							
								
								
								fix grave (GRV) and acute (ACUT) accents  
							
							
							
							
						 
						
							2016-07-29 11:06:18 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Stephen Christie 
								
							 
						 
						
							
							
								
							
							
	c018743729  
						 
						
							
							
								
								
								Connected all layers through Adjust layer  
							
							
							
							
						 
						
							2016-07-29 00:08:48 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Matthias 
								
							 
						 
						
							
							
								
							
							
	e8f7038959  
						 
						
							
							
								
								
								Fixed a typo  
							
							... 
							
							
							
							
							Fixed a typo in line 738 'void martix_init' to 'void matrix_init' 
							
						 
						
							2016-07-29 10:02:59 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jack Humbert 
								
							 
						 
						
							
							
								
							
							
	7559edc6e6  
						 
						
							
							
								
								
								Merge pull request  #578  from 0xdec/master  
							
							... 
							
							
							
							
							0xdec Preonic keymap 
							
						 
						
							2016-07-28 16:34:34 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jack Humbert 
								
							 
						 
						
							
							
								
							
							
	9b5edbdce9  
						 
						
							
							
								
								
								Merge pull request  #577  from hot-leaf-juice/master  
							
							... 
							
							
							
							
							Pull request to include my keymap if you want it! 
							
						 
						
							2016-07-28 16:34:16 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jack Humbert 
								
							 
						 
						
							
							
								
							
							
	16f8426fe2  
						 
						
							
							
								
								
								Merge pull request  #573  from algernon/f/make-all-stop-on-error  
							
							... 
							
							
							
							
							tmk_core/rules.mk: Make PRINT_ERROR* stop on error 
							
						 
						
							2016-07-28 16:32:37 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jordi Orlando 
								
							 
						 
						
							
							
								
							
							
	3b39910cb9  
						 
						
							
							
								
								
								Create 0xdec Preonic keymap  
							
							... 
							
							
							
							
							An ergonomically optimized Colemak keymap for the grid-layout Preonic 
							
						 
						
							2016-07-28 14:36:20 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Stephen Christie 
								
							 
						 
						
							
							
								
							
							
	6567fa1ebe  
						 
						
							
							
								
								
								Fixed Function keys (Impossible layout)  
							
							
							
							
						 
						
							2016-07-28 14:57:45 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Stephen Christie 
								
							 
						 
						
							
							
								
							
							
	a4e5a4d566  
						 
						
							
							
								
								
								Modified Qwerty, created Qwerty with numbers  
							
							
							
							
						 
						
							2016-07-28 13:49:25 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Christopher Browne 
								
							 
						 
						
							
							
								
							
							
	2d59c97ec1  
						 
						
							
							
								
								
								Merge branch 'master' of  https://github.com/jackhumbert/qmk_firmware  
							
							
							
							
						 
						
							2016-07-28 12:42:21 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jack Humbert 
								
							 
						 
						
							
							
								
							
							
	80667e898a  
						 
						
							
							
								
								
								Merge pull request  #572  from algernon/f/tap-dance-debug  
							
							... 
							
							
							
							
							tap-dance: Add some debugging support 
							
						 
						
							2016-07-28 12:28:30 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jack Humbert 
								
							 
						 
						
							
							
								
							
							
	e5ac0e8369  
						 
						
							
							
								
								
								Merge pull request  #570  from sethbc/fix_bone2planck_build  
							
							... 
							
							
							
							
							Fix bone2planck build 
							
						 
						
							2016-07-28 12:27:46 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jack Humbert 
								
							 
						 
						
							
							
								
							
							
	a6d279a343  
						 
						
							
							
								
								
								Merge pull request  #569  from sethbc/fix_stanleylai_warnings  
							
							... 
							
							
							
							
							kill warnings filling up travis buildlog 
							
						 
						
							2016-07-28 12:27:11 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jack Humbert 
								
							 
						 
						
							
							
								
							
							
	36df9fd3fd  
						 
						
							
							
								
								
								Merge pull request  #568  from sethbc/fix-colemak-osx-pc-no  
							
							... 
							
							
							
							
							update NO_AMP to NO_AMPR 
							
						 
						
							2016-07-28 12:26:43 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jack Humbert 
								
							 
						 
						
							
							
								
							
							
	f96a2a74ea  
						 
						
							
							
								
								
								Merge pull request  #566  from SmackleFunky/master  
							
							... 
							
							
							
							
							Allow toggling out of plover layer 
							
						 
						
							2016-07-28 12:26:11 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jack Humbert 
								
							 
						 
						
							
							
								
							
							
	9171ce1d17  
						 
						
							
							
								
								
								Merge pull request  #559  from Talljoe/fix-compiler-warning  
							
							... 
							
							
							
							
							Fix compiler warning when PREVENT_STUCK_MODIFIERS is enabled. 
							
						 
						
							2016-07-28 12:24:42 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jack Humbert 
								
							 
						 
						
							
							
								
							
							
	8d98f37fbb  
						 
						
							
							
								
								
								Merge pull request  #564  from mazinbokhari/master  
							
							... 
							
							
							
							
							Move to keyboards 
							
						 
						
							2016-07-28 12:24:03 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Callum Oakley 
								
							 
						 
						
							
							
								
							
							
	1eeceee355  
						 
						
							
							
								
								
								Added readme.md for custom layout.  
							
							
							
							
						 
						
							2016-07-28 12:15:55 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Toni 
								
							 
						 
						
							
							
								
							
							
	684d869fab  
						 
						
							
							
								
								
								added homerow-ish brackets  
							
							
							
							
						 
						
							2016-07-28 11:58:53 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Callum Oakley 
								
							 
						 
						
							
							
								
							
							
	9822b9f743  
						 
						
							
							
								
								
								Added custom keymap.  
							
							... 
							
							
							
							
							Added custom keymap. 
							
						 
						
							2016-07-27 21:18:19 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Toni 
								
							 
						 
						
							
							
								
							
							
	6ff8a81520  
						 
						
							
							
								
								
								first try ar adding the parenthesis mess for german iso  
							
							
							
							
						 
						
							2016-07-27 21:11:55 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Toni 
								
							 
						 
						
							
							
								
							
							
	9f21c0aa06  
						 
						
							
							
								
								
								Merge remote-tracking branch 'origin/master' into iso_split_rshift  
							
							... 
							
							
							
							
							merge with master 
							
						 
						
							2016-07-27 20:35:13 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Christopher Browne 
								
							 
						 
						
							
							
								
							
							
	911d0a040e  
						 
						
							
							
								
								
								Merge branch 'master' of  https://github.com/jackhumbert/qmk_firmware  
							
							
							
							
						 
						
							2016-07-27 12:57:54 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Gergely Nagy 
								
							 
						 
						
							
							
								
							
							
	b21e8b97ac  
						 
						
							
							
								
								
								tap-dance: Add some debugging support  
							
							... 
							
							
							
							
							Signed-off-by: Gergely Nagy <algernon@madhouse-project.org> 
							
						 
						
							2016-07-27 14:49:19 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Gergely Nagy 
								
							 
						 
						
							
							
								
							
							
	dd77054790  
						 
						
							
							
								
								
								tmk_core/rules.mk: Make PRINT_ERROR* stop on error  
							
							... 
							
							
							
							
							Instead of `&& false`, explicitly `exit 1` to make the rules using these macros
fail. This fixes  #571 , and likely breaks Travis badly.
Signed-off-by: Gergely Nagy <algernon@madhouse-project.org> 
							
						 
						
							2016-07-27 08:53:05 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Seth Chandler 
								
							 
						 
						
							
							
								
							
							
	180a3da44d  
						 
						
							
							
								
								
								remove unnecessary includes  
							
							
							
							
						 
						
							2016-07-27 02:32:15 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Seth Chandler 
								
							 
						 
						
							
							
								
							
							
	95ef3f864e  
						 
						
							
							
								
								
								fix numerous errors in bone2planck keymap  
							
							
							
							
						 
						
							2016-07-27 02:30:17 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Seth Chandler 
								
							 
						 
						
							
							
								
							
							
	368d0bdf68  
						 
						
							
							
								
								
								kill warnings filling up travis buildlog  
							
							
							
							
						 
						
							2016-07-27 02:21:09 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Seth Chandler 
								
							 
						 
						
							
							
								
							
							
	13bb3a7379  
						 
						
							
							
								
								
								update NO_AMP to NO_AMPR  
							
							
							
							
						 
						
							2016-07-27 02:06:19 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									SmackleFunky 
								
							 
						 
						
							
							
								
							
							
	fdd07991de  
						 
						
							
							
								
								
								Allow toggling out of plover layer  
							
							
							
							
						 
						
							2016-07-27 04:44:24 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mazin Bokhari 
								
							 
						 
						
							
							
								
							
							
	3fd1c9d72b  
						 
						
							
							
								
								
								Move to keyboards  
							
							
							
							
						 
						
							2016-07-26 22:43:04 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Stephen Christie 
								
							 
						 
						
							
							
								
							
							
	57952949fe  
						 
						
							
							
								
								
								General table cleanup.  
							
							
							
							
						 
						
							2016-07-26 23:33:21 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Erez Zukerman 
								
							 
						 
						
							
							
								
							
							
	93f366fa7d  
						 
						
							
							
								
								
								Merge pull request  #562  from michaelklos/doc  
							
							... 
							
							
							
							
							Added Tap Dance Example 
							
						 
						
							2016-07-26 21:54:10 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Erez Zukerman 
								
							 
						 
						
							
							
								
							
							
	685c8ba64c  
						 
						
							
							
								
								
								Merge pull request  #533  from mazinbokhari/master  
							
							... 
							
							
							
							
							Add my layout optimized for working in emacs, vim, command line, etc. 
							
						 
						
							2016-07-26 21:52:39 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael Klos 
								
							 
						 
						
							
							
								
							
							
	7e69de061a  
						 
						
							
							
								
								
								Added Tap Dance Example  
							
							... 
							
							
							
							
							Added (simple) Tap Dance example implementation steps. 
							
						 
						
							2016-07-26 18:41:35 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Stephen Christie 
								
							 
						 
						
							
							
								
							
							
	ff8136b883  
						 
						
							
							
								
								
								Modified Plover layer for Impossible's home position.  
							
							
							
							
						 
						
							2016-07-26 17:39:21 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Stephen Christie 
								
							 
						 
						
							
							
								
							
							
	465cf08c63  
						 
						
							
							
								
								
								Removed unused layers (keeping QWERTY for later/reference)  
							
							
							
							
						 
						
							2016-07-26 17:37:56 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Stephen Christie 
								
							 
						 
						
							
							
								
							
							
	fb2a7d787a  
						 
						
							
							
								
								
								Removed unused layers (left QWERTY for later use/reference)  
							
							
							
							
						 
						
							2016-07-26 17:29:19 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Christopher Browne 
								
							 
						 
						
							
							
								
							
							
	2a349e96bb  
						 
						
							
							
								
								
								Merge branch 'master' of  https://github.com/jackhumbert/qmk_firmware  
							
							
							
							
						 
						
							2016-07-26 16:35:44 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jordi Orlando 
								
							 
						 
						
							
							
								
							
							
	ea2d2f5d58  
						 
						
							
							
								
								
								Simplify HSV->RGB calculation  
							
							... 
							
							
							
							
							De-dupe repeated code 
							
						 
						
							2016-07-26 15:31:22 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jack Humbert 
								
							 
						 
						
							
							
								
							
							
	b66131eeb5  
						 
						
							
							
								
								
								disable midi by default  
							
							
							
							
						 
						
							2016-07-26 15:59:26 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jordi Orlando 
								
							 
						 
						
							
							
								
							
							
	899c88cd8b  
						 
						
							
							
								
								
								Increament -> increment  
							
							
							
							
						 
						
							2016-07-26 14:46:30 -05:00