summaryrefslogtreecommitdiffstats
path: root/keyboards/ergodox
AgeCommit message (Expand)AuthorFilesLines
2017-02-01Merge remote-tracking branch 'upstream/master'Brendan Johan Lee5-30/+900
2017-02-01Merge pull request #1039 from zabereer/albert_ergodox_keymapErez Zukerman4-0/+866
2017-01-30update my neo2 keymapMatthias Schmitt1-30/+34
2017-01-30[deadcyclo layout] Refactoring. Use custom functions and macrosBrendan Johan Lee1-237/+266
2017-01-30[deadcyclo layout] fixed failing testsBrendan Johan Lee1-16/+1
2017-01-27Merge remote-tracking branch 'upstream/master'Brendan Johan Lee8-9/+9
2017-01-27[deadcyclo layout] Added more unicode keys and ibus unicode compose trigger keysBrendan Johan Lee4-23/+26
2017-01-26albert ergodox keymapAlbert Pretorius4-0/+866
2017-01-26replace jackhumbert with qmkJack Humbert8-9/+9
2017-01-25[deadcyclo layout] Added lotsof new emojis and some new unicode keysBrendan Johan Lee3-11/+178
2017-01-24Merge remote-tracking branch 'upstream/master'Brendan Johan Lee2-5/+5
2017-01-24[deadcyclo layout] Added unicode layerBrendan Johan Lee5-27/+98
2017-01-24[deadcyclo layout] Added support for ergodox ez shineBrendan Johan Lee4-14/+40
2017-01-23turn off rgb_midi in ezJack Humbert2-5/+5
2017-01-23Merge pull request #1020 from remigius42/masterJack Humbert6-0/+1157
2017-01-23Merge pull request #1022 from lucwastiaux/masterJack Humbert2-13/+48
2017-01-22SG Ergodox layout: Updated layout documentationAndreas Schmidt3-4/+12
2017-01-22SG Ergodox layout: Fixed ENTER key mappingAndreas Schmidt1-2/+2
2017-01-22SG Ergodox layout: Minor code formatting changesAndreas Schmidt1-1/+1
2017-01-22SG Ergodox layout: Add ENTER to left keyboardAndreas Schmidt1-2/+2
2017-01-22SG Ergodox layout: Add <br/> macro to media layerAndreas Schmidt1-2/+14
2017-01-22document BRACKETS and SHELL_LAYERlucwastiaux1-1/+6
2017-01-21Renamed JSON source of Ergodox Swiss GermanAndreas Schmidt2-1/+1
2017-01-21Correct layout description of ergodox swissgermanAndreas Schmidt2-15/+16
2017-01-21Removed Ergodox EZ & Infinity specific keymapsAndreas Schmidt12-2233/+0
2017-01-21Merged keymap for Ergodox EZ & InfinityAndreas Schmidt6-0/+1136
2017-01-21make shell layer more compatible with default layerlucwastiaux1-15/+16
2017-01-21Add Swiss German layout for Ergodox InfinityAndreas Schmidt6-0/+1112
2017-01-21Add Swiss German layout for Ergodox EZAndreas Schmidt6-0/+1121
2017-01-21couple of changes to the shell layerlucwastiaux1-4/+4
2017-01-19introduce shell_layerlucwastiaux1-3/+31
2017-01-17put shell nav under tab, introduce an OSL for the brackets layerlucwastiaux1-4/+5
2017-01-15Merge pull request #999 from deadcyclo/masterJack Humbert5-0/+26
2017-01-15Merge pull request #1007 from bryan4887/bryanJack Humbert1-0/+226
2017-01-14Added Bryan's keymapBryan Hernandez1-0/+226
2017-01-10Fixed incorrect layer image in deadcyclo readmeBrendan Johan Lee1-1/+1
2017-01-10Merge remote-tracking branch 'upstream/master'Brendan Johan Lee11-1/+1643
2017-01-10Added layer images to deadcyclo layout readmeBrendan Johan Lee5-0/+26
2017-01-07Merged from upstreamJoshua T86-449/+5505
2017-01-07Increased TAPPING_TERM to 200Joshua T1-1/+3
2017-01-07Fixed key not matching its diagramJoshua T1-1/+1
2017-01-06 new file: keyboards/ergodox/keymaps/ishigoya-jp/img/keyboard-layout-enL.pngishigoya5-3/+57
2017-01-06 new file: keyboards/ergodox/keymaps/ishigoya-jp/keymap.cishigoya1-0/+962
2017-01-05Merge pull request #983 from common-nighthawk/masterJack Humbert2-0/+222
2017-01-03fix version macro making layer 3 sticky on deadcyclo layoutBrendan Johan Lee1-2/+2
2017-01-02Added the deadcyclo layoutBrendan Johan Lee2-0/+283
2017-01-02Update config.hJack Humbert1-1/+1
2017-01-02reverts change outside of personal keymap.Daniel1-2/+1
2017-01-02adds dedicated double-quote key.Daniel1-5/+9
2016-12-28ergodox: Update algernon's keymap to v1.10Gergely Nagy3-6/+21