summaryrefslogtreecommitdiff
path: root/keyboards/ergodox
Commit message (Expand)AuthorAge
* Merge pull request #1121 from Leszek111/masterJack Humbert2017-02-27
|\
| * Ammend readme.md2017-02-27
| * Add colemak_programmer2017-02-27
* | Merge pull request #1113 from kesslern/masterJack Humbert2017-02-21
|\ \
| * | Add dvorak_emacs_software layout for ergodoxNathan Kessler2017-02-20
* | | Merge remote-tracking branch 'qmk/master'Josh Colbeck2017-02-21
|/ /
* | remove more warningsJack Humbert2017-02-16
* | Merge pull request #1105 from nrrkeene/masterJack Humbert2017-02-16
|\ \
| * | The Ordinary Layout has all the keys in the right places.Nicholas Keene2017-02-15
| * | This is the best layout, really, come lookNicholas Keene2017-02-15
| * | The Ordinary Layout is the best one, the one you are looking for. Really. Che...Nicholas Keene2017-02-15
| * | The Ordinary Layout is boring, normal, typical, expected.Nicholas Keene2017-02-14
| * | The Ordinary Layout has a feature for one-handed chorded typingNicholas Keene2017-02-14
| * | All my friends us The Ordinary Layout because it doesn't force you to change ...Nicholas Keene2017-02-14
| * | The Ordinary Layout now has more symbols on the Symbols layer! So useful!Nicholas Keene2017-02-14
* | | updated readmeluc wastiaux2017-02-13
* | | Merge remote-tracking branch 'upstream/master'luc wastiaux2017-02-13
|\| |
| * | [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
| |\| |
| * | | [deadcyclo layout] Added unicode layerBrendan Johan Lee2017-01-24
| * | | [deadcyclo layout] Added support for ergodox ez shineBrendan Johan Lee2017-01-24
* | | | change thumb cluster key to be shiftluc wastiaux2017-02-13
* | | | made left shift an MO for SHELL_NAVluc wastiaux2017-02-10
* | | | increase timeout for dual mode caps keylucwastiaux2017-02-01
* | | | eliminate references to shell_layerlucwastiaux2017-01-28
* | | | documented dual mode capslocklucwastiaux2017-01-28
* | | | dual capslock functionality, activating shell nav or bracketslucwastiaux2017-01-27
| |/ / |/| |
* | | turn off rgb_midi in ezJack Humbert2017-01-23
|/ /
* | 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