Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #56 from sboesebeck/master | Jack Humbert | 2015-12-23 | 1 | -5/+5 |
|\ | | | | | fix number pad for german keys | ||||
| * | fix number pad for german keys | Stephan Bösebeck | 2015-12-23 | 1 | -5/+5 |
| | | |||||
* | | Updates readme | Erez Zukerman | 2015-12-23 | 1 | -2/+2 |
| | | |||||
* | | Merge pull request #55 from sboesebeck/master | Jack Humbert | 2015-12-22 | 3 | -1296/+1296 |
|\| | | | | | fixed some typos, learned, DE_-keycodes are for Win, not OSX | ||||
| * | fixed some typos, learned, DE_-keycodes are for Win, not OSX | Stephan Bösebeck | 2015-12-22 | 3 | -1296/+1296 |
| | | |||||
* | | Merge pull request #53 from sboesebeck/master | Jack Humbert | 2015-12-21 | 3 | -15/+15 |
|\| | | | | | minor updates | ||||
| * | new firmware file containing current changes | Stephan Bösebeck | 2015-12-22 | 1 | -7/+7 |
| | | |||||
| * | added png file for layout documentation | Stephan Bösebeck | 2015-12-22 | 1 | -0/+0 |
| | | |||||
| * | minor changes, fixes | Stephan Bösebeck | 2015-12-22 | 1 | -8/+8 |
| | | |||||
* | | Merge pull request #52 from technovangelist/master | Jack Humbert | 2015-12-21 | 1 | -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. | Technovangelist | 2015-12-21 | 1 | -4/+4 |
| | | | |||||
| * | | first attempt at a working workman layout for the ergodoxez | Technovangelist | 2015-12-21 | 1 | -0/+366 |
|/ / | |||||
* | | Merge pull request #47 from pnutster/master | Jack Humbert | 2015-12-19 | 1 | -0/+191 |
|\ \ | | | | | | | OSX Kinesis-like Mapping | ||||
| * | | Fixed keymap "graphic" | Piet Nutbey | 2015-12-19 | 1 | -1/+1 |
| | | | |||||
| * | | corrected folder | Piet Nutbey | 2015-12-19 | 1 | -0/+0 |
| | | | |||||
| * | | OSX Kinesis-like Mapping | Piet Nutbey | 2015-12-19 | 1 | -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/master | Jack Humbert | 2015-12-19 | 3 | -0/+1757 |
|\ \ \ | |/ / |/| / | |/ | German layout for osx | ||||
| * | added hex file | Stephan Bösebeck | 2015-12-20 | 1 | -1/+1 |
| | | |||||
| * | typo fix | Stephan Bösebeck | 2015-12-20 | 1 | -1/+1 |
| | | |||||
| * | minor change | Stephan Bösebeck | 2015-12-20 | 1 | -19/+47 |
| | | |||||
| * | added hex file and readme | Stephan Bösebeck | 2015-12-20 | 2 | -0/+1516 |
| | | |||||
| * | first version for german osx layout | Stephan Bösebeck | 2015-12-20 | 1 | -0/+213 |
|/ | |||||
* | Merge pull request #45 from matzebond/master | Jack Humbert | 2015-12-19 | 5 | -0/+429 |
|\ | | | | | German keymap + ErgoDox keymaps | ||||
| * | Add neo2 keymap and neo2 ergodox layout | Matthias Schmitt | 2015-12-19 | 2 | -0/+183 |
| | | |||||
| * | Add Ctrl-Shift tap modifier | Matthias Schmitt | 2015-12-19 | 1 | -0/+1 |
| | | |||||
| * | Add german keymap and german ergodox layout | Matthias Schmitt | 2015-12-19 | 2 | -0/+245 |
| | | |||||
* | | Further clarifies README | Erez Zukerman | 2015-12-19 | 1 | -3/+5 |
|/ | |||||
* | Updates readme | Erez Zukerman | 2015-12-18 | 1 | -2/+24 |
| | |||||
* | jack's ergodox layout | Jack Humbert | 2015-12-17 | 1 | -0/+185 |
| | |||||
* | Fixes media keys on OSX layout | Erez Zukerman | 2015-12-18 | 2 | -5/+5 |
| | |||||
* | Adds a new default keymap for OSX with working prev/next keys | Erez Zukerman | 2015-12-18 | 6 | -1467/+1654 |
| | |||||
* | Moves compiled default keymap + legends to keymaps directory | Erez Zukerman | 2015-12-18 | 3 | -0/+1467 |
| | |||||
* | A compiled version which sends left click in mouse mode | Erez Zukerman | 2015-12-16 | 1 | -0/+1466 |
| | |||||
* | Merge pull request #41 from joshmccall221/right_click_fix | Erez Zukerman | 2015-12-16 | 1 | -1/+1 |
|\ | | | | | Left click was mapped to scroll wheel. This fixes that. :) | ||||
| * | Left click was mapped to scroll wheel. This fixes that. :) | Josh McCall | 2015-12-16 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #39 from gdiegel/master | Jack Humbert | 2015-12-14 | 1 | -0/+109 |
|\ | | | | | New keymap | ||||
| * | Remove redundant definitions | Gabriel Diegel | 2015-12-13 | 1 | -10/+10 |
| | | |||||
| * | Rename keymap | Gabriel Diegel | 2015-12-13 | 1 | -0/+0 |
| | | |||||
| * | Fix keymaps, add documentation | Gabriel Diegel | 2015-12-13 | 1 | -5/+5 |
| | | |||||
| * | Add gdl keymap | Gabriel Diegel | 2015-12-13 | 1 | -0/+109 |
| | | |||||
* | | Merge pull request #40 from alexeyzab/keymap-alexey | Jack Humbert | 2015-12-14 | 1 | -0/+51 |
|\ \ | |/ |/| | Atreus-like keymap | ||||
| * | Add new keymap | Alexey Zabelin | 2015-12-14 | 1 | -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-2 | Jack Humbert | 2015-11-27 | 1 | -3/+3 |
|\ | | | | | Make links work in TMK_README | ||||
| * | Make links work in TMK_README | Jimmy Börjesson | 2015-11-26 | 1 | -3/+3 |
|/ | |||||
* | atomic hex | Jack Humbert | 2015-11-21 | 2 | -1/+1567 |
| | |||||
* | Adds Hyper on the left side | Erez Zukerman | 2015-11-10 | 1 | -2/+2 |
| | |||||
* | Merge branch 'master' of github.com:jackhumbert/qmk_firmware | Erez Zukerman | 2015-11-10 | 0 | -0/+0 |
|\ | | | | | | | | | Conflicts: keyboard/ergodox_ez/keymaps/keymap_default.c | ||||
| * | Uses App key as Alt when held | Erez Zukerman | 2015-11-10 | 1 | -1/+1 |
| | | |||||
* | | Uses App key as Alt when held | Erez Zukerman | 2015-11-10 | 1 | -1/+1 |
|/ | |||||
* | [Jack & Erez] Adds standalone versions of Hyper and Meh | Erez Zukerman | 2015-11-10 | 1 | -0/+4 |
| |