summaryrefslogtreecommitdiffstats
path: root/keyboard/ergodox_ez
AgeCommit message (Expand)AuthorFilesLines
2016-03-28Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck20-1148/+4261
2016-03-28Corrected duplicate image issueMatthew Carroll1-0/+0
2016-03-28Added msc keymap for ergodox_ezMatthew Carroll6-0/+1334
2016-03-27Merge pull request #211 from nrrkeene/masterErez Zukerman10-1147/+1232
2016-03-27Merge pull request #196 from naps62/naps62Erez Zukerman3-0/+1690
2016-03-26Merge https://github.com/jackhumbert/qmk_firmwareNicholas Keene1-1/+5
2016-03-26The Ordinary Layout is unremarkably mundane and remarkably usefulNicholas Keene10-1109/+1192
2016-03-25Merge pull request #207 from romanzolotarev/masterErez Zukerman1-1/+5
2016-03-25The Ordinary Layout is familiar to users of common keyboardsNicholas Keene1-58/+60
2016-03-24minor changesStephan Bösebeck2-1113/+1111
2016-03-24Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck67-41353/+32903
2016-03-22Add important note about brightness on OS XRoman Zolotarev1-1/+5
2016-03-22Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck4-0/+1309
2016-03-21Pull request 190 resolution with 'qmk/master' for mergeyoyoerx11-2340/+3603
2016-03-21Merge pull request #205 from romanzolotarev/masterErez Zukerman4-0/+1309
2016-03-20fix number pad, add ,Stephan Bösebeck1-1/+1
2016-03-20changing cursor keys, back to "default" cursor key layout, adding ISO-cursor ...Stephan Bösebeck1-4/+4
2016-03-20tweaking it a bit further, fixing thingsStephan Bösebeck1-12/+12
2016-03-20Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck7-2724/+2677
2016-03-20Merge pull request #203 from XenoBits/masterErez Zukerman5-1227/+1174
2016-03-20Fixed png imageMaxime Millet1-0/+0
2016-03-20CSharp dev layout V2Maxime Millet5-1227/+1174
2016-03-19Update readmeRoman Zolotarev1-1/+1
2016-03-19Update layoutRoman Zolotarev12-192/+67
2016-03-18Swap volup and voldownRoman Zolotarev1-2/+2
2016-03-18Add Roman's LayoutRoman Zolotarev11-0/+1434
2016-03-17Add waits to prevent KVM from hangingMaciej Piechotka2-1490/+1492
2016-03-17Put frequently used keys in shell (-=) under thumbMaciej Piechotka2-9/+9
2016-03-17Add missing breaks in mpiechotka ergodox_ez keyboardMaciej Piechotka2-1233/+1237
2016-03-15Adds naps62's layoutMiguel Palhas3-0/+1690
2016-03-11PR190hotfix.sh, fresh hexes, makeallhex.sh scriptyoyoerx33-41292/+32894
2016-03-10Addressed void* return warning in all keymapsyoyoerx33-98/+85
2016-03-08Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck4-0/+1317
2016-03-08Adds a readme with a link to the blog postErez Zukerman2-0/+5
2016-03-07The Ordinary Layout, designed to be similar to traditional keyboards, by Nich...Nicholas Keene3-0/+1312
2016-03-02forgot F6Stephan Bösebeck2-2/+2
2016-03-02updated version, changed F-Key-Layout, minor change in code layerStephan Bösebeck2-1481/+1479
2016-03-02Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck3-1505/+1483
2016-02-21Merge pull request #157 from DidierLoiseau/typematrixJack Humbert3-1505/+1483
2016-02-21Updated tm2030 keymap.hexDidier Loiseau1-1482/+1476
2016-02-21Fixed compilation warnings due to missing return statementsDidier Loiseau1-1/+2
2016-02-15testing moving the 6 to the left, having one key more on the right used for h...Stephan Bösebeck2-1519/+1561
2016-02-12Merge pull request #141 from XenoBits/masterErez Zukerman5-0/+1489
2016-02-12Another readme.md improvementMaxime Millet1-9/+9
2016-02-12Improved readmeMaxime Millet1-10/+10
2016-02-12Added C# developer keymapMaxime Millet5-0/+1489
2016-02-12Merge pull request #139 from joarau/norwegian-colemak-ergodox-with-norwegian-...Erez Zukerman4-0/+1429
2016-02-11Norwegian Colemak Ergodox and Norwegian key definitionsjoar4-0/+1429
2016-02-11More tweaks to experimental layoutErez Zukerman3-18/+19
2016-02-11Merge branch 'master' of github.com:jackhumbert/qmk_firmwareErez Zukerman13-0/+4885