summaryrefslogtreecommitdiff
path: root/keyboards/ergodox
AgeCommit message (Expand)Author
2017-02-21Merge pull request #1113 from kesslern/masterJack Humbert
2017-02-21Merge remote-tracking branch 'qmk/master'Josh Colbeck
2017-02-20Add dvorak_emacs_software layout for ergodoxNathan Kessler
2017-02-16remove more warningsJack Humbert
2017-02-16Merge pull request #1105 from nrrkeene/masterJack Humbert
2017-02-15The Ordinary Layout has all the keys in the right places.Nicholas Keene
2017-02-15This is the best layout, really, come lookNicholas Keene
2017-02-15The Ordinary Layout is the best one, the one you are looking for. Really. Che...Nicholas Keene
2017-02-14The Ordinary Layout is boring, normal, typical, expected.Nicholas Keene
2017-02-14The Ordinary Layout has a feature for one-handed chorded typingNicholas Keene
2017-02-14All my friends us The Ordinary Layout because it doesn't force you to change ...Nicholas Keene
2017-02-14The Ordinary Layout now has more symbols on the Symbols layer! So useful!Nicholas Keene
2017-02-13updated readmeluc wastiaux
2017-02-13Merge remote-tracking branch 'upstream/master'luc wastiaux
2017-02-13change thumb cluster key to be shiftluc wastiaux
2017-02-10made left shift an MO for SHELL_NAVluc wastiaux
2017-02-09[Typo] correct link to default keymap in readme.Rob Rogers
2017-02-03Add missing header to ergodox ordinary keymapNikolaus Wittenstein
2017-02-03Fix compile warnings in egodox robot_test_layoutNikolaus Wittenstein
2017-02-01Merge remote-tracking branch 'upstream/master'Brendan Johan Lee
2017-02-01increase timeout for dual mode caps keylucwastiaux
2017-01-31Merge pull request #1039 from zabereer/albert_ergodox_keymapErez Zukerman
2017-01-30update my neo2 keymapMatthias Schmitt
2017-01-30[deadcyclo layout] Refactoring. Use custom functions and macrosBrendan Johan Lee
2017-01-30[deadcyclo layout] fixed failing testsBrendan Johan Lee
2017-01-28eliminate references to shell_layerlucwastiaux
2017-01-28documented dual mode capslocklucwastiaux
2017-01-27dual capslock functionality, activating shell nav or bracketslucwastiaux
2017-01-27Merge remote-tracking branch 'upstream/master'Brendan Johan Lee
2017-01-27[deadcyclo layout] Added more unicode keys and ibus unicode compose trigger keysBrendan Johan Lee
2017-01-26albert ergodox keymapAlbert Pretorius
2017-01-26replace jackhumbert with qmkJack Humbert
2017-01-25[deadcyclo layout] Added lotsof new emojis and some new unicode keysBrendan Johan Lee
2017-01-24Merge remote-tracking branch 'upstream/master'Brendan Johan Lee
2017-01-24[deadcyclo layout] Added unicode layerBrendan Johan Lee
2017-01-24[deadcyclo layout] Added support for ergodox ez shineBrendan Johan Lee
2017-01-23turn off rgb_midi in ezJack Humbert
2017-01-22Merge pull request #1020 from remigius42/masterJack Humbert
2017-01-22Merge pull request #1022 from lucwastiaux/masterJack Humbert
2017-01-22SG Ergodox layout: Updated layout documentationAndreas Schmidt
2017-01-22SG Ergodox layout: Fixed ENTER key mappingAndreas Schmidt
2017-01-22SG Ergodox layout: Minor code formatting changesAndreas Schmidt
2017-01-22SG Ergodox layout: Add ENTER to left keyboardAndreas Schmidt
2017-01-22SG Ergodox layout: Add <br/> macro to media layerAndreas Schmidt
2017-01-22document BRACKETS and SHELL_LAYERlucwastiaux
2017-01-21Renamed JSON source of Ergodox Swiss GermanAndreas Schmidt
2017-01-21Correct layout description of ergodox swissgermanAndreas Schmidt
2017-01-21Removed Ergodox EZ & Infinity specific keymapsAndreas Schmidt
2017-01-21Merged keymap for Ergodox EZ & InfinityAndreas Schmidt
2017-01-21make shell layer more compatible with default layerlucwastiaux