Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'smarkefile' of https://github.com/jackhumbert/tmk_keyboard ↵ | Jack Humbert | 2016-01-16 | 0 | -0/+0 |
|\ | | | | | | | into smarkefile | ||||
| * | I guess I can reference #90 in the commit message | Jack Humbert | 2016-01-16 | 1 | -38/+0 |
| | | |||||
* | | I guess I can reference #90 in the commit message | Jack Humbert | 2016-01-16 | 2 | -38/+3 |
|/ | |||||
* | added error for keymap file not existing | Jack Humbert | 2016-01-16 | 1 | -0/+4 |
| | |||||
* | new keymap folder structure and makefile magic | Jack Humbert | 2016-01-16 | 21 | -48/+228 |
| | |||||
* | working | Jack Humbert | 2016-01-16 | 2 | -0/+17 |
| | |||||
* | Merge pull request #89 from coderkun/master | Erez Zukerman | 2016-01-15 | 1 | -0/+137 |
|\ | | | | | add coderkun’s ErgodoxEZ keymap (Neo2) | ||||
| * | merge upstream | coderkun | 2016-01-15 | 0 | -0/+0 |
| |\ | |||||
| * | | merge upstream | coderkun | 2016-01-15 | 16 | -2460/+3838 |
| | | | |||||
| * | | add basic layer 2 | coderkun | 2016-01-15 | 2 | -16/+16 |
| | | | |||||
| * | | add basic layer 1 | coderkun | 2016-01-12 | 1 | -2/+45 |
| | | | |||||
| * | | add neo2 keymap for ergodoxEZ | coderkun | 2016-01-12 | 1 | -0/+94 |
| | | | |||||
* | | | Merge pull request #87 from sboesebeck/master | Erez Zukerman | 2016-01-15 | 4 | -1519/+1672 |
|\ \ \ | |_|/ |/| | | added some macros, create full de_osx include file | ||||
| * | | updated cheat sheet, hex file | Stephan Bösebeck | 2016-01-15 | 2 | -1494/+1508 |
| | | | |||||
| * | | using keymap_german_osx.h more, adding macros for CTRL/CMD-V combination | Stephan Bösebeck | 2016-01-15 | 2 | -25/+164 |
| | | | |||||
| * | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | Stephan Bösebeck | 2016-01-13 | 9 | -0/+1108 |
| |\ \ | |/ / |/| | | |||||
* | | | Merge pull request #84 from sboesebeck/master | Erez Zukerman | 2016-01-13 | 5 | -1239/+1504 |
|\ \ \ | | | | | | | | | new alternative layout ADNW_Koy | ||||
* \ \ \ | Merge pull request #83 from lxol/feature/hhkb-qmk | Jack Humbert | 2016-01-13 | 9 | -0/+1108 |
|\ \ \ \ | | | | | | | | | | | migrate hhkb to QMK firmware | ||||
| * | | | | migrate hhkb to QMK firmware | Alex Olkhovskiy | 2016-01-13 | 9 | -0/+1108 |
| | |_|/ | |/| | | |||||
| | | * | Merge branch 'master' of https://github.com/sboesebeck/qmk_firmware | Stephan Bösebeck | 2016-01-13 | 5 | -13/+272 |
| | | |\ | | | |/ | | |/| | |||||
| | * | | updating layout png | Stephan Bösebeck | 2016-01-13 | 1 | -0/+0 |
| | | | | |||||
| | * | | adding fixed hex file | Stephan Bösebeck | 2016-01-13 | 1 | -9/+9 |
| | | | | |||||
| | * | | typo fix | Stephan Bösebeck | 2016-01-13 | 1 | -1/+1 |
| | | | | |||||
| | * | | added adnw layout | Stephan Bösebeck | 2016-01-13 | 1 | -0/+262 |
| | | | | |||||
| | * | | typo and copy past fix | Stephan Bösebeck | 2016-01-13 | 1 | -262/+0 |
| | | | | |||||
| | * | | minor fix | Stephan Bösebeck | 2016-01-13 | 1 | -5/+2 |
| | | | | |||||
| | * | | bugfix | Stephan Bösebeck | 2016-01-13 | 1 | -1/+1 |
| | | | | |||||
| | * | | updated ANDW layout | Stephan Bösebeck | 2016-01-13 | 2 | -14/+17 |
| | | | | |||||
| | * | | Merge branch 'master' of https://github.com/sboesebeck/qmk_firmware | Stephan Bösebeck | 2016-01-13 | 2 | -1230/+1236 |
| | |\ \ | |||||
| | * | | | andw layout added | Stephan Bösebeck | 2016-01-13 | 1 | -0/+259 |
| |/ / / |/| | | | |||||
| | | * | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | Stephan Bösebeck | 2016-01-12 | 5 | -1224/+1432 |
| | |/| | |_|/ |/| | | |||||
* | | | Disables debug console by default for improved performance | Erez Zukerman | 2016-01-12 | 2 | -1221/+1226 |
|/ / | |||||
* | | Merge pull request #80 from agriffis/kinesis-clone | Erez Zukerman | 2016-01-10 | 2 | -0/+203 |
|\ \ | | | | | | | Add ergodox_ez keymap to match Kinesis Contoured. | ||||
| * | | Rename to keymap_kines-ish.c and add README | Aron Griffis | 2016-01-10 | 2 | -0/+19 |
| | | | |||||
| * | | Add ergodox_ez keymap to match Kinesis Contoured. | Aron Griffis | 2016-01-09 | 1 | -0/+184 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This keymap attempts to match the Kinesis Contoured (aka Advantage) default layout as closely as possible. See http://www.kinesis-ergo.com/wp-content/uploads/2013/06/advantage_layout_win.pdf Apart from the obvious mappings, this keymap also: * removes the dual-purpose momentary layer/normal keys: Z, /, and Grv; because the author--coming from a Kinesis keyboard--finds the delays and accidental modifiers to be more disconcerting than helpful. * puts Esc in the bottom left since there's no place for it in the top left to match the Kinesis. * changes the bottom-right key into an L2 toggle since there's otherwise no way to get to L2. * adds PrScr, ScrLk and Pause to the L1 keymap, down the left side, since they're present on the Kinesis but not available in the default ergodox_ez keymap. | ||||
* | | | Merge pull request #79 from agriffis/cleanup-default | Erez Zukerman | 2016-01-10 | 1 | -3/+3 |
|\ \ \ | |/ / |/| | | Minor cleanup to refer to SYMB and MDIA in default ergodox_ez keymap rather than hard-coding numbers. | ||||
| * | | Refer to SYMB and MDIA in default ergodox_ez keymap. | Aron Griffis | 2016-01-09 | 1 | -3/+3 |
|/ / | |||||
| * | added mouse wheel support, CMD-V/CMD-C instead of CTRL | Stephan Bösebeck | 2016-01-10 | 1 | -3/+3 |
| | | |||||
| * | removed left space key in favor of a backspace | Stephan Bösebeck | 2016-01-09 | 2 | -1219/+1225 |
| | | |||||
| * | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | Stephan Bösebeck | 2016-01-09 | 2 | -1/+186 |
| |\ | |/ |/| | |||||
* | | Merge pull request #77 from chwilk/master | Jack Humbert | 2016-01-08 | 1 | -0/+184 |
|\ \ | | | | | | | Keymap to approximate Kinesis Advantage line of keyboards | ||||
| * | | Moving around modifiers to match KA better | chwilk | 2016-01-08 | 1 | -11/+11 |
| | | | |||||
| * | | Added keymap variant to approximate Kin Adv | chwilk | 2015-12-20 | 1 | -0/+184 |
| | | | |||||
* | | | Merge pull request #74 from sethherr/patch-3 | Jack Humbert | 2016-01-06 | 1 | -1/+2 |
|\ \ \ | | | | | | | | | Fix homebrew references | ||||
| * | | | Fix homebrew references | Seth Herr | 2016-01-06 | 1 | -1/+2 |
|/ / / | | | | | | | Replaces #64 | ||||
| | * | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | Stephan Bösebeck | 2016-01-06 | 8 | -0/+3761 |
| | |\ | |_|/ |/| | | |||||
* | | | Merge pull request #60 from rothgar/dvorak | Jack Humbert | 2016-01-06 | 3 | -0/+368 |
|\ \ \ | | | | | | | | | added dvorak keymap and layout picture | ||||
| * | | | added jgarr keymap for custom dvorak layout :yay: | Justin Garrison | 2016-01-04 | 1 | -0/+184 |
| | | | | |||||
| * | | | added dvorak keymap and layout picture | Justin Garrison | 2015-12-30 | 2 | -0/+184 |
| | | | | |||||
* | | | | Merge pull request #70 from sperochon/ergodox_ez_fr | Jack Humbert | 2016-01-06 | 3 | -0/+1735 |
|\ \ \ \ | | | | | | | | | | | Ergodox_ez french OS X |