summaryrefslogtreecommitdiffstats
path: root/keyboard
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | Merge pull request #317 from Twey/masterErez Zukerman2016-05-132-25/+27
|\ \ \ \ | | | | | | | | | | Updates to `keymaps/twey` to the media layer and for Plover 3.0
| * | | | 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 ↵James ‘Twey’ Kay2016-05-101-12/+12
| |/ / / | | | | | | | | | | | | media layer
* | | | Merge pull request #307 from sboesebeck/masterErez Zukerman2016-05-135-11/+1503
|\ \ \ \ | |_|_|/ |/| | | minor change to default layouts
| * | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-05-1131-2681/+3730
| |\| |
| * | | 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-046-56/+68
| |\ \ \ \
| * \ \ \ \ 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
| |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * [planck] toggle plover output in app when toggling plover layer on keyboard * [planck] moved plover toggle to separate key * [planck] renamed toggle button
* | | | | | | Backlight Breathing for Planck and AtomicJack Humbert2016-05-0912-183/+1100
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Updated personal layouts * tweaked personal * Nightly - Audio Cleanup Refactored the LUTs. Abstracted some of the registers out of audio to use more functional names. Split audio into audio and audio_pwm. WIP * nightly - collapsed code * Added check for note playing to LEDs * Usability tweaks * TWEAE * nightly added extra kcs to keymap common * turned on Plank audio * Added backlight breathing to atomic * reverted accidental merge * adds backlight pulse to planck
* | | | | | | 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
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Add KC_LABK and KC_RABK (< and >)
| * | | | | | | Rearrange code layer on ZweihanderNathan Sharfi2016-05-061-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Makes it more like the iOS keyboard (and therefore easier to remember). Also adds angle brackets for HTML and comparisons.
| * | | | | | | 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
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Lock layers by pressing both shift keys
| * | | | | | | | 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 ↵Nicholas Keene2016-05-049-1249/+1284
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | EZ. Come check it out.
* | | | | | | | | 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 ↵Erez Zukerman2016-05-052-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | layout
* | | | | | | | | [Jack & Erez] Enables config_user.h per keymapErez Zukerman2016-05-051-0/+16
| | | | | | | | |
* | | | | | | | | updates atreus's column mappingJack Humbert2016-05-051-1/+1
| |_|_|_|_|_|/ / |/| | | | | | |
* | | | | | | | Merge pull request #305 from nrrkeene/masterErez Zukerman2016-05-047-1548/+1505
|\| | | | | | | | |_|_|_|_|/ / |/| | | | | | Custom handling for shift keys, improved media layer
| * | | | | | The Ordinary Layout is arranged as close as possible to a traditional ↵Nicholas Keene2016-05-032-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | keyboard, but with extra special features
| * | | | | | 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-02197-6283/+36858
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| * | | | | | 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()
| * | | | | | zweihander: comment out action_get_macro()Nathan Sharfi2016-05-031-0/+3
| | | | | | |
* | | | | | | Clarified audio.c (#302)IBNobody2016-05-035-56/+65
| |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Updated personal layouts * tweaked personal * Nightly - Audio Cleanup Refactored the LUTs. Abstracted some of the registers out of audio to use more functional names. Split audio into audio and audio_pwm. WIP * nightly - collapsed code * Added check for note playing to LEDs
* | | | | | Swap steno/media layers to allow using media keys in the Plover layer; ↵James ‘Twey’ Kay2016-05-021-58/+50
| |_|_|/ / |/| | | | | | | | | | | | | | display all active layers, not just the top; use only momentary modifiers
* | | | | Merge pull request #298 from adiabatic/ergodox-zweihander-osxErez Zukerman2016-05-023-0/+1381
|\| | | | | | | | | | | | | | ergodox-zweihander-osx: initial commit
| * | | | 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
|\ \ \ \ | | | | | | | | | | Add my Ergodox EZ config
| * | | | Adding .hex filesneako2016-04-281-0/+1152
| | | | |
| * | | | Add my Ergodox EZ configsneako2016-04-282-0/+193
| | | | |
* | | | | Merge pull request #258 from romanzolotarev/masterErez Zukerma