summaryrefslogtreecommitdiffstats
path: root/keyboard/ergodox_ez
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #267 from nrrkeene/masterErez Zukerman2016-04-207-1326/+1337
|\
| * The Ordinary Layout is the layout you are looking for. Come and see.Nicholas Keene2016-04-197-96/+96
| * The Ordinary Layout is the layout you are looking for. Come and see.Nicholas Keene2016-04-145-1278/+1289
* | Merge pull request #249 from nrrkeene/masterErez Zukerman2016-04-129-1325/+1685
|\|
| * The Ordinary Layout is the layout you are looking for. Come and see.Nicholas Keene2016-04-111-8/+8
| * The Ordinary Layout is the layout you are looking for. Come and see.Nicholas Keene2016-04-113-1129/+1180
| * The Ordinary Layout is the layout you are looking for. Come and see.Nicholas Keene2016-04-119-1324/+1633
* | Merge pull request #1 from J3RN/vim-navigationJonathan Arnett2016-04-112-18/+20
|\ \
| * | Added README note about Vim-style navigationJonathan Arnett2016-04-111-3/+4
| * | Stylistic changesJonathan Arnett2016-04-111-1/+1
| * | Make a also toggle Media layerJonathan Arnett2016-04-111-1/+1
| * | Building a row of level switch buttonsJonathan Arnett2016-03-241-3/+3
| * | A to toggle L2, hjkl to move mouseJonathan Arnett2016-03-241-13/+14
* | | Add HJKL layoutRoman Zolotarev2016-04-115-5/+1331
* | | Links to build guideErez Zukerman2016-04-031-1/+1
* | | Merge pull request #215 from nrrkeene/masterErez Zukerman2016-04-063-6/+60
|\ \ \ | | |/ | |/|
| * | The Ordinary Layout is unremarkably mundane and remarkably usefulNicholas Keene2016-03-273-6/+60
* | | Updated hexAlex Johnstone2016-04-051-893/+895
* | | :pound: typoAlex Johnstone2016-04-051-0/+4
* | | :pound: typoAlex Johnstone2016-04-051-1/+1
* | | Merge pull request #5 from jackhumbert/masterAlex Johnstone2016-04-0519-1252/+6867
|\ \ \
| * \ \ Merge pull request #235 from mbarkhau/masterErez Zukerman2016-04-042-92/+123
| |\ \ \
| | * | | add indent to generated keymapManuel Barkhau2016-04-032-92/+123
| * | | | Merge pull request #213 from mbarkhau/masterErez Zukerman2016-04-034-0/+2890
| |\| | |
| | * | | 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
| | |\ \ \
| | * | | | Refactor compiler codeManuel Barkhau2016-03-283-1661/+1900
| | * | | | Add manuneo layoutManuel Barkhau2016-03-273-0/+1918
| * | | | | Merge branch 'master' of https://github.com/sboesebeck/qmk_firmwareStephan Bösebeck2016-04-028-30/+1371
| |\ \ \ \ \
| | * \ \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-04-016-0/+1341
| | |\ \ \ \ \
| | | * | | | | Also add compiled hex fileDavid Mohr2016-03-301-0/+1127
| | | * | | | | Squisher's international dvorak variant for ergodox ezDavid Mohr2016-03-305-0/+214
| | | | |/ / / | | | |/| | |
| | * | | | | minor tweaks at the keymap, new png for documentationStephan Bösebeck2016-04-012-6/+6
| | * | | | | fixed de_osx prefix in keymap include to avoid conflictsStephan Bösebeck2016-03-311-25/+25
| * | | | | | new keymapStephan Bösebeck2016-04-021-1/+9
| |/ / / / /
| * | | | | added CTL_Shift / Hash macroStephan Bösebeck2016-03-291-11/+24
| * | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-03-2820-1148/+4261
| |\| | | |
| | * | | | Corrected duplicate image issueMatthew Carroll2016-03-281-0/+0
| | * | | | Added msc keymap for ergodox_ezMatthew Carroll2016-03-276-0/+1334
| | | |/ / | | |/| |
| * | | | minor changesStephan Bösebeck2016-03-242-1113/+1111
| * | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-03-2467-41353/+32903
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-03-224-0/+1309
| |\ \ \ \
| * | | | | fix number pad, add ,Stephan Bösebeck2016-03-201-1/+1
| * | | | | changing cursor keys, back to "default" cursor key layout, adding ISO-cursor ...Stephan Bösebeck2016-03-201-4/+4
| * | | | | tweaking it a bit further, fixing thingsStephan Bösebeck2016-03-201-12/+12
| * | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-03-207-2724/+2677
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-03-084-0/+1317
| |\ \ \ \ \ \
| * | | | | | | forgot F6Stephan Bösebeck2016-03-022-2/+2