summaryrefslogtreecommitdiff
path: root/keyboards/ergodox
AgeCommit message (Expand)Author
2017-02-01Merge remote-tracking branch 'upstream/master'Brendan Johan Lee
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-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
2017-01-06Increased TAPPING_TERM to 200Joshua T
2017-01-06Fixed key not matching its diagramJoshua T
2017-01-06 new file: keyboards/ergodox/keymaps/ishigoya-jp/img/keyboard-layout-enL.pngishigoya
2017-01-06 new file: keyboards/ergodox/keymaps/ishigoya-jp/keymap.cishigoya
2017-01-04Merge pull request #983 from common-nighthawk/masterJack Humbert
2017-01-03fix version macro making layer 3 sticky on deadcyclo layoutBrendan Johan Lee
2017-01-02Added the deadcyclo layoutBrendan Johan Lee
2017-01-02Update config.hJack Humbert
2017-01-01reverts change outside of personal keymap.Daniel
2017-01-01adds dedicated double-quote key.Daniel
2016-12-28ergodox: Update algernon's keymap to v1.10Gergely Nagy