summaryrefslogtreecommitdiff
path: root/keyboards/ergodox
AgeCommit message (Expand)Author
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
2017-01-21Add Swiss German layout for Ergodox InfinityAndreas Schmidt
2017-01-21Add Swiss German layout for Ergodox EZAndreas Schmidt
2017-01-21couple of changes to the shell layerlucwastiaux
2017-01-19introduce shell_layerlucwastiaux
2017-01-17put shell nav under tab, introduce an OSL for the brackets layerlucwastiaux
2017-01-15Merge pull request #999 from deadcyclo/masterJack Humbert
2017-01-15Merge pull request #1007 from bryan4887/bryanJack Humbert
2017-01-13Added Bryan's keymapBryan Hernandez
2017-01-10Fixed incorrect layer image in deadcyclo readmeBrendan Johan Lee
2017-01-10Merge remote-tracking branch 'upstream/master'Brendan Johan Lee
2017-01-10Added layer images to deadcyclo layout readmeBrendan Johan Lee
2017-01-07Merged from upstreamJoshua T