summaryrefslogtreecommitdiffstats
path: root/keyboard/ergodox_ez
Commit message (Expand)AuthorAgeFilesLines
* A little more tweakingErez Zukerman2016-05-082-12/+12
* Tweaks layers 1 & 2 in my experimental layoutErez Zukerman2016-05-083-29/+37
* Merge pull request #311 from adiabatic/ergodox-zweihander-osxErez Zukerman2016-05-061-10/+10
|\
| * Rearrange code layer on ZweihanderNathan Sharfi2016-05-061-6/+6
| * zweihander: add ⌘X, ⌘C, ⌘V to media thumb keysNathan Sharfi2016-05-061-4/+4
* | Merge pull request #310 from nrrkeene/masterErez Zukerman2016-05-0611-1317/+1400
|\ \
| * | The Ordinary Layout is the layout you are looking for. Come and see.Nicholas Keene2016-05-052-1075/+1075
| * | The Ordinary Layout is extraordinarily familiar and powerfulNicholas Keene2016-05-0511-1325/+1373
| * | The Ordinary Layout is the most natural and powerful layout for the Ergodox E...Nicholas Keene2016-05-049-1249/+1284
* | | Uses @eltang's famous macro! Still not perfect though :(Erez Zukerman2016-05-052-1150/+1162
* | | [Jack & Erez] Creates a makefile.mk and a config file for the experimental la...Erez Zukerman2016-05-052-0/+13
* | | [Jack & Erez] Enables config_user.h per keymapErez Zukerman2016-05-051-0/+16
* | | Merge pull request #305 from nrrkeene/masterErez Zukerman2016-05-047-1548/+1505
|\| |
| * | The Ordinary Layout is arranged as close as possible to a traditional keyboar...Nicholas Keene2016-05-032-5/+5
| * | The Ordinary Layout works the way you expect it to, with extra powerful featuresNicholas Keene2016-05-031-979/+1008
| * | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareNicholas Keene2016-05-0269-4027/+23929
| |\ \
| * | | The Ordinary Layout is the layout you are looking for. Come and see v3.14.Nicholas Keene2016-05-017-1541/+1469
* | | | Merge pull request #304 from adiabatic/ergodox-zweihander-osxErez Zukerman2016-05-031-0/+3
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/|
| * | zweihander: comment out action_get_macro()Nathan Sharfi2016-05-031-0/+3
* | | Swap steno/media layers to allow using media keys in the Plover layer; displa...James ‘Twey’ Kay2016-05-021-58/+50
* | | Merge pull request #298 from adiabatic/ergodox-zweihander-osxErez Zukerman2016-05-023-0/+1381
|\| |
| * | zweihander: move dim/brighten to 1/2, add ⌘QNathan Sharfi2016-05-012-11/+11
| * | zweihander: Add ⌘`, ⌘⇧`, ⌥⇥, ⌥⇧⇥Nathan Sharfi2016-05-013-11/+16
| * | Ergodox EZ: add zweihander-osx.hexNathan Sharfi2016-04-301-0/+1152
| * | ergodox-zweihander: initial commitNathan Sharfi2016-04-302-0/+224
* | | Merge pull request #294 from sneako/masterErez Zukerman2016-05-023-0/+1345
|\ \ \
| * | | Adding .hex filesneako2016-04-281-0/+1152
| * | | Add my Ergodox EZ configsneako2016-04-282-0/+193
* | | | Merge pull request #258 from romanzolotarev/masterErez Zukerman2016-05-028-0/+2411
|\ \ \ \ | |_|/ / |/| | |
| * | | Add Roman's layout with QWERTYRoman Zolotarev2016-04-264-0/+1246
| * | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareRoman Zolotarev2016-04-2629-5353/+8864
| |\ \ \
| * | | | Add Roman's single layer layout based on NormanRoman Zolotarev2016-04-164-0/+1165
* | | | | Beginner's keymap for Ergodox-EZAnand Babu (AB) Periasamy2016-04-305-0/+1692
* | | | | Merge pull request #295 from techtomas/techtomasErez Zukerman2016-04-303-0/+1433
|\ \ \ \ \
| * | | | | Added readmeThomas Anderson2016-04-291-0/+36
| * | | | | Finalized my personal layoutThomas Anderson2016-04-292-0/+1397
* | | | | | Adds brackets to inner vertical keys in experimental layoutErez Zukerman2016-04-293-12/+21
| |_|_|/ / |/| | | |
* | | | | Addresses #290Erez Zukerman2016-04-291-1/+1
|/ / / /
* | / / Honing in on an interval that works for meErez Zukerman2016-04-262-1081/+1081
| |/ / |/| |
* | | [Erez & Jack] Examples for advanced macro stuffErez Zukerman2016-04-262-1069/+1132
* | | Merge pull request #282 from jasontwong/masterErez Zukerman2016-04-254-0/+1399
|\ \ \
| * | | Compiled Hex FileJason T. Wong2016-04-241-0/+1159
| * | | Update keymap imageJason T. Wong2016-04-231-0/+0
| * | | Add new keymapJason T. Wong2016-04-233-0/+240
* | | | Add Twey's keymapJames ‘Twey’ Kay2016-04-253-0/+1366
|/ / /
* | | changed the macro generation of the ELG to use UP, DOWN, TYPE instead of U,D,...Stephan Bösebeck2016-04-201-24/+24
* | | added some words about the ELG in the readmeStephan Bösebeck2016-04-201-0/+13
* | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-04-207-1326/+1337
|\ \ \
| * \ \ 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