aboutsummaryrefslogtreecommitdiffstats
path: root/keyboard/ergodox_ez
Commit message (Expand)AuthorAgeFilesLines
* use action function for unicodeManuel Barkhau2016-04-024-2540/+1651
* Update compile_keymap.pymbarkhau2016-03-291-13/+11
* add hex fileManuel Barkhau2016-03-281-0/+1624
* Merge remote-tracking branch 'origin/master'Manuel Barkhau2016-03-2819-1147/+4256
|\
| * Corrected duplicate image issueMatthew Carroll2016-03-281-0/+0
| * Added msc keymap for ergodox_ezMatthew Carroll2016-03-276-0/+1334
| * Merge pull request #211 from nrrkeene/masterErez Zukerman2016-03-2710-1147/+1232
| |\
| | * Merge https://github.com/jackhumbert/qmk_firmwareNicholas Keene2016-03-261-1/+5
| | |\
| | * | The Ordinary Layout is unremarkably mundane and remarkably usefulNicholas Keene2016-03-2610-1109/+1192
| | * | The Ordinary Layout is familiar to users of common keyboardsNicholas Keene2016-03-241-58/+60
| * | | Merge pull request #196 from naps62/naps62Erez Zukerman2016-03-273-0/+1690
| |\ \ \ | | |_|/ | |/| |
| | * | Adds naps62's layoutMiguel Palhas2016-03-153-0/+1690
* | | | Refactor compiler codeManuel Barkhau2016-03-283-1661/+1900
* | | | Add manuneo layoutManuel Barkhau2016-03-273-0/+1918
|/ / /
* | | Merge pull request #207 from romanzolotarev/masterErez Zukerman2016-03-251-1/+5
|\ \ \ | |_|/ |/| |
| * | Add important note about brightness on OS XRoman Zolotarev2016-03-221-1/+5
* | | Pull request 190 resolution with 'qmk/master' for mergeyoyoerx2016-03-2111-2340/+3603
|\ \ \
| * | | Merge pull request #205 from romanzolotarev/masterErez Zukerman2016-03-214-0/+1309
| |\| |
| | * | Update readmeRoman Zolotarev2016-03-191-1/+1
| | * | Update layoutRoman Zolotarev2016-03-1912-192/+67
| | * | Swap volup and voldownRoman Zolotarev2016-03-181-2/+2
| | * | Add Roman's LayoutRoman Zolotarev2016-03-1811-0/+1434
| | |/
| * | Merge pull request #203 from XenoBits/masterErez Zukerman2016-03-205-1227/+1174
| |\ \
| | * | Fixed png imageMaxime Millet2016-03-201-0/+0
| | * | CSharp dev layout V2Maxime Millet2016-03-205-1227/+1174
| * | | Add waits to prevent KVM from hangingMaciej Piechotka2016-03-172-1490/+1492
| * | | Put frequently used keys in shell (-=) under thumbMaciej Piechotka2016-03-172-9/+9
| * | | Add missing breaks in mpiechotka ergodox_ez keyboardMaciej Piechotka2016-03-172-1233/+1237
| | |/ | |/|
* | | PR190hotfix.sh, fresh hexes, makeallhex.sh scriptyoyoerx2016-03-1133-41292/+32894
* | | Addressed void* return warning in all keymapsyoyoerx2016-03-1033-98/+85
|/ /
* | Adds a readme with a link to the blog postErez Zukerman2016-03-082-0/+5
* | The Ordinary Layout, designed to be similar to traditional keyboards, by Nich...Nicholas Keene2016-03-063-0/+1312
* | Merge pull request #157 from DidierLoiseau/typematrixJack Humbert2016-02-213-1505/+1483
|\ \
| * | Updated tm2030 keymap.hexDidier Loiseau2016-02-211-1482/+1476
| * | Fixed compilation warnings due to missing return statementsDidier Loiseau2016-02-211-1/+2
| * | FN macro: use layer_invert() instead of modifying layer_state directlyDidier Loiseau2016-02-071-20/+3
| * | Fixed inconsistency between comment and actual numeric layerDidier Loiseau2016-02-071-1/+1
| * | Fixed link to Magic doc in Dvorak sectionDidierLoiseau2016-02-071-1/+1
* | | Merge pull request #141 from XenoBits/masterErez Zukerman2016-02-125-0/+1489
|\ \ \ | | |/ | |/|
| * | Another readme.md improvementMaxime Millet2016-02-121-9/+9
| * | Improved readmeMaxime Millet2016-02-121-10/+10
| * | Added C# developer keymapMaxime Millet2016-02-125-0/+1489
* | | Merge pull request #139 from joarau/norwegian-colemak-ergodox-with-norwegian-...Erez Zukerman2016-02-114-0/+1429
|\ \ \
| * | | Norwegian Colemak Ergodox and Norwegian key definitionsjoar2016-02-114-0/+1429
* | | | More tweaks to experimental layoutErez Zukerman2016-02-113-18/+19
* | | | Merge branch 'master' of github.com:jackhumbert/qmk_firmwareErez Zukerman2016-02-1113-0/+4885
|\| | |
| * | | Merge pull request #138 from Willyfrog/masterErez Zukerman2016-02-104-0/+1666
| |\ \ \ | | |/ / | |/| |
| | * | add imageGuillermo Vayá2016-02-101-0/+0
| | * | added .hex fileGuillermo Vayá2016-02-101-0/+1472
| | * | new emacs + osx + deadkeys layoutGuillermo Vayá2016-01-312-0/+194