summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #45 from matzebond/masterJack Humbert2015-12-195-0/+429
|\
| * 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. :)Josh McCall2015-12-161-1/+1
|/
* Merge pull request #39 from gdiegel/masterJack Humbert2015-12-141-0/+109
|\
| * 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
|\ \ | |/ |/|
| * Add new keymapAlexey Zabelin2015-12-141-0/+51
|/
* Merge pull request #38 from alcesleo/patch-2Jack Humbert2015-11-271-3/+3
|\
| * Make links work in TMK_READMEJimmy Börjesson2015-11-261-3/+3
|/
* atomic hexJack Humbert2015-11-212-1/+1567
* Adds Hyper on the left sideErez Zukerman2015-11-101-2/+2
* Merge branch 'master' of github.com:jackhumbert/qmk_firmwareErez Zukerman2015-11-100-0/+0
|\
| * Uses App key as Alt when heldErez Zukerman2015-11-101-1/+1
* | Uses App key as Alt when heldErez Zukerman2015-11-101-1/+1
|/
* [Jack & Erez] Adds standalone versions of Hyper and MehErez Zukerman2015-11-101-0/+4
* [Erez & Jack] Adds Meh key (Hyper without Win/Cmd)Erez Zukerman2015-11-103-5/+12
* Enabled NKRO by default, drops irrelevant makefile optionsErez Zukerman2015-11-101-7/+4
* Merge branch 'master' of https://github.com/jackhumbert/tmk_keyboardJack Humbert2015-11-097-0/+451
|\
| * Merge pull request #36 from justinyhuang/masterJack Humbert2015-11-077-0/+451
| |\
| | * minor change for the keyboard infoHuangYang2015-11-061-3/+3
| | * added support for jd45HuangYang2015-11-067-0/+451
| |/
* / Michelle's layoutJack Humbert2015-11-091-0/+183
|/
* nkro infoJack Humbert2015-11-053-5/+5
* readmeJack Humbert2015-10-301-1/+1
* atomic filesJack Humbert2015-10-304-0/+185
* atomic up-to-dateJack Humbert2015-10-3053-4193/+368
* Fixes linkErez Zukerman2015-10-301-1/+1
* [Erez & Jack] Updates documentationErez Zukerman2015-10-302-286/+340
* readmes\!Jack Humbert2015-10-292-32/+225
* homebrew instructionsJack Humbert2015-10-292-0/+9
* Adds Hyper key, tweaks ErgoDox EZ default keymapErez Zukerman2015-10-294-244/+34
* READMEJack Humbert2015-10-281-0/+5
* Merge branch 'master' of https://github.com/jackhumbert/tmk_keyboardJack Humbert2015-10-284-1419/+1423
|\
| * Fixes rolling combos for mod-tap keysErez Zukerman2015-10-284-1419/+1423
* | mergingJack Humbert2015-10-288-1564/+1441
|\|
| * More work on ErgoDox EZ default keymapErez Zukerman2015-10-289-1570/+1442
* | changesJack Humbert2015-10-281-1/+1