summaryrefslogtreecommitdiff
path: root/keyboards/ergodox
Commit message (Expand)AuthorAge
* [Typo] correct link to default keymap in readme.Rob Rogers2017-02-09
* Add missing header to ergodox ordinary keymapNikolaus Wittenstein2017-02-03
* Fix compile warnings in egodox robot_test_layoutNikolaus Wittenstein2017-02-03
* Merge remote-tracking branch 'upstream/master'Brendan Johan Lee2017-02-01
|\
| * Merge pull request #1039 from zabereer/albert_ergodox_keymapErez Zukerman2017-01-31
| |\
| | * albert ergodox keymapAlbert Pretorius2017-01-26
| * | update my neo2 keymapMatthias Schmitt2017-01-30
* | | [deadcyclo layout] Refactoring. Use custom functions and macrosBrendan Johan Lee2017-01-30
* | | [deadcyclo layout] fixed failing testsBrendan Johan Lee2017-01-30
* | | Merge remote-tracking branch 'upstream/master'Brendan Johan Lee2017-01-27
|\| |
| * | replace jackhumbert with qmkJack Humbert2017-01-26
| |/
* | [deadcyclo layout] Added more unicode keys and ibus unicode compose trigger keysBrendan Johan Lee2017-01-27
* | [deadcyclo layout] Added lotsof new emojis and some new unicode keysBrendan Johan Lee2017-01-25
* | Merge remote-tracking branch 'upstream/master'Brendan Johan Lee2017-01-24
|\|
| * turn off rgb_midi in ezJack Humbert2017-01-23
* | [deadcyclo layout] Added unicode layerBrendan Johan Lee2017-01-24
* | [deadcyclo layout] Added support for ergodox ez shineBrendan Johan Lee2017-01-24
|/
* Merge pull request #1020 from remigius42/masterJack Humbert2017-01-22
|\
| * SG Ergodox layout: Updated layout documentationAndreas Schmidt2017-01-22
| * SG Ergodox layout: Fixed ENTER key mappingAndreas Schmidt2017-01-22
| * SG Ergodox layout: Minor code formatting changesAndreas Schmidt2017-01-22
| * SG Ergodox layout: Add ENTER to left keyboardAndreas Schmidt2017-01-22
| * SG Ergodox layout: Add <br/> macro to media layerAndreas Schmidt2017-01-22
| * Renamed JSON source of Ergodox Swiss GermanAndreas Schmidt2017-01-21
| * Correct layout description of ergodox swissgermanAndreas Schmidt2017-01-21
| * Removed Ergodox EZ & Infinity specific keymapsAndreas Schmidt2017-01-21
| * Merged keymap for Ergodox EZ & InfinityAndreas Schmidt2017-01-21
| * Add Swiss German layout for Ergodox InfinityAndreas Schmidt2017-01-21
| * Add Swiss German layout for Ergodox EZAndreas Schmidt2017-01-21
* | Merge pull request #1022 from lucwastiaux/masterJack Humbert2017-01-22
|\ \ | |/ |/|
| * document BRACKETS and SHELL_LAYERlucwastiaux2017-01-22
| * make shell layer more compatible with default layerlucwastiaux2017-01-21
| * couple of changes to the shell layerlucwastiaux2017-01-21
| * introduce shell_layerlucwastiaux2017-01-19
| * put shell nav under tab, introduce an OSL for the brackets layerlucwastiaux2017-01-17
| * enable brackets using the - key on the right, and cleanupslucwastiaux2016-12-15
* | Merge pull request #999 from deadcyclo/masterJack Humbert2017-01-15
|\ \
| * | Fixed incorrect layer image in deadcyclo readmeBrendan Johan Lee2017-01-10
| * | Merge remote-tracking branch 'upstream/master'Brendan Johan Lee2017-01-10
| |\ \
| * | | Added layer images to deadcyclo layout readmeBrendan Johan Lee2017-01-10
* | | | Merge pull request #1007 from bryan4887/bryanJack Humbert2017-01-15
|\ \ \ \ | |_|/ / |/| | |
| * | | Added Bryan's keymapBryan Hernandez2017-01-13
* | | | Merged from upstreamJoshua T2017-01-07
|\ \ \ \
| * | | | new file: keyboards/ergodox/keymaps/ishigoya-jp/img/keyboard-layout-enL.pngishigoya2017-01-06
| * | | | new file: keyboards/ergodox/keymaps/ishigoya-jp/keymap.cishigoya2017-01-06
| * | | | Merge pull request #983 from common-nighthawk/masterJack Humbert2017-01-04
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | reverts change outside of personal keymap.Daniel2017-01-01
| | * | | adds dedicated double-quote key.Daniel2017-01-01
| | * | | removes double-tab brackets and adds back quot to left cmd.Daniel2016-12-06
| | * | | removes the double actions from the metakeys.Daniel2016-11-27