Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 | ||||
* | | | 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 | 68 | -4025/+23927 |
| |\ \ | |||||
| * | | | 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 |
| | | | |||||
* | | | 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 | 29 | -5353/+8864 |
| |\ \ \ | |||||
| * | | | | Add Roman's single layer layout based on Norman | Roman Zolotarev | 2016-04-16 | 4 | -0/+1165 |
| | | | | | |||||
* | | | | | Beginner's keymap for Ergodox-EZ | Anand Babu (AB) Periasamy | 2016-04-30 | 5 | -0/+1692 |
| | | | | | |||||
* | | | | | Merge pull request #295 from techtomas/techtomas | Erez Zukerman | 2016-04-30 | 3 | -0/+1433 |
|\ \ \ \ \ | | | | | | | | | | | | | Add my layout to the list | ||||
| * | | | | | Added readme | Thomas Anderson | 2016-04-29 | 1 | -0/+36 |
| | | | | | | |||||
| * | | | | | Finalized my personal layout | Thomas Anderson | 2016-04-29 | 2 | -0/+1397 |
| | |_|/ / | |/| | | | |||||
* / | | | | Adds brackets to inner vertical keys in experimental layout | Erez Zukerman | 2016-04-29 | 3 | -12/+21 |
|/ / / / | |||||
* | / / | Honing in on an interval that works for me | Erez Zukerman | 2016-04-26 | 2 | -1081/+1081 |
| |/ / |/| | | |||||
* | | | [Erez & Jack] Examples for advanced macro stuff | Erez Zukerman | 2016-04-26 | 2 | -1069/+1132 |
| | | | |||||
* | | | Merge pull request #282 from jasontwong/master | Erez Zukerman | 2016-04-25 | 4 | -0/+1399 |
|\ \ \ | | | | | | | | | Add new keymap | ||||
| * | | | Compiled Hex File | Jason T. Wong | 2016-04-24 | 1 | -0/+1159 |
| | | | | | | | | | | | | The keymap file to use without compilation. | ||||
| * | | | Update keymap image | Jason T. Wong | 2016-04-23 | 1 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Why: * The transparency made it ugly. This change addresses the need by: * Make transparent parts white. | ||||
| * | | | Add new keymap | Jason T. Wong | 2016-04-23 | 3 | -0/+240 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Why: * I want a custom keymap that suits my needs. This change addresses the need by: * Cloned default keymap. * Customized layout. * Updated README. * Add an image created from keyboard layout editor. | ||||
* | | | | Add Twey's keymap | James ‘Twey’ Kay | 2016-04-25 | 3 | -0/+1366 |
|/ / / | |||||
* | | | changed the macro generation of the ELG to use UP, DOWN, TYPE instead of ↵ | Stephan Bösebeck | 2016-04-20 | 1 | -24/+24 |
| | | | | | | | | | | | | U,D,T - makes it work with custom keycodes | ||||
* | | | added some words about the ELG in the readme | Stephan Bösebeck | 2016-04-20 | 1 | -0/+13 |
| | | | |||||
* | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | Stephan Bösebeck | 2016-04-20 | 7 | -1326/+1337 |
|\ \ \ | |||||
| * \ \ | Merge pull request #267 from nrrkeene/master | Erez Zukerman | 2016-04-20 | 7 | -1326/+1337 |
| |\ \ \ | | | |/ | | |/| | Improved modifier keys, code | ||||
| | * | | The Ordinary Layout is the layout you are looking for. Come and see. | Nicholas Keene | 2016-04-19 | 7 | -96/+96 |
| | | | | |||||
| | * | | The Ordinary Layout is the layout you are looking for. Come and see. | Nicholas Keene | 2016-04-14 | 5 | -1278/+1289 |
| | | | | |||||
* | | | | re-created all layouts using ErgodoxLayoutGenerator | Stephan Bösebeck | 2016-04-19 | 5 | -2546/+2544 |
| | | | | |||||
* | | | | new overview pic | Stephan Bösebeck | 2016-04-19 | 1 | -0/+0 |
| | | | | |||||
* | | | | added new macro for toggling and holiding layer | Stephan Bösebeck | 2016-04-19 | 1 | -16/+48 |
| | | | |