Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #1063 from osamuaoki/master | Erez Zukerman | 2017-02-02 | 1 | -18/+18 |
|\ | |||||
| * | Typo fixes | Osamu Aoki | 2017-02-02 | 1 | -18/+18 |
* | | Merge pull request #1058 from edasque/master | Erez Zukerman | 2017-02-02 | 1 | -1/+2 |
|\ \ | |/ |/| | |||||
| * | Reverted Dockerfile to put the CMD back | Erik Dasque | 2017-01-31 | 1 | -1/+2 |
* | | Merge pull request #1049 from SjB/tap_dance_save_oneshot_mods | Erez Zukerman | 2017-02-01 | 2 | -1/+7 |
|\ \ | |||||
| * | | race condition between oneshot_mods and tap_dance | SjB | 2017-01-29 | 2 | -1/+7 |
* | | | Merge pull request #1054 from deadcyclo/master | Erez Zukerman | 2017-02-01 | 7 | -103/+384 |
|\ \ \ | |_|/ |/| | | |||||
| * | | 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 |
* | | | | Merge pull request #1055 from matzebond/master | Erez Zukerman | 2017-01-31 | 1 | -30/+34 |
|\ \ \ \ | |_|_|/ |/| | | | |||||
| * | | | 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-30 | 2 | -2/+18 |
| | |\ | |_|/ |/| | | |||||
* | | | Merge pull request #1043 from potz/patch-1 | skullydazed | 2017-01-27 | 1 | -0/+16 |
|\ \ \ | |||||
| * | | | Clarify license on abnt2 keymap (#1038) | Potiguar Faga | 2017-01-27 | 1 | -0/+16 |
|/ / / | |||||
* | | | Merge pull request #869 from dylanjgscott/master | Jack Humbert | 2017-01-27 | 1 | -2/+2 |
|\ \ \ | |||||
| * | | | Compare Makefile with itself instead of using `--help` | Dylan Scott | 2017-01-24 | 1 | -2/+2 |
| | | * | Merge remote-tracking branch 'upstream/master' | Brendan Johan Lee | 2017-01-27 | 16 | -22/+22 |
| | | |\ | |_|_|/ |/| | | | |||||
* | | | | Merge pull request #1035 from qmk/qmk_org_changes | Jack Humbert | 2017-01-27 | 16 | -22/+22 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | replace jackhumbert with qmk | Jack Humbert | 2017-01-26 | 16 | -22/+22 |
|/ / / | |||||
| | * | [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 | 11 | -16/+403 |
| | |\ | |_|/ |/| | | |||||
* | | | 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 |
* | | | | | Add gitter image, start update to qmk org | Jack Humbert | 2017-01-26 | 1 | -3/+3 |
* | | | | | Merge branch 'master' of github.com:jackhumbert/qmk_firmware | Jack Humbert | 2017-01-25 | 3 | -3/+66 |
|\| | | | | |||||
* | | | | | 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 | 6 | -8/+72 |
| | | |\ | | |_|/ | |/| | | |||||
| * | | | Merge pull request #1014 from SjB/lcd_mods_status | Jack Humbert | 2017-01-24 | 3 | -3/+66 |
|/| | | | |||||
| * | | | added mods status bit to visualizer. | SjB | 2017-01-17 | 3 | -3/+66 |
* | | | | turn off rgb_midi in ez | Jack Humbert | 2017-01-23 | 3 | -5/+6 |
| | | * | [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 |