summaryrefslogtreecommitdiffstats
path: root/keyboards/ergodox
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master'Stick2017-04-036-15/+326
|\
| * disables space cadet rolloverErez Zukerman2017-04-031-0/+3
| * Merge remote-tracking branch 'upstream/master'Xyverz2017-04-0217-26/+1547
| |\
| | * 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 remote-tracking branch 'upstream/master'Xyverz2017-03-038-13/+541
| |\ \ \
| * \ \ \ Merge remote-tracking branch 'upstream/master'Xyverz2017-02-2013-141/+186
| |\ \ \ \
| * \ \ \ \ Merge remote-tracking branch 'upstream/master'Xyverz2017-02-1032-164/+2508
| |\ \ \ \ \
| * \ \ \ \ \ Merge remote-tracking branch 'upstream/master'Xyverz2017-01-196-0/+252
| |\ \ \ \ \ \
| * \ \ \ \ \ \ 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
* | | | | | | | | | | | | unsatisfied with ESC/GRV/TAB positioningStick2017-03-271-16/+16
* | | | | | | | | | | | | Merge remote-tracking branch 'upstream/master'Stick2017-03-278-21/+74
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | |
| * | | | | | | | | | | | 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
* | | | | | | | | | | | | | fixed unicode input issueStick2017-03-272-18/+18
* | | | | | | | | | | | | | added README.mdnstickney2017-03-121-0/+3
* | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/master'nstickney2017-03-122-0/+602
|\| | | | | | | | | | | | |
| * | | | | | | | | | | | | 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
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | 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