Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | 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 | |
| | | | | | ||||||
| | * | | | 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 | |
| | | | | | | | ||||||
* | | | | | | | new version of the experimental layout. changed media keys in MDIA layer | Stephan Bösebeck | 2016-05-02 | 4 | -8/+1500 | |
|/ / / / / / | ||||||
* | | | | | | 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 | |
| |_|_|/ / / |/| | | | | | ||||||
* | | | | | | Addresses #290 | Erez Zukerman | 2016-04-29 | 1 | -1/+1 | |
|/ / / / / | ||||||
* | / / / | 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 | |
| | | | | ||||||
* | | | | new experimental layout | Stephan Bösebeck | 2016-04-19 | 2 | -33/+31 | |
| | | | | ||||||
* | | | | added smly layer again | Stephan Bösebeck | 2016-04-18 | 1 | -2/+2 | |
| | | | | ||||||
* | | | | new png | Stephan Bösebeck | 2016-04-17 | 1 | -0/+0 | |
| | | | |