summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2015-12-22Merge pull request #55 from sboesebeck/masterJack Humbert3-1296/+1296
2015-12-22fixed some typos, learned, DE_-keycodes are for Win, not OSXStephan Bösebeck3-1296/+1296
2015-12-22Merge pull request #53 from sboesebeck/masterJack Humbert3-15/+15
2015-12-22new firmware file containing current changesStephan Bösebeck1-7/+7
2015-12-22added png file for layout documentationStephan Bösebeck1-0/+0
2015-12-22minor changes, fixesStephan Bösebeck1-8/+8
2015-12-21Merge pull request #52 from technovangelist/masterJack Humbert1-0/+366
2015-12-21swapped the space and enter to get the space under where the thumb is.Technovangelist1-4/+4
2015-12-21first attempt at a working workman layout for the ergodoxezTechnovangelist1-0/+366
2015-12-20Merge pull request #47 from pnutster/masterJack Humbert1-0/+191
2015-12-20Merge pull request #46 from sboesebeck/masterJack Humbert3-0/+1757
2015-12-20Fixed keymap "graphic"Piet Nutbey1-1/+1
2015-12-20corrected folderPiet Nutbey1-0/+0
2015-12-20OSX Kinesis-like MappingPiet Nutbey1-0/+191
2015-12-20added hex fileStephan Bösebeck1-1/+1
2015-12-20typo fixStephan Bösebeck1-1/+1
2015-12-20minor changeStephan Bösebeck1-19/+47
2015-12-20added hex file and readmeStephan Bösebeck2-0/+1516
2015-12-20first version for german osx layoutStephan Bösebeck1-0/+213
2015-12-19Merge pull request #45 from matzebond/masterJack Humbert5-0/+429
2015-12-19Further clarifies READMEErez Zukerman1-3/+5
2015-12-19Add neo2 keymap and neo2 ergodox layoutMatthias Schmitt2-0/+183
2015-12-19Add Ctrl-Shift tap modifierMatthias Schmitt1-0/+1
2015-12-19Add german keymap and german ergodox layoutMatthias Schmitt2-0/+245
2015-12-18Updates readmeErez Zukerman1-2/+24
2015-12-18jack's ergodox layoutJack Humbert1-0/+185
2015-12-18Fixes media keys on OSX layoutErez Zukerman2-5/+5
2015-12-18Adds a new default keymap for OSX with working prev/next keysErez Zukerman6-1467/+1654
2015-12-18Moves compiled default keymap + legends to keymaps directoryErez Zukerman3-0/+1467
2015-12-16A compiled version which sends left click in mouse modeErez Zukerman1-0/+1466
2015-12-16Merge pull request #41 from joshmccall221/right_click_fixErez Zukerman1-1/+1
2015-12-16Left click was mapped to scroll wheel. This fixes that. :)Josh McCall1-1/+1
2015-12-15Merge pull request #39 from gdiegel/masterJack Humbert1-0/+109
2015-12-15Merge pull request #40 from alexeyzab/keymap-alexeyJack Humbert1-0/+51
2015-12-15Add new keymapAlexey Zabelin1-0/+51
2015-12-13Remove redundant definitionsGabriel Diegel1-10/+10
2015-12-13Rename keymapGabriel Diegel1-0/+0
2015-12-13Fix keymaps, add documentationGabriel Diegel1-5/+5
2015-12-13Add gdl keymapGabriel Diegel1-0/+109
2015-11-27Merge pull request #38 from alcesleo/patch-2Jack Humbert1-3/+3
2015-11-26Make links work in TMK_READMEJimmy Börjesson1-3/+3
2015-11-21atomic hexJack Humbert2-1/+1567
2015-11-10Adds Hyper on the left sideErez Zukerman1-2/+2
2015-11-10Merge branch 'master' of github.com:jackhumbert/qmk_firmwareErez Zukerman0-0/+0
2015-11-10Uses App key as Alt when heldErez Zukerman1-1/+1
2015-11-10Uses App key as Alt when heldErez Zukerman1-1/+1
2015-11-10[Jack & Erez] Adds standalone versions of Hyper and MehErez Zukerman1-0/+4
2015-11-10[Erez & Jack] Adds Meh key (Hyper without Win/Cmd)Erez Zukerman3-5/+12
2015-11-10Enabled NKRO by default, drops irrelevant makefile optionsErez Zukerman1-7/+4
2015-11-09Merge branch 'master' of https://github.com/jackhumbert/tmk_keyboardJack Humbert7-0/+451