summaryrefslogtreecommitdiffstats
path: root/keyboard/ergodox_ez
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #320 from Townk/townkmapErez Zukerman2016-05-138-0/+1624
|\
| * Remove unused variable on the keymap.Thiago Alves2016-05-111-2/+0
| * Add an initial Readme to the keymap.Thiago Alves2016-05-114-0/+77
| * Tweak some key positions and changed macro location.Thiago Alves2016-05-102-1242/+1229
| * Add custom config.h and revert the changes on the global one.Thiago Alves2016-05-103-2/+94
| * Update the .hex file on the keymap folder.Thiago Alves2016-05-091-1166/+1179
| * Revert the Makefile to the original one.Thiago Alves2016-05-092-1/+3
| * Change the access to the extra layer to be simetric.Thiago Alves2016-05-092-27/+27
| * Add my personal keymap for OSX use.Thiago Alves2016-05-094-1/+1456
* | Merge pull request #317 from Twey/masterErez Zukerman2016-05-132-25/+27
|\ \
| * | keymaps/twey: fix documentationJames ‘Twey’ Kay2016-05-101-2/+2
| * | keymaps/twey: Plover 3.0 has a standard TOGGLE keybinding; use that insteadJames ‘Twey’ Kay2016-05-102-11/+13
| * | keymaps/twey: Add more history keys to media layer; stop using toggleable med...James ‘Twey’ Kay2016-05-101-12/+12
| |/
* | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-05-1118-2497/+2629
|\|
| * Adds next tab/prev tab back to symb layer and updates legendErez Zukerman2016-05-082-4/+4
| * 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
* | | | remove typoStephan Bösebeck2016-05-051-1/+1
* | | | making default osx more ELG conformStephan Bösebeck2016-05-051-4/+4
* | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-05-057-1548/+1505
|\| | |
| * | | 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 branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-05-041-0/+3
|\| | | |
| * | | | 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
* | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-05-031-58/+50
|\| | |
| * | | Swap steno/media layers to allow using media keys in the Plover layer; displa...James ‘Twey’ Kay2016-05-021-58/+50
* | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-05-0214-0/+5137
|\| | |
| * | | 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
| |\ \ \ \ | | |_|/ / | |/| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-01 12:22:55 +0000