aboutsummaryrefslogtreecommitdiffstats
path: root/keyboards/ergodox
AgeCommit message (Expand)Author
2017-02-03Add missing header to ergodox ordinary keymapGravatar Nikolaus Wittenstein
2017-02-03Fix compile warnings in egodox robot_test_layoutGravatar Nikolaus Wittenstein
2017-02-01Merge remote-tracking branch 'upstream/master'Gravatar Brendan Johan Lee
2017-01-31Merge pull request #1039 from zabereer/albert_ergodox_keymapGravatar Erez Zukerman
2017-01-30update my neo2 keymapGravatar Matthias Schmitt
2017-01-30[deadcyclo layout] Refactoring. Use custom functions and macrosGravatar Brendan Johan Lee
2017-01-30[deadcyclo layout] fixed failing testsGravatar Brendan Johan Lee
2017-01-27Merge remote-tracking branch 'upstream/master'Gravatar Brendan Johan Lee
2017-01-27[deadcyclo layout] Added more unicode keys and ibus unicode compose trigger keysGravatar Brendan Johan Lee
2017-01-26albert ergodox keymapGravatar Albert Pretorius
2017-01-26replace jackhumbert with qmkGravatar Jack Humbert
2017-01-25[deadcyclo layout] Added lotsof new emojis and some new unicode keysGravatar Brendan Johan Lee
2017-01-24Merge remote-tracking branch 'upstream/master'Gravatar Brendan Johan Lee
2017-01-24[deadcyclo layout] Added unicode layerGravatar Brendan Johan Lee
2017-01-24[deadcyclo layout] Added support for ergodox ez shineGravatar Brendan Johan Lee
2017-01-23turn off rgb_midi in ezGravatar Jack Humbert
2017-01-22Merge pull request #1020 from remigius42/masterGravatar Jack Humbert
2017-01-22Merge pull request #1022 from lucwastiaux/masterGravatar Jack Humbert
2017-01-22SG Ergodox layout: Updated layout documentationGravatar Andreas Schmidt
2017-01-22SG Ergodox layout: Fixed ENTER key mappingGravatar Andreas Schmidt
2017-01-22SG Ergodox layout: Minor code formatting changesGravatar Andreas Schmidt
2017-01-22SG Ergodox layout: Add ENTER to left keyboardGravatar Andreas Schmidt
2017-01-22SG Ergodox layout: Add <br/> macro to media layerGravatar Andreas Schmidt
2017-01-22document BRACKETS and SHELL_LAYERGravatar lucwastiaux
2017-01-21Renamed JSON source of Ergodox Swiss GermanGravatar Andreas Schmidt
2017-01-21Correct layout description of ergodox swissgermanGravatar Andreas Schmidt
2017-01-21Removed Ergodox EZ & Infinity specific keymapsGravatar Andreas Schmidt
2017-01-21Merged keymap for Ergodox EZ & InfinityGravatar Andreas Schmidt
2017-01-21make shell layer more compatible with default layerGravatar lucwastiaux
2017-01-21Add Swiss German layout for Ergodox InfinityGravatar Andreas Schmidt
2017-01-21Add Swiss German layout for Ergodox EZGravatar Andreas Schmidt
2017-01-21couple of changes to the shell layerGravatar lucwastiaux
2017-01-19introduce shell_layerGravatar lucwastiaux
2017-01-17put shell nav under tab, introduce an OSL for the brackets layerGravatar lucwastiaux
2017-01-15Merge pull request #999 from deadcyclo/masterGravatar Jack Humbert
2017-01-15Merge pull request #1007 from bryan4887/bryanGravatar Jack Humbert
2017-01-13Added Bryan's keymapGravatar Bryan Hernandez
2017-01-10Fixed incorrect layer image in deadcyclo readmeGravatar Brendan Johan Lee
2017-01-10Merge remote-tracking branch 'upstream/master'Gravatar Brendan Johan Lee
2017-01-10Added layer images to deadcyclo layout readmeGravatar Brendan Johan Lee
2017-01-07Merged from upstreamGravatar Joshua T
2017-01-06Increased TAPPING_TERM to 200Gravatar Joshua T
2017-01-06Fixed key not matching its diagramGravatar Joshua T
2017-01-06 new file: keyboards/ergodox/keymaps/ishigoya-jp/img/keyboard-layout-enL.pngGravatar ishigoya
2017-01-06 new file: keyboards/ergodox/keymaps/ishigoya-jp/keymap.cGravatar ishigoya
2017-01-04Merge pull request #983 from common-nighthawk/masterGravatar Jack Humbert
2017-01-03fix version macro making layer 3 sticky on deadcyclo layoutGravatar Brendan Johan Lee
2017-01-02Added the deadcyclo layoutGravatar Brendan Johan Lee
2017-01-02Update config.hGravatar Jack Humbert
2017-01-01reverts change outside of personal keymap.Gravatar Daniel