summaryrefslogtreecommitdiffstats
path: root/keyboard/ergodox_ez/keymaps
Commit message (Expand)AuthorAgeFilesLines
* Add notesMazin Bokhari2016-05-251-0/+2
* Add gui macro to bksp and tab (second outter-most keys) on both thumb clustersMazin Bokhari2016-05-251-2/+2
* Tap then hold built-in functionality actually overrides the ctrl/alt/etc. macrosMazin Bokhari2016-05-251-1/+1
* Change mouse clicks to j and kMazin Bokhari2016-05-251-3/+4
* Update layout vizMazin Bokhari2016-05-251-4/+4
* Add todo: windows and nix layersMazin Bokhari2016-05-251-0/+1
* Add todo: override holding macro functionlityMazin Bokhari2016-05-251-0/+1
* Add ctrl macro to spc and ent on thumb cluster (outter-most keys_)Mazin Bokhari2016-05-251-2/+2
* Change rr3c1 from quotes/gui to quotes/ctlMazin Bokhari2016-05-251-2/+2
* Change r3c1 from backspace to esc/controlMazin Bokhari2016-05-251-4/+4
* Change r2c1 from Del to TabMazin Bokhari2016-05-251-1/+1
* Initial commit of keymaps/maz with default configMazin Bokhari2016-05-244-0/+194
* Merge pull request #324 from Bubblepoint/masterErez Zukerman2016-05-193-0/+1344
|\
| * readme addedTobias Matt2016-05-141-0/+7
| * Merge remote-tracking branch 'upstream/master'Tobias Matt2016-05-1339-2785/+11187
| |\
| * | switch shift and enter thumb keyTobias Matt2016-04-282-5/+5
| * | update hex fileTobias Matt2016-04-281-1/+1
| * | shift to thumb keyTobias Matt2016-04-281-3/+3
| * | add hex fileTobias Matt2016-04-261-0/+1152
| * | organize in subfolderTobias Matt2016-04-261-0/+0
| * | basic layoutBubblepoint2016-04-261-0/+185
* | | 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-102-0/+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-091-0/+2
| * | | 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-092-0/+1453
| | |/ | |/|
* | | 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-1117-2497/+2613
|\| |
| * | 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
* | | | | 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
|\| | | |