| Commit message (Expand) | Author | Age | Files | Lines |
* | updated readme | luc wastiaux | 2017-02-13 | 1 | -1/+1 |
* | Merge remote-tracking branch 'upstream/master' | luc wastiaux | 2017-02-13 | 21 | -145/+1297 |
|\ |
|
| * | [Typo] correct link to default keymap in readme. | Rob Rogers | 2017-02-09 | 1 | -1/+1 |
| * | Add missing header to ergodox ordinary keymap | Nikolaus Wittenstein | 2017-02-03 | 1 | -0/+1 |
| * | Fix compile warnings in egodox robot_test_layout | Nikolaus Wittenstein | 2017-02-03 | 1 | -4/+4 |
| * | 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 | 7 | -8/+8 |
| |\| | |
|
| | * | | replace jackhumbert with qmk | Jack Humbert | 2017-01-26 | 7 | -8/+8 |
| | |/ |
|
| * | | [deadcyclo layout] Added more unicode keys and ibus unicode compose trigger keys | Brendan Johan Lee | 2017-01-27 | 4 | -23/+26 |
| * | | [deadcyclo layout] Added lotsof new emojis and some new unicode keys | Brendan Johan Lee | 2017-01-25 | 3 | -11/+178 |
| * | | [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 |
| |/ |
|
* | | change thumb cluster key to be shift | luc wastiaux | 2017-02-13 | 1 | -2/+2 |
* | | made left shift an MO for SHELL_NAV | luc wastiaux | 2017-02-10 | 3 | -45/+9 |
* | | increase timeout for dual mode caps key | lucwastiaux | 2017-02-01 | 1 | -1/+1 |
* | | eliminate references to shell_layer | lucwastiaux | 2017-01-28 | 1 | -1/+1 |
* | | documented dual mode capslock | lucwastiaux | 2017-01-28 | 2 | -27/+3 |
* | | dual capslock functionality, activating shell nav or brackets | lucwastiaux | 2017-01-27 | 1 | -3/+20 |
|/ |
|
* | 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 #999 from deadcyclo/master | Jack Humbert | 2017-01-15 | 5 | -0/+26 |
|\ \ |
|
| * | | Fixed incorrect layer image in deadcyclo readme | Brendan Johan Lee | 2017-01-10 | 1 | -1/+1 |
| * | | Merge remote-tracking branch 'upstream/master' | Brendan Johan Lee | 2017-01-10 | 10 | -0/+1642 |
| |\ \ |
|
| * | | | Added layer images to deadcyclo layout readme | Brendan Johan Lee | 2017-01-10 | 5 | -0/+26 |
* | | | | Merge pull request #1007 from bryan4887/bryan | Jack Humbert | 2017-01-15 | 1 | -0/+226 |
|\ \ \ \
| |_|/ /
|/| | | |
|
| * | | | Added Bryan's keymap | Bryan Hernandez | 2017-01-13 | 1 | -0/+226 |
* | | | | Merged from upstream | Joshua T | 2017-01-07 | 74 | -388/+5434 |
|\ \ \ \ |
|
| * | | | | new file: keyboards/ergodox/keymaps/ishigoya-jp/img/keyboard-layout-enL.png | ishigoya | 2017-01-06 | 5 | -3/+57 |