| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge remote-tracking branch 'upstream/master' | Brendan Johan Lee | 2017-02-01 | 5 | -30/+900 |
|\ |
|
| * | Merge pull request #1039 from zabereer/albert_ergodox_keymap | Erez Zukerman | 2017-01-31 | 4 | -0/+866 |
| |\ |
|
| | * | albert ergodox keymap | Albert Pretorius | 2017-01-26 | 4 | -0/+866 |
| * | | update my neo2 keymap | Matthias Schmitt | 2017-01-30 | 1 | -30/+34 |
* | | | [deadcyclo layout] Refactoring. Use custom functions and macros | Brendan Johan Lee | 2017-01-30 | 1 | -237/+266 |
* | | | [deadcyclo layout] fixed failing tests | Brendan Johan Lee | 2017-01-30 | 1 | -16/+1 |
* | | | Merge remote-tracking branch 'upstream/master' | Brendan Johan Lee | 2017-01-27 | 12 | -13/+13 |
|\| | |
|
| * | | replace jackhumbert with qmk | Jack Humbert | 2017-01-26 | 12 | -13/+13 |
| |/ |
|
* | | [deadcyclo layout] Added more unicode keys and ibus unicode compose trigger keys | Brendan Johan Lee | 2017-01-27 | 4 | -23/+26 |
* | | Merge remote-tracking branch 'upstream/master' | Brendan Johan Lee | 2017-01-26 | 10 | -13/+400 |
|\| |
|
| * | Merge pull request #1029 from SjB/qmk_infinity60 | Jack Humbert | 2017-01-26 | 5 | -0/+46 |
| |\ |
|
| | * | updated all the other keymaps to support the new changes. | SjB | 2017-01-24 | 3 | -0/+28 |
| | * | fix: infinity60 keyboard was not using quantum features. | SjB | 2017-01-23 | 2 | -0/+18 |
| * | | Merge pull request #1033 from smt/smt/preonic | Jack Humbert | 2017-01-26 | 3 | -0/+335 |
| |\ \ |
|
| | * | | Remove COLEMAK from preonic_keycodes enum | Stephen Tudor | 2017-01-25 | 1 | -1/+0 |
| | * | | Update readme for smt Preonic keymap | Stephen Tudor | 2017-01-25 | 1 | -1/+85 |
| | * | | Add smt keymap for Preonic | Stephen Tudor | 2017-01-25 | 3 | -0/+252 |
| | |/ |
|
| * / | layer defines to enum | Jack Humbert | 2017-01-25 | 2 | -13/+19 |
| |/ |
|
* | | [deadcyclo layout] Added lotsof new emojis and some new unicode keys | Brendan Johan Lee | 2017-01-25 | 3 | -11/+178 |
* | | Merge remote-tracking branch 'upstream/master' | Brendan Johan Lee | 2017-01-24 | 2 | -5/+5 |
|\| |
|
| * | turn off rgb_midi in ez | Jack Humbert | 2017-01-23 | 2 | -5/+5 |
* | | [deadcyclo layout] Added unicode layer | Brendan Johan Lee | 2017-01-24 | 5 | -27/+98 |
* | | [deadcyclo layout] Added support for ergodox ez shine | Brendan Johan Lee | 2017-01-24 | 4 | -14/+40 |
|/ |
|
* | Merge pull request #1026 from TerryMathews/master | Jack Humbert | 2017-01-23 | 2 | -23/+0 |
|\ |
|
| * | More code cleanup | TerryMathews | 2017-01-22 | 2 | -23/+0 |
* | | Merge pull request #1018 from hot-leaf-juice/master | Jack Humbert | 2017-01-22 | 2 | -44/+19 |
|\ \ |
|
| * | | simplify | Callum Oakley | 2017-01-20 | 2 | -44/+19 |
* | | | More keyboard map tweaking (#1019) | Christopher Browne | 2017-01-22 | 2 | -6/+6 |
* | | | Merge pull request #1020 from remigius42/master | Jack Humbert | 2017-01-22 | 6 | -0/+1157 |
|\ \ \ |
|
| * | | | SG Ergodox layout: Updated layout documentation | Andreas Schmidt | 2017-01-22 | 3 | -4/+12 |
| * | | | SG Ergodox layout: Fixed ENTER key mapping | Andreas Schmidt | 2017-01-22 | 1 | -2/+2 |
| * | | | SG Ergodox layout: Minor code formatting changes | Andreas Schmidt | 2017-01-22 | 1 | -1/+1 |
| * | | | SG Ergodox layout: Add ENTER to left keyboard | Andreas Schmidt | 2017-01-22 | 1 | -2/+2 |
| * | | | SG Ergodox layout: Add <br/> macro to media layer | Andreas Schmidt | 2017-01-22 | 1 | -2/+14 |
| * | | | Renamed JSON source of Ergodox Swiss German | Andreas Schmidt | 2017-01-21 | 2 | -1/+1 |
| * | | | Correct layout description of ergodox swissgerman | Andreas Schmidt | 2017-01-21 | 2 | -15/+16 |
| * | | | Removed Ergodox EZ & Infinity specific keymaps | Andreas Schmidt | 2017-01-21 | 12 | -2233/+0 |
| * | | | Merged keymap for Ergodox EZ & Infinity | Andreas Schmidt | 2017-01-21 | 6 | -0/+1136 |
| * | | | Add Swiss German layout for Ergodox Infinity | Andreas Schmidt | 2017-01-21 | 6 | -0/+1112 |
| * | | | Add Swiss German layout for Ergodox EZ | Andreas Schmidt | 2017-01-21 | 6 | -0/+1121 |
| |/ / |
|
* | | | Merge pull request #1022 from lucwastiaux/master | Jack Humbert | 2017-01-22 | 2 | -13/+48 |
|\ \ \ |
|
| * | | | document BRACKETS and SHELL_LAYER | lucwastiaux | 2017-01-22 | 1 | -1/+6 |
| * | | | make shell layer more compatible with default layer | lucwastiaux | 2017-01-21 | 1 | -15/+16 |
| * | | | couple of changes to the shell layer | lucwastiaux | 2017-01-21 | 1 | -4/+4 |
| * | | | introduce shell_layer | lucwastiaux | 2017-01-19 | 1 | -3/+31 |
| * | | | put shell nav under tab, introduce an OSL for the brackets layer | lucwastiaux | 2017-01-17 | 1 | -4/+5 |
| * | | | enable brackets using the - key on the right, and cleanups | lucwastiaux | 2016-12-15 | 1 | -8/+8 |
* | | | | Merge pull request #1021 from luizribeiro/ps2avrGB | Jack Humbert | 2017-01-22 | 10 | -0/+794 |
|\ \ \ \ |
|
| * | | | | Added a copyright header to the default keymap... ¯\_(ツ)_/¯ | Luiz Ribeiro | 2017-01-21 | 2 | -0/+18 |
| * | | | | Slightly saner default keymap for ps2avrGB and removed some unused code | Luiz Ribeiro | 2017-01-21 | 2 | -27/+4 |