summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of github.com:dragon788/qmk_firmware_ezdragon7882015-12-280-0/+0
|\
| * Merge branch 'master' of github.com:dragon788/qmk_firmware_ezdragon7882015-12-271-21/+21
| |\ | | | | | | | | | | | | Conflicts: keyboard/ergodox_ez/keymaps/keymap_default.c
* | | Merge branch 'master' of github.com:jackhumbert/qmk_firmwaredragon7882015-12-2821-4/+6076
|\| | | |/ |/| | | | | Conflicts: keyboard/ergodox_ez/keymaps/keymap_default.c
| * Merge pull request #56 from sboesebeck/masterJack Humbert2015-12-231-5/+5
| |\ | | | | | | fix number pad for german keys
| | * fix number pad for german keysStephan Bösebeck2015-12-231-5/+5
| | |
| * | Updates readmeErez Zukerman2015-12-231-2/+2
| | |
| * | Merge pull request #55 from sboesebeck/masterJack Humbert2015-12-223-1296/+1296
| |\| | | | | | | fixed some typos, learned, DE_-keycodes are for Win, not OSX
| | * fixed some typos, learned, DE_-keycodes are for Win, not OSXStephan Bösebeck2015-12-223-1296/+1296
| | |
| * | Merge pull request #53 from sboesebeck/masterJack Humbert2015-12-213-15/+15
| |\| | | | | | | minor updates
| | * new firmware file containing current changesStephan Bösebeck2015-12-221-7/+7
| | |
| | * added png file for layout documentationStephan Bösebeck2015-12-221-0/+0
| | |
| | * minor changes, fixesStephan Bösebeck2015-12-221-8/+8
| | |
| * | Merge pull request #52 from technovangelist/masterJack Humbert2015-12-211-0/+366
| |\ \ | | | | | | | | first attempt at a working workman layout for the ergodoxez
| | * | swapped the space and enter to get the space under where the thumb is.Technovangelist2015-12-211-4/+4
| | | |
| | * | first attempt at a working workman layout for the ergodoxezTechnovangelist2015-12-211-0/+366
| |/ /
| * | Merge pull request #47 from pnutster/masterJack Humbert2015-12-191-0/+191
| |\ \ | | | | | | | | OSX Kinesis-like Mapping
| | * | Fixed keymap "graphic"Piet Nutbey2015-12-191-1/+1
| | | |
| | * | corrected folderPiet Nutbey2015-12-191-0/+0
| | | |
| | * | OSX Kinesis-like MappingPiet Nutbey2015-12-191-0/+191
| | | | | | | | | | | | | | | | | | | | OS X Kinesis Like key mapping. Only the default layer was changed into a more Kinesis-like mapping. Hopefully useful as a starting point.
| * | | Merge pull request #46 from sboesebeck/masterJack Humbert2015-12-193-0/+1757
| |\ \ \ | | |/ / | |/| / | | |/ German layout for osx
| | * added hex fileStephan Bösebeck2015-12-201-1/+1
| | |
| | * typo fixStephan Bösebeck2015-12-201-1/+1
| | |
| | * minor changeStephan Bösebeck2015-12-201-19/+47
| | |
| | * added hex file and readmeStephan Bösebeck2015-12-202-0/+1516
| | |
| | * first version for german osx layoutStephan Bösebeck2015-12-201-0/+213
| |/
| * Merge pull request #45 from matzebond/masterJack Humbert2015-12-195-0/+429
| |\ | | | | | | German keymap + ErgoDox keymaps
| | * Add neo2 keymap and neo2 ergodox layoutMatthias Schmitt2015-12-192-0/+183
| | |
| | * Add Ctrl-Shift tap modifierMatthias Schmitt2015-12-191-0/+1
| | |
| | * Add german keymap and german ergodox layoutMatthias Schmitt2015-12-192-0/+245
| | |
| * | Further clarifies READMEErez Zukerman2015-12-191-3/+5
| |/
| * Updates readmeErez Zukerman2015-12-181-2/+24
| |
| * jack's ergodox layoutJack Humbert2015-12-171-0/+185
| |
| * Fixes media keys on OSX layoutErez Zukerman2015-12-182-5/+5
| |
| * Adds a new default keymap for OSX with working prev/next keysErez Zukerman2015-12-186-1467/+1654
| |
| * Moves compiled default keymap + legends to keymaps directoryErez Zukerman2015-12-183-0/+1467
| |
| * A compiled version which sends left click in mouse modeErez Zukerman2015-12-161-0/+1466
| |
| * Merge pull request #41 from joshmccall221/right_click_fixErez Zukerman2015-12-161-1/+1
| |\ | | | | | | Left click was mapped to scroll wheel. This fixes that. :)
| | * Left click was mapped to scroll wheel. This fixes that. :)Josh McCall2015-12-161-1/+1
| |/
* | Updated keymap ascii art and made thumb cluster more standard ↵dragon7882015-12-231-20/+20
| | | | | | | | ErgoDox/Kinesis-like
* | add left click and vim keysJosh McCall2015-12-161-2/+2
|/
* Merge pull request #39 from gdiegel/masterJack Humbert2015-12-141-0/+109
|\ | | | | New keymap
| * Remove redundant definitionsGabriel Diegel2015-12-131-10/+10
| |
| * Rename keymapGabriel Diegel2015-12-131-0/+0
| |
| * Fix keymaps, add documentationGabriel Diegel2015-12-131-5/+5
| |
| * Add gdl keymapGabriel Diegel2015-12-131-0/+109
| |
* | Merge pull request #40 from alexeyzab/keymap-alexeyJack Humbert2015-12-141-0/+51
|\ \ | |/ |/| Atreus-like keymap
| * Add new keymapAlexey Zabelin2015-12-141-0/+51
|/ | | | | | The goal of this keymap is to simulate the Atreus layout. Since I've been using it for quite a while I figured this might help me transition to Planck.
* Merge pull request #38 from alcesleo/patch-2Jack Humbert2015-11-271-3/+3
|\ | | | | Make links work in TMK_README
| * Make links work in TMK_READMEJimmy Börjesson2015-11-261-3/+3
|/
* atomic hexJack Humbert2015-11-212-1/+1567
|