Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #317 from Twey/master | Erez Zukerman | 2016-05-13 | 2 | -25/+27 |
|\ | | | | | Updates to `keymaps/twey` to the media layer and for Plover 3.0 | ||||
| * | keymaps/twey: fix documentation | James ‘Twey’ Kay | 2016-05-10 | 1 | -2/+2 |
| | | |||||
| * | keymaps/twey: Plover 3.0 has a standard TOGGLE keybinding; use that instead | James ‘Twey’ Kay | 2016-05-10 | 2 | -11/+13 |
| | | |||||
| * | keymaps/twey: Add more history keys to media layer; stop using toggleable ↵ | James ‘Twey’ Kay | 2016-05-10 | 1 | -12/+12 |
| | | | | | | | | media layer | ||||
* | | Merge pull request #307 from sboesebeck/master | Erez Zukerman | 2016-05-13 | 5 | -11/+1503 |
|\ \ | | | | | | | minor change to default layouts | ||||
| * | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | Stephan Bösebeck | 2016-05-11 | 31 | -2681/+3730 |
| |\| | |||||
| * | | remove typo | Stephan Bösebeck | 2016-05-05 | 1 | -1/+1 |
| | | | |||||
| * | | making default osx more ELG conform | Stephan Bösebeck | 2016-05-05 | 1 | -4/+4 |
| | | | |||||
| * | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | Stephan Bösebeck | 2016-05-05 | 7 | -1548/+1505 |
| |\ \ | |||||
| * \ \ | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | Stephan Bösebeck | 2016-05-04 | 6 | -56/+68 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | Stephan Bösebeck | 2016-05-03 | 1 | -58/+50 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | Stephan Bösebeck | 2016-05-02 | 14 | -0/+5137 |
| |\ \ \ \ \ | |||||
| * | | | | | | new version of the experimental layout. changed media keys in MDIA layer | Stephan Bösebeck | 2016-05-02 | 4 | -8/+1500 |
| | | | | | | | |||||
* | | | | | | | [planck] adds button for toggling output in plover app (#323) | cwhits | 2016-05-12 | 1 | -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 Atomic | Jack Humbert | 2016-05-09 | 12 | -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 legend | Erez Zukerman | 2016-05-08 | 2 | -4/+4 |
| | | | | | | |||||
* | | | | | | A little more tweaking | Erez Zukerman | 2016-05-08 | 2 | -12/+12 |
| | | | | | | |||||
* | | | | | | Tweaks layers 1 & 2 in my experimental layout | Erez Zukerman | 2016-05-08 | 3 | -29/+37 |
| | | | | | | |||||
* | | | | | | Merge pull request #311 from adiabatic/ergodox-zweihander-osx | Erez Zukerman | 2016-05-06 | 1 | -10/+10 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Add KC_LABK and KC_RABK (< and >) | ||||
| * | | | | | | Rearrange code layer on Zweihander | Nathan Sharfi | 2016-05-06 | 1 | -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 keys | Nathan Sharfi | 2016-05-06 | 1 | -4/+4 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #310 from nrrkeene/master | Erez Zukerman | 2016-05-06 | 11 | -1317/+1400 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Lock layers by pressing both shift keys | ||||
| * | | | | | | | The Ordinary Layout is the layout you are looking for. Come and see. | Nicholas Keene | 2016-05-05 | 2 | -1075/+1075 |
| | | | | | | | | |||||
| * | | | | | | | The Ordinary Layout is extraordinarily familiar and powerful | Nicholas Keene | 2016-05-05 | 11 | -1325/+1373 |
| | | | | | | | | |||||
| * | | | | | | | The Ordinary Layout is the most natural and powerful layout for the Ergodox ↵ | Nicholas Keene | 2016-05-04 | 9 | -1249/+1284 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | EZ. Come check it out. | ||||
* | | | | | | | | Uses @eltang's famous macro! Still not perfect though :( | Erez Zukerman | 2016-05-05 | 2 | -1150/+1162 |
| | | | | | | | | |||||
* | | | | | | | | [Jack & Erez] Creates a makefile.mk and a config file for the experimental ↵ | Erez Zukerman | 2016-05-05 | 2 | -0/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | layout | ||||
* | | | | | | | | [Jack & Erez] Enables config_user.h per keymap | Erez Zukerman | 2016-05-05 | 1 | -0/+16 |
| | | | | | | | | |||||
* | | | | | | | | updates atreus's column mapping | Jack Humbert | 2016-05-05 | 1 | -1/+1 |
| |_|_|_|_|_|/ |/| | | | | | | |||||
* | | | | | | | Merge pull request #305 from nrrkeene/master | Erez Zukerman | 2016-05-04 | 7 | -1548/+1505 |
|\| | | | | | | |_|_|_|_|/ |/| | | | | | Custom handling for shift keys, improved media layer | ||||
| * | | | | | The Ordinary Layout is arranged as close as possible to a traditional ↵ | Nicholas Keene | 2016-05-03 | 2 | -5/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | keyboard, but with extra special features | ||||
| * | | | | | The Ordinary Layout works the way you expect it to, with extra powerful features | Nicholas Keene | 2016-05-03 | 1 | -979/+1008 |
| | | | | | | |||||
| * | | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | Nicholas Keene | 2016-05-02 | 197 | -6283/+36858 |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | |||||
| * | | | | | The Ordinary Layout is the layout you are looking for. Come and see v3.14. | Nicholas Keene | 2016-05-01 | 7 | -1541/+1469 |
| | | | | | | |||||
* | | | | | | Merge pull request #304 from adiabatic/ergodox-zweihander-osx | Erez Zukerman | 2016-05-03 | 1 | -0/+3 |
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | zweihander: comment out action_get_macro() | ||||
| * | | | | | zweihander: comment out action_get_macro() | Nathan Sharfi | 2016-05-03 | 1 | -0/+3 |
| | | | | | | |||||
* | | | | | | Clarified audio.c (#302) | IBNobody | 2016-05-03 | 5 | -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’ Kay | 2016-05-02 | 1 | -58/+50 |
| |_|_|/ |/| | | | | | | | | | | | display all active layers, not just the top; use only momentary modifiers | ||||
* | | | | Merge pull request #298 from adiabatic/ergodox-zweihander-osx | Erez Zukerman | 2016-05-02 | 3 | -0/+1381 |
|\| | | | | | | | | | | | ergodox-zweihander-osx: initial commit | ||||
| * | | | zweihander: move dim/brighten to 1/2, add ⌘Q | Nathan Sharfi | 2016-05-01 | 2 | -11/+11 |
| | | | | |||||
| * | | | zweihander: Add ⌘`, ⌘⇧`, ⌥⇥, ⌥⇧⇥ | Nathan Sharfi | 2016-05-01 | 3 | -11/+16 |
| | | | | |||||
| * | | | Ergodox EZ: add zweihander-osx.hex | Nathan Sharfi | 2016-04-30 | 1 | -0/+1152 |
| | | | | |||||
| * | | | ergodox-zweihander: initial commit | Nathan Sharfi | 2016-04-30 | 2 | -0/+224 |
| | |/ | |/| | |||||
* | | | Merge pull request #294 from sneako/master | Erez Zukerman | 2016-05-02 | 3 | -0/+1345 |
|\ \ \ | | | | | | | | | Add my Ergodox EZ config | ||||
| * | | | Adding .hex file | sneako | 2016-04-28 | 1 | -0/+1152 |
| | | | | |||||
| * | | | Add my Ergodox EZ config | sneako | 2016-04-28 | 2 | -0/+193 |
| | | | | |||||
* | | | | Merge pull request #258 from romanzolotarev/master | Erez Zukerman | 2016-05-02 | 8 | -0/+2411 |
|\ \ \ \ | |_|/ / |/| | | | Add Roman's single layer layout based on Norman | ||||
| * | | | Add Roman's layout with QWERTY | Roman Zolotarev | 2016-04-26 | 4 | -0/+1246 |
| | | | | |||||
| * | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | Roman Zolotarev | 2016-04-26 | 62 | -8604/+16404 |
| |\ \ \ | |||||
| * | | | | Add Roman's single layer layout based on Norman | Roman Zolotarev | 2016-04-16 | 4 | -0/+1165 |
| | | | | |