aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* adds a sequencer to the music mode (#330)Jack Humbert2016-05-155-81/+122
* Leader key implementation (#326)Erez Zukerman2016-05-1520-64/+290
* Adds explanatory note re history of TMK and QMKErez Zukerman2016-05-141-1/+1
* adds Bilger321's planck keymapJacob Bilger2016-05-144-0/+1208
* 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 pull request #307 from sboesebeck/masterErez Zukerman2016-05-135-11/+1503
|\ \ \
| * \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-05-1151-2722/+4081
| |\ \ \
| * | | | 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 branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-05-0417-892/+1447
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-05-031-58/+50
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-05-0214-0/+5137
| |\ \ \ \ \ \ \
| * | | | | | | | new version of the experimental layout. changed media keys in MDIA layerStephan Bösebeck2016-05-024-8/+1500
* | | | | | | | | [planck] adds button for toggling output in plover app (#323)cwhits2016-05-121-3/+8
| |_|_|_|_|/ / / |/| | | | | | |
* | | | | | | | [Erez & Jack] Documents audio outputErez Zukerman2016-05-101-0/+49
| |_|_|_|_|/ / |/| | | | | |
* | | | | | | Update build guide with instructions to copy the whole keymap folder (#315)Peter2016-05-091-2/+2
| |_|_|_|_|/ |/| | | | |
* | | | | | Backlight Breathing for Planck and AtomicJack Humbert2016-05-0921-201/+1153
* | | | | | quantum accommodates more than 16 columnsJack Humbert2016-05-091-5/+12
* | | | | | 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-063-10/+18
|\ \ \ \ \ \
| * | | | | | Add KC_L[LR]ABK to top-level READMENathan Sharfi2016-05-061-0/+2
| * | | | | | Rearrange code layer on ZweihanderNathan Sharfi2016-05-061-6/+6
| * | | | | | Add KC_LABK and KC_RABK (< and >)Nathan Sharfi2016-05-061-0/+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
* | | | | | | | [Erez & Jack] Updates docs with one-shot information and config_user.hErez Zukerman2016-05-051-1/+13
* | | | | | | | [Jack & Erez] Defines MOD_HYPR and MOD_MEHErez Zukerman2016-05-051-0/+3
* | | | | | | | [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
* | | | | | | | [Jack & Erez] Adds an option for user-specific config.h filesErez Zukerman2016-05-051-0/+9
* | | | | | | | [Jack & Erez] Removes duplicate reference, sorts whitespaceErez Zukerman2016-05-051-2/+3