Didier Loiseau 
							
						 
					 
					
						
						
						
						
							
						
						
							1aeb59335f 
							
						 
					 
					
						
						
							
							Fixed compilation issues after the merge  
						
						
						
						
					 
					
						2016-09-11 02:19:55 +02:00 
						 
				 
			
				
					
						
							
							
								Didier Chagniot 
							
						 
					 
					
						
						
						
						
							
						
						
							83b6dd0cd6 
							
						 
					 
					
						
						
							
							readme.md updated  
						
						
						
						
					 
					
						2016-09-10 00:20:21 +02:00 
						 
				 
			
				
					
						
							
							
								Didier Chagniot 
							
						 
					 
					
						
						
						
						
							
						
						
							67dfde765f 
							
						 
					 
					
						
						
							
							typing with it  
						
						
						
						
					 
					
						2016-09-09 21:42:35 +02:00 
						 
				 
			
				
					
						
							
							
								Jack Humbert 
							
						 
					 
					
						
						
						
						
							
						
						
							5010df3d8b 
							
						 
					 
					
						
						
							
							Merge pull request  #715  from profet23/master  
						
						... 
						
						
						
						Support for Ergodoxes with 80 keys. 
						
						
					 
					
						2016-09-09 10:50:39 -04:00 
						 
				 
			
				
					
						
							
							
								Lars 
							
						 
					 
					
						
						
						
						
							
						
						
							52121cee7a 
							
						 
					 
					
						
						
							
							Updated Image Header  
						
						
						
						
					 
					
						2016-09-08 23:32:11 -05:00 
						 
				 
			
				
					
						
							
							
								Lars 
							
						 
					 
					
						
						
						
						
							
						
						
							9c2015ea7f 
							
						 
					 
					
						
						
							
							first commit of Absenth's Ergodox Firmware  
						
						
						
						
					 
					
						2016-09-08 23:20:17 -05:00 
						 
				 
			
				
					
						
							
							
								profet23 
							
						 
					 
					
						
						
						
						
							
						
						
							b83f76e1b0 
							
						 
					 
					
						
						
							
							Changing keymap name to "profet_80"  
						
						
						
						
					 
					
						2016-09-08 23:34:55 -04:00 
						 
				 
			
				
					
						
							
							
								Roman Zolotarev 
							
						 
					 
					
						
						
						
						
							
						
						
							740b4bbe46 
							
						 
					 
					
						
						
							
							Fix typo  
						
						
						
						
					 
					
						2016-09-08 21:12:34 +08:00 
						 
				 
			
				
					
						
							
							
								Nathan Sharfi 
							
						 
					 
					
						
						
						
						
							
						
						
							273a6cc688 
							
						 
					 
					
						
						
							
							- Make thumb-accessible ⌥ and ⌃ into right-⌥ and right-⌃  
						
						... 
						
						
						
						- remove media-space and media-shift-space; put a play/pause key at media-m instead
- add print screen, scroll lock, and pause/break to the media layer
And in the readme:
- don't say we don't have any Windows-specific keys
- add mnemonics for thumb-alt and thumb-ctrl positioning 
						
						
					 
					
						2016-09-07 20:28:31 -07:00 
						 
				 
			
				
					
						
							
							
								Nathan Sharfi 
							
						 
					 
					
						
						
						
						
							
						
						
							e5396ca9e5 
							
						 
					 
					
						
						
							
							zweihander: rename to Makefile  
						
						
						
						
					 
					
						2016-09-07 18:23:01 -07:00 
						 
				 
			
				
					
						
							
							
								Daniel 
							
						 
					 
					
						
						
						
						
							
						
						
							b807867f95 
							
						 
					 
					
						
						
							
							moves brackets from J/K to U/I to remove block of common vim sequence.  
						
						
						
						
					 
					
						2016-09-06 21:56:27 -06:00 
						 
				 
			
				
					
						
							
							
								profet23 
							
						 
					 
					
						
						
						
						
							
						
						
							1406118c71 
							
						 
					 
					
						
						
							
							Removing separate ergodox80 project.  
						
						... 
						
						
						
						Created KEYMAP_80 in ez.h to support 80 key ergodoxes.
Creating default_80 keymap as ez keymap. 
						
						
					 
					
						2016-09-06 21:59:47 -04:00 
						 
				 
			
				
					
						
							
							
								Erez Zukerman 
							
						 
					 
					
						
						
						
						
							
						
						
							0f111182a6 
							
						 
					 
					
						
						
							
							Merge pull request  #732  from romanzolotarev/master  
						
						... 
						
						
						
						Change CTL_T(KC_ESC) to KC_LCTRL and update readme 
						
						
					 
					
						2016-09-06 21:35:15 -04:00 
						 
				 
			
				
					
						
							
							
								Roman Zolotarev 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							da16733e7a 
							
						 
					 
					
						
						
							
							Change CTL_T(KC_ESC) to KC_LCTRL and update readme  
						
						
						
						
					 
					
						2016-09-07 08:03:19 +08:00 
						 
				 
			
				
					
						
							
							
								joar 
							
						 
					 
					
						
						
						
						
							
						
						
							a3e7042084 
							
						 
					 
					
						
						
							
							norwegian programmer-friendly layout  
						
						
						
						
					 
					
						2016-09-06 16:00:08 +02:00 
						 
				 
			
				
					
						
							
							
								Erez Zukerman 
							
						 
					 
					
						
						
						
						
							
						
						
							8b0769fe5a 
							
						 
					 
					
						
						
							
							Merge pull request  #728  from fitzsim/yoruian  
						
						... 
						
						
						
						Add new ErgoDox EZ keymap, YORUIAN 
						
						
					 
					
						2016-09-06 07:07:25 -04:00 
						 
				 
			
				
					
						
							
							
								Thomas Fitzsimmons 
							
						 
					 
					
						
						
						
						
							
						
						
							ce53c0643d 
							
						 
					 
					
						
						
							
							Fix ergodox_yoruian XKB naming  
						
						
						
						
					 
					
						2016-09-06 00:09:14 -04:00 
						 
				 
			
				
					
						
							
							
								Thomas Fitzsimmons 
							
						 
					 
					
						
						
						
						
							
						
						
							e9ce4960c1 
							
						 
					 
					
						
						
							
							Add new ErgoDox EZ keymap, YORUIAN  
						
						
						
						
					 
					
						2016-09-05 20:53:35 -04:00 
						 
				 
			
				
					
						
							
							
								Erez Zukerman 
							
						 
					 
					
						
						
						
						
							
						
						
							5bb29136b1 
							
						 
					 
					
						
						
							
							Merge pull request  #686  from coderkun/coderkun_neo2  
						
						... 
						
						
						
						Merge Ergodox keymap “coderkun_neo2” 
						
						
					 
					
						2016-09-05 20:33:09 -04:00 
						 
				 
			
				
					
						
							
							
								Erez Zukerman 
							
						 
					 
					
						
						
						
						
							
						
						
							45d68486a2 
							
						 
					 
					
						
						
							
							Merge pull request  #678  from algernon/ergodox-ez/algernon  
						
						... 
						
						
						
						ergodox: Update algernon's keymap to v1.6 
						
						
					 
					
						2016-09-05 20:32:46 -04:00 
						 
				 
			
				
					
						
							
							
								Daniel 
							
						 
					 
					
						
						
						
						
							
						
						
							250f096144 
							
						 
					 
					
						
						
							
							adds tap dance and macro to move underscore and l- and r- brackets to base layer.  
						
						
						
						
					 
					
						2016-09-02 14:35:15 -06:00 
						 
				 
			
				
					
						
							
							
								Daniel 
							
						 
					 
					
						
						
						
						
							
						
						
							0c598f53c1 
							
						 
					 
					
						
						
							
							adds Hyper key. improves media layer. first attempt at tap dance.  
						
						
						
						
					 
					
						2016-09-01 23:37:52 -06:00 
						 
				 
			
				
					
						
							
							
								Joshua T 
							
						 
					 
					
						
						
						
						
							
						
						
							5520b0022f 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'upstream/master'  
						
						
						
						
					 
					
						2016-09-01 07:40:46 -05:00 
						 
				 
			
				
					
						
							
							
								Daniel 
							
						 
					 
					
						
						
						
						
							
						
						
							dbac9f4954 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'upstream/master'  
						
						
						
						
					 
					
						2016-08-31 22:15:47 -06:00 
						 
				 
			
				
					
						
							
							
								Fred Sundvik 
							
						 
					 
					
						
						
						
						
							
						
						
							d1e4f2eb08 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'upstream/master' into makefile_overhaul  
						
						
						
						
					 
					
						2016-08-26 21:57:17 +03:00 
						 
				 
			
				
					
						
							
							
								Erez Zukerman 
							
						 
					 
					
						
						
						
						
							
						
						
							2c8f6557e6 
							
						 
					 
					
						
						
							
							Merge pull request  #664  from linsomniac/infinity_readme  
						
						... 
						
						
						
						Adding nicer Infinity build instructions. 
						
						
					 
					
						2016-08-26 07:32:24 -04:00 
						 
				 
			
				
					
						
							
							
								coderkun 
							
						 
					 
					
						
						
						
						
							
						
						
							137eb118e3 
							
						 
					 
					
						
						
							
							Add box-drawing Unicode characters to keymap “coderkun_neo2”  
						
						
						
						
					 
					
						2016-08-26 13:27:56 +02:00 
						 
				 
			
				
					
						
							
							
								coderkun 
							
						 
					 
					
						
						
						
						
							
						
						
							c78b44fb18 
							
						 
					 
					
						
						
							
							Set Unicode input mode and override unicode_input_start() method to keymap “coderkun_neo2”  
						
						
						
						
					 
					
						2016-08-26 13:27:56 +02:00 
						 
				 
			
				
					
						
							
							
								coderkun 
							
						 
					 
					
						
						
						
						
							
						
						
							5b58d7d145 
							
						 
					 
					
						
						
							
							Disable debugging for Ergodox keymap “coderkun_neo2”  
						
						
						
						
					 
					
						2016-08-26 13:27:56 +02:00 
						 
				 
			
				
					
						
							
							
								Joshua T 
							
						 
					 
					
						
						
						
						
							
						
						
							42fa91a57d 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'upstream/master'  
						
						
						
						
					 
					
						2016-08-24 23:46:52 -05:00 
						 
				 
			
				
					
						
							
							
								Olivier 
							
						 
					 
					
						
						
						
						
							
						
						
							73d2a470ee 
							
						 
					 
					
						
						
							
							Merge  https://github.com/jackhumbert/qmk_firmware  
						
						
						
						
					 
					
						2016-08-25 00:11:37 +02:00 
						 
				 
			
				
					
						
							
							
								Gergely Nagy 
							
						 
					 
					
						
						
						
						
							
						
						
							f512179e66 
							
						 
					 
					
						
						
							
							ergodox: Update algernon's keymap to v1.6  
						
						... 
						
						
						
						Major changes include:
Base layer changes
------------------
* The parentheses & bracket keys have been merged: tapping them results
  in `[` or `{` (if it was shifted), double tapping leads to `(`.
* The `:;` and `-_` keys are now available on the base layer, on
  their **ADORE** location, too, just below `[{(`/`]})`.
* The `Apps` key has been replaced by `F12`.
* The `-`/`_` is no longer a tap-dance key.
ADORE layer changes
-------------------
* Adjustments were made to the **ADORE** layer, to separate some
  inconvenient combinations.
Miscellaneous changes
---------------------
* `LEAD u` now starts the symbolic unicode input system, instead of the
  OS-one.
* The mouse acceleration keys on the **Navigation and Media* layer have
  been turned into toggles: tap them once to turn them on, until tapped
  again. Tapping an accelerator button will turn all the others off.
* When the **ARROW** layer is on, the *red* and *blue* LEDs light up
  now.
Heatmap
-------
* The built-in keylogger has been greatly enhanced, it now outputs the
  pressed state, and the layer (Dvorak or ADORE). As such, the
  `ADORE_AUTOLOG` option has been removed, instead there is
  `AUTOLOG_ENABLE` now, which when enabled, makes the keylogger start
  when the keyboard boots. It defaults to off.
* The heatmap generator received a lot of updates.
Signed-off-by: Gergely Nagy <algernon@madhouse-project.org> 
						
						
					 
					
						2016-08-24 23:22:57 +02:00 
						 
				 
			
				
					
						
							
							
								Sean Reifschneider 
							
						 
					 
					
						
						
						
						
							
						
						
							0dfd1712bb 
							
						 
					 
					
						
						
							
							Making the existing firmware link better  
						
						
						
						
					 
					
						2016-08-24 09:30:29 -06:00 
						 
				 
			
				
					
						
							
							
								Sean Reifschneider 
							
						 
					 
					
						
						
						
						
							
						
						
							7debe7cd77 
							
						 
					 
					
						
						
							
							Changes based on @fredizzimo review, flashing Infinity details  
						
						
						
						
					 
					
						2016-08-24 09:26:41 -06:00 
						 
				 
			
				
					
						
							
							
								Fred Sundvik 
							
						 
					 
					
						
						
						
						
							
						
						
							2e3834edea 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'upstream/master' into makefile_overhaul  
						
						
						
						
					 
					
						2016-08-24 10:37:02 +03:00 
						 
				 
			
				
					
						
							
							
								Jack Humbert 
							
						 
					 
					
						
						
						
						
							
						
						
							a920548471 
							
						 
					 
					
						
						
							
							Merge pull request  #677  from SmackleFunky/master  
						
						... 
						
						
						
						Virtual Serial Port - and a Layout that uses that virtual serial port for Plover 
						
						
					 
					
						2016-08-23 11:05:26 -04:00 
						 
				 
			
				
					
						
							
							
								Jason Green 
							
						 
					 
					
						
						
						
						
							
						
						
							7009112752 
							
						 
					 
					
						
						
							
							move to ergodox-ez only  
						
						
						
						
					 
					
						2016-08-23 07:04:55 +00:00 
						 
				 
			
				
					
						
							
							
								Fred Sundvik 
							
						 
					 
					
						
						
						
						
							
						
						
							8f2af3c6bc 
							
						 
					 
					
						
						
							
							Merge branch 'master' into makefile_overhaul  
						
						
						
						
					 
					
						2016-08-23 09:38:05 +03:00 
						 
				 
			
				
					
						
							
							
								Jason Green 
							
						 
					 
					
						
						
						
						
							
						
						
							104ca8a5e1 
							
						 
					 
					
						
						
							
							Remove unneeded include  
						
						
						
						
					 
					
						2016-08-23 04:49:05 +00:00 
						 
				 
			
				
					
						
							
							
								Jason Green 
							
						 
					 
					
						
						
						
						
							
						
						
							ec62cbe384 
							
						 
					 
					
						
						
							
							add missing #include  
						
						
						
						
					 
					
						2016-08-23 04:32:40 +00:00 
						 
				 
			
				
					
						
							
							
								Jason Green 
							
						 
					 
					
						
						
						
						
							
						
						
							86656690f1 
							
						 
					 
					
						
						
							
							TxBolt (Steno) Serial protocol for Ergodox Ez  
						
						
						
						
					 
					
						2016-08-23 04:17:34 +00:00 
						 
				 
			
				
					
						
							
							
								Sean Reifschneider 
							
						 
					 
					
						
						
						
						
							
						
						
							0418ecc073 
							
						 
					 
					
						
						
							
							Changes from review by @fredizzimo and @Xyverz  
						
						
						
						
					 
					
						2016-08-22 10:26:18 -06:00 
						 
				 
			
				
					
						
							
							
								Joe Wasson 
							
						 
					 
					
						
						
						
						
							
						
						
							66adbfcab5 
							
						 
					 
					
						
						
							
							Add default swap configs for a couple of boards.  
						
						
						
						
					 
					
						2016-08-20 17:46:53 -07:00 
						 
				 
			
				
					
						
							
							
								Olivier 
							
						 
					 
					
						
						
						
						
							
						
						
							b5172e3afa 
							
						 
					 
					
						
						
							
							Rename file following upstream folder rename.  
						
						
						
						
					 
					
						2016-08-20 18:19:03 +02:00 
						 
				 
			
				
					
						
							
							
								Olivier 
							
						 
					 
					
						
						
						
						
							
						
						
							009ab77d3e 
							
						 
					 
					
						
						
							
							Merge  https://github.com/jackhumbert/qmk_firmware  
						
						
						
						
					 
					
						2016-08-20 18:07:02 +02:00 
						 
				 
			
				
					
						
							
							
								Jack Humbert 
							
						 
					 
					
						
						
						
						
							
						
						
							a3f726174c 
							
						 
					 
					
						
						
							
							Merge pull request  #665  from linsomniac/keymap_jafo  
						
						... 
						
						
						
						Adding jafo layout. 
						
						
					 
					
						2016-08-20 11:04:54 -04:00 
						 
				 
			
				
					
						
							
							
								Jack Humbert 
							
						 
					 
					
						
						
						
						
							
						
						
							a592c9dcf4 
							
						 
					 
					
						
						
							
							Merge pull request  #658  from Xyverz/master  
						
						... 
						
						
						
						Got rid of all the kludge in my ErgoDox keymap. 
						
						
					 
					
						2016-08-20 11:04:02 -04:00 
						 
				 
			
				
					
						
							
							
								Jack Humbert 
							
						 
					 
					
						
						
						
						
							
						
						
							7cef0f56e9 
							
						 
					 
					
						
						
							
							Merge pull request  #630  from nrrkeene/master  
						
						... 
						
						
						
						The Ordinary Layout is the unsurprising layout 
						
						
					 
					
						2016-08-20 11:01:22 -04:00 
						 
				 
			
				
					
						
							
							
								Xyverz 
							
						 
					 
					
						
						
						
						
							
						
						
							e4984f65de 
							
						 
					 
					
						
						
							
							Changed the Ergodox keymap to use the KEYMAP() macro, updated readme.md.  
						
						
						
						
					 
					
						2016-08-19 22:45:20 -07:00 
						 
				 
			
				
					
						
							
							
								Xyverz 
							
						 
					 
					
						
						
						
						
							
						
						
							aff792545d 
							
						 
					 
					
						
						
							
							Changed my keymap to match normal keymaps.  
						
						
						
						
					 
					
						2016-08-19 22:30:34 -07:00