summaryrefslogtreecommitdiffstats
path: root/keyboards/ergodox
AgeCommit message (Expand)AuthorFilesLines
2017-03-28Merge remote-tracking branch 'upstream/master'Stick8-21/+74
2017-03-28fixed unicode input issueStick2-18/+18
2017-03-15Merge pull request #1155 from deadcyclo/masterJack Humbert7-20/+73
2017-03-15update for infinityJack Humbert1-1/+1
2017-03-13added README.mdnstickney1-0/+3
2017-03-12Merge remote-tracking branch 'upstream/master'nstickney2-0/+602
2017-03-12added US-International supportnstickney2-53/+104
2017-03-11[deadcyclo layout] fix an error in layer illustrationBrendan Johan Lee1-0/+0
2017-03-11[deadcyclo layout] Added second unicode layer, more sane layer switchesBrendan Johan Lee7-20/+73
2017-03-11remove typo from folder nameDennis Trümper2-0/+0
2017-03-11update documentationDennis Trümper2-79/+86
2017-03-11change layer 3 on right thumb back to layer 1Dennis Trümper1-2/+2
2017-03-11working but some documentation neededDennis Trümper2-0/+595
2017-03-09Merge remote-tracking branch 'upstream/master'nstickney6-2/+560
2017-03-09found LT(layer, kc) so I could take out TapDance codenstickney2-112/+20
2017-03-09Tweaks keymap to reset on bootErez Zukerman1-1/+1
2017-03-09Merge pull request #1137 from Skrymir/patch-1Jack Humbert1-1/+1
2017-03-09Merge pull request #1142 from guni77/my_keymapJack Humbert2-0/+310
2017-03-08corralled image filesnstickney8-13/+13
2017-03-08readmeLukas Stiebig1-0/+12
2017-03-08Corrected the description of the layerLukas Stiebig1-1/+2
2017-03-08Added german-lukasLukas Stiebig1-0/+235
2017-03-08added readme fileGunther Gruber1-0/+133
2017-03-08SLASH and WHACK functions added (based on algernon's CT_TA)nstickney1-37/+0
2017-03-08SLASH and WHACK functions added (based on algernon's CT_TA)nstickney4-33/+157
2017-03-08Merge remote-tracking branch 'upstream/master'nstickney5-0/+280
2017-03-07Fixed minor error in ergodox infinity section.Joshua Colbeck1-1/+1
2017-03-05fix backspace key position.Kenichi Sasaki1-2/+2
2017-03-04fix againKenichi Sasaki1-98/+55
2017-03-04Merge remote-tracking branch 'upstream/master'Xyverz8-13/+541
2017-02-28Merge pull request #1121 from Leszek111/masterJack Humbert5-0/+280
2017-02-27small changes in guni.c keymap to work with new qmk_firmware packetGunther Gruber1-0/+177
2017-02-27Ammend readme.md1-2/+4
2017-02-27Add colemak_programmer5-0/+278
2017-02-26making numbers more familiarnstickney1-93/+131
2017-02-25first two layers of ErgoDox Familiar completeCnstickney1-13/+55
2017-02-24initial layer of familiar layout)nstickney1-37/+67
2017-02-24Merge https://github.com/qmk/qmk_firmwarenstickney3-13/+261
2017-02-24familiar layout graphics, etcnstickney7-0/+23475
2017-02-22Merge pull request #1113 from kesslern/masterJack Humbert2-0/+240
2017-02-22Merge remote-tracking branch 'qmk/master'Josh Colbeck336-0/+40740
2017-02-21Merge remote-tracking branch 'upstream/master'Xyverz13-141/+186
2017-02-21Add dvorak_emacs_software layout for ergodoxNathan Kessler2-0/+240
2017-02-20familiar layout v0.1 from ErgoDox-EZ configuratornstickney1-0/+111
2017-02-19change bracket key posisionKenichi Sasaki1-14/+14
2017-02-17fixKenichi Sasaki1-2/+2
2017-02-17remove reset keyKenichi Sasaki1-4/+3
2017-02-17Added JIS keymap symbolsKenichi Sasaki1-17/+25
2017-02-17copied and Meta(ESC)Kenichi Sasaki5-0/+238
2017-02-16remove more warningsJack Humbert2-0/+3