aboutsummaryrefslogtreecommitdiffstats
path: root/keyboards/ergodox
Commit message (Expand)AuthorAgeFilesLines
* added US-International supportnstickney2017-03-122-53/+104
* Merge remote-tracking branch 'upstream/master'nstickney2017-03-086-2/+560
|\
| * Tweaks keymap to reset on bootErez Zukerman2017-03-081-1/+1
| * Merge pull request #1137 from Skrymir/patch-1Jack Humbert2017-03-081-1/+1
| |\
| | * Fixed minor error in ergodox infinity section.Joshua Colbeck2017-03-071-1/+1
| * | Merge pull request #1142 from guni77/my_keymapJack Humbert2017-03-082-0/+310
| |\ \
| | * | added readme fileGunther Gruber2017-03-081-0/+133
| | * | small changes in guni.c keymap to work with new qmk_firmware packetGunther Gruber2017-02-271-0/+177
| * | | readmeLukas Stiebig2017-03-081-0/+12
| * | | Corrected the description of the layerLukas Stiebig2017-03-081-1/+2
| * | | Added german-lukasLukas Stiebig2017-03-081-0/+235
| | |/ | |/|
* | | found LT(layer, kc) so I could take out TapDance codenstickney2017-03-082-112/+20
* | | corralled image filesnstickney2017-03-088-13/+13
* | | SLASH and WHACK functions added (based on algernon's CT_TA)nstickney2017-03-071-37/+0
* | | SLASH and WHACK functions added (based on algernon's CT_TA)nstickney2017-03-074-33/+157
* | | Merge remote-tracking branch 'upstream/master'nstickney2017-03-075-0/+280
|\| |
| * | Merge pull request #1121 from Leszek111/masterJack Humbert2017-02-275-0/+280
| |\ \ | | |/ | |/|
| | * Ammend readme.md2017-02-271-2/+4
| | * Add colemak_programmer2017-02-275-0/+278
* | | making numbers more familiarnstickney2017-02-251-93/+131
* | | first two layers of ErgoDox Familiar completeCnstickney2017-02-241-13/+55
* | | initial layer of familiar layout)nstickney2017-02-231-37/+67
* | | Merge https://github.com/qmk/qmk_firmwarenstickney2017-02-233-13/+261
|\| |
| * | Merge pull request #1113 from kesslern/masterJack Humbert2017-02-212-0/+240
| |\ \
| | * | Add dvorak_emacs_software layout for ergodoxNathan Kessler2017-02-202-0/+240
| * | | Merge remote-tracking branch 'qmk/master'Josh Colbeck2017-02-211-13/+21
| |/ /
* | | familiar layout graphics, etcnstickney2017-02-237-0/+23475
* | | familiar layout v0.1 from ErgoDox-EZ configuratornstickney2017-02-191-0/+111
|/ /
* | remove more warningsJack Humbert2017-02-162-0/+3
* | Merge pull request #1105 from nrrkeene/masterJack Humbert2017-02-168-80/+165
|\ \
| * | The Ordinary Layout has all the keys in the right places.Nicholas Keene2017-02-151-1/+1
| * | This is the best layout, really, come lookNicholas Keene2017-02-151-4/+4
| * | The Ordinary Layout is the best one, the one you are looking for. Really. Che...Nicholas Keene2017-02-154-29/+43
| * | The Ordinary Layout is boring, normal, typical, expected.Nicholas Keene2017-02-142-54/+125
| * | The Ordinary Layout has a feature for one-handed chorded typingNicholas Keene2017-02-142-3/+3
| * | All my friends us The Ordinary Layout because it doesn't force you to change ...Nicholas Keene2017-02-142-4/+4
| * | The Ordinary Layout now has more symbols on the Symbols layer! So useful!Nicholas Keene2017-02-142-11/+11
* | | updated readmeluc wastiaux2017-02-131-1/+1
* | | Merge remote-tracking branch 'upstream/master'luc wastiaux2017-02-1322-146/+1298
|\| |
| * | [Typo] correct link to default keymap in readme.Rob Rogers2017-02-091-1/+1
| * | Add missing header to ergodox ordinary keymapNikolaus Wittenstein2017-02-031-0/+1
| * | Fix compile warnings in egodox robot_test_layoutNikolaus Wittenstein2017-02-031-4/+4
| * | Merge remote-tracking branch 'upstream/master'Brendan Johan Lee2017-02-015-30/+900
| |\ \
| | * \ Merge pull request #1039 from zabereer/albert_ergodox_keymapErez Zukerman2017-01-314-0/+866
| | |\ \
| | | * | albert ergodox keymapAlbert Pretorius2017-01-264-0/+866
| | * | | update my neo2 keymapMatthias Schmitt2017-01-301-30/+34
| * | | | [deadcyclo layout] Refactoring. Use custom functions and macrosBrendan Johan Lee2017-01-301-237/+266
| * | | | [deadcyclo layout] fixed failing testsBrendan Johan Lee2017-01-301-16/+1
| * | | | Merge remote-tracking branch 'upstream/master'Brendan Johan Lee2017-01-278-9/+9
| |\| | |
| | * | | replace jackhumbert with qmkJack Humbert2017-01-268-9/+9
| | |/ /