Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | Merge remote-tracking branch 'upstream/master' | Tobias Matt | 2016-05-13 | 41 | -2786/+11204 | |
| |\ \ \ \ | ||||||
| * | | | | | switch shift and enter thumb key | Tobias Matt | 2016-04-28 | 2 | -5/+5 | |
| | | | | | | ||||||
| * | | | | | update hex file | Tobias Matt | 2016-04-28 | 1 | -1/+1 | |
| | | | | | | ||||||
| * | | | | | shift to thumb key | Tobias Matt | 2016-04-28 | 1 | -3/+3 | |
| | | | | | | ||||||
| * | | | | | add hex file | Tobias Matt | 2016-04-26 | 1 | -0/+1152 | |
| | | | | | | ||||||
| * | | | | | organize in subfolder | Tobias Matt | 2016-04-26 | 1 | -0/+0 | |
| | | | | | | ||||||
| * | | | | | basic layout | Bubblepoint | 2016-04-26 | 1 | -0/+185 | |
| | | | | | | ||||||
* | | | | | | Merge pull request #320 from Townk/townkmap | Erez Zukerman | 2016-05-13 | 8 | -0/+1624 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Townkmap | |||||
| * | | | | | | Remove unused variable on the keymap. | Thiago Alves | 2016-05-11 | 1 | -2/+0 | |
| | | | | | | | ||||||
| * | | | | | | Add an initial Readme to the keymap. | Thiago Alves | 2016-05-11 | 4 | -0/+77 | |
| | | | | | | | ||||||
| * | | | | | | Tweak some key positions and changed macro location. | Thiago Alves | 2016-05-10 | 2 | -1242/+1229 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After using the layout a while I learn that the - and = positions should be swapped since I keep typing = when I intend to type -. I also, removed the only macro from the top left on the right hand to put the power button there and since I never use the arrow keys on the separated groups of keys, I added 4 macros there to get a feel for it. | |||||
| * | | | | | | Add custom config.h and revert the changes on the global one. | Thiago Alves | 2016-05-10 | 3 | -2/+94 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some options I defined on the config.h file don't make much sense to other keymaps so I revert the global config.h and add those options on the keymap custom one. | |||||
| * | | | | | | Update the .hex file on the keymap folder. | Thiago Alves | 2016-05-09 | 1 | -1166/+1179 | |
| | | | | | | | ||||||
| * | | | | | | Revert the Makefile to the original one. | Thiago Alves | 2016-05-09 | 2 | -1/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure I customize things as much as possible inside the keymap itself. | |||||
| * | | | | | | Change the access to the extra layer to be simetric. | Thiago Alves | 2016-05-09 | 2 | -27/+27 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of having a key on the left side for one layer and a key on the right side for the other layer, I put two dedicated layers on each side to get to the proper layers. | |||||
| * | | | | | | Add my personal keymap for OSX use. | Thiago Alves | 2016-05-09 | 4 | -1/+1456 | |
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This keymap was created to have a feel keys on a different place and to have as fewer layers as possible. Currently I have only 2 extra layers and only one of them is really required to have all possible keys available. Check out the README.md file for more information. | |||||
* | | | | | | 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 branch 'master' of https://github.com/jackhumbert/qmk_firmware | Stephan Bösebeck | 2016-05-11 | 18 | -2497/+2629 | |
|\| | | | | | ||||||
| * | | | | | 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 | |
| | | | | | | | | ||||||
* | | | | | | | | 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 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 | 69 | -4027/+23929 | |
| | |\ \ \ \ \ \ | ||||||
| | * | | | | | | | The Ordinary Layout is the layout you are looking for. Come and see v3.14. | Nicholas Keene | 2016-05-01 | 7 | -1541/+1469 | |
| | | | | | | | | | ||||||
* | | | | | | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | Stephan Bösebeck | 2016-05-04 | 1 | -0/+3 | |
|\| | | | | | | | | ||||||
| * | | | | | | | | 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 | |
| | | | | | | | | ||||||
* | | | | | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | Stephan Bösebeck | 2016-05-03 | 1 | -58/+50 | |
|\| | | | | | | | ||||||
| * | | | | | | | 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 branch 'master' of https://github.com/jackhumbert/qmk_firmware | Stephan Bösebeck | 2016-05-02 | 14 | -0/+5137 | |
|\| | | | | | | | ||||||
| * | | | | | | | 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 | |
| | | | | | | | |