summaryrefslogtreecommitdiffstats
path: root/keyboards/ergodox
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | Merge remote-tracking branch 'upstream/master'xyverz2017-01-0825-96/+2226
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master'xyverz2016-12-133-27/+62
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master'xyverz2016-12-0629-217/+1048
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master'xyverz2016-11-1657-315/+3621
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Add files via uploadXyverz2016-10-182-10/+10
| * | | | | | | | | | | | | | Merge remote-tracking branch 'jackhumbert/master'xyverz2016-09-3022-513/+859
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Update readme.mdXyverz2016-09-171-1/+1
* | | | | | | | | | | | | | | | Fix F-keys on right hand to start on first keycoderkun2017-05-061-1/+1
* | | | | | | | | | | | | | | | Fix keymap “coderkun_neo” to use LALT instead of RALTcoderkun2017-04-011-6/+6
* | | | | | | | | | | | | | | | Add several Unicode symbols to keymap “coderkun_neo2”coderkun2017-04-012-20/+20
* | | | | | | | | | | | | | | | Add keymap diagrams to readme of keymap “coderkun_neo2”coderkun2017-04-011-9/+114
* | | | | | | | | | | | | | | | Merge branch 'master' into coderkun_neo2coderkun2017-04-0175-196/+6826
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge pull request #1183 from Rovanion/real-masterJack Humbert2017-03-291-4/+17
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | Added link to the teensy linux page.Rovanion Luckey2017-03-291-2/+5
| | * | | | | | | | | | | | | | | Added instructions for how to build and flash the firmware with teensy_cli.Rovanion Luckey2017-01-241-4/+14
| * | | | | | | | | | | | | | | | Removed images from ergodox ez italian layoutmattdibi2017-03-283-0/+0
| * | | | | | | | | | | | | | | | Fixed layout title in ergodox ez italian keymapmattdibi2017-03-281-1/+1
| * | | | | | | | | | | | | | | | Fixed italian kymap readmemattdibi2017-03-281-3/+3
| * | | | | | | | | | | | | | | | Updated readmemattdibi2017-03-281-11/+68
| * | | | | | | | | | | | | | | | Added italian layoutmattdibi2017-03-285-0/+238
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge pull request #1155 from deadcyclo/masterJack Humbert2017-03-157-20/+73
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | [deadcyclo layout] fix an error in layer illustrationBrendan Johan Lee2017-03-111-0/+0
| | * | | | | | | | | | | | | | | [deadcyclo layout] Added second unicode layer, more sane layer switchesBrendan Johan Lee2017-03-117-20/+73
| | | |_|_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | | update for infinityJack Humbert2017-03-151-1/+1
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | remove typo from folder nameDennis Trümper2017-03-112-0/+0
| * | | | | | | | | | | | | | update documentationDennis Trümper2017-03-112-79/+86
| * | | | | | | | | | | | | | change layer 3 on right thumb back to layer 1Dennis Trümper2017-03-111-2/+2
| * | | | | | | | | | | | | | working but some documentation neededDennis Trümper2017-03-112-0/+595
| |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | 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
| | |/ / / / / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | 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
| * | | | | | | | | | | | 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
| |/ / / / / / / / / / /
| * | | | | | | | | | | 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