Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #584 from algernon/ergodox-ez/algernon | Erez Zukerman | 2016-07-29 | 4 | -28/+687 |
|\ | | | | | ergodox_ez: Upgrade my keymap to v1.4 | ||||
| * | ergodox_ez: Upgrade my keymap to v1.4 | Gergely Nagy | 2016-07-29 | 4 | -28/+687 |
| | | | | | | | | | | | | | | | | | | | | * When toggling the key logging on or off, the LEDs will do a little dance. * The keylogger is now optional, but enabled by default. Use `KEYLOGGER_ENABLE=no` on the `make` command line to disable it. * The `TAB`/`ARRW` key was turned into a tap-dance key, allowing one to toggle the **ARROW** layer on by double-tapping, and as such, avoid the need to hold the key. * The `-`/`_` key was turned into a tap-dance key too. * There is now a way to travel time with the keyboard, toggle the feature on by hitting `LEAD t`. Signed-off-by: Gergely Nagy <algernon@madhouse-project.org> | ||||
* | | Merge pull request #583 from coderkun/coderkun_neo2 | Erez Zukerman | 2016-07-29 | 2 | -7/+15 |
|\ \ | | | | | | | Ergodox EZ: update keymap “coderkun_neo2” | ||||
| * | | disable sleep LED | coderkun | 2016-07-29 | 1 | -1/+2 |
| | | | |||||
| * | | complete labels for modifiers in keymap schema | coderkun | 2016-07-29 | 1 | -2/+2 |
| | | | |||||
| * | | use Ergodox EZ’s third LED for “scroll lock” | coderkun | 2016-07-29 | 1 | -2/+9 |
| | | | |||||
| * | | fix grave (GRV) and acute (ACUT) accents | coderkun | 2016-07-29 | 1 | -2/+2 |
| |/ | |||||
* | | Merge pull request #580 from MatsLanGoH/patch-1 | Erez Zukerman | 2016-07-29 | 1 | -1/+1 |
|\ \ | |/ |/| | Fixed a typo | ||||
| * | Fixed a typo | Matthias | 2016-07-29 | 1 | -1/+1 |
|/ | | | Fixed a typo in line 738 'void martix_init' to 'void matrix_init' | ||||
* | Merge pull request #578 from 0xdec/master | Jack Humbert | 2016-07-28 | 4 | -0/+234 |
|\ | | | | | 0xdec Preonic keymap | ||||
| * | Create 0xdec Preonic keymap | Jordi Orlando | 2016-07-28 | 4 | -0/+234 |
| | | | | | | | | An ergonomically optimized Colemak keymap for the grid-layout Preonic | ||||
* | | Merge pull request #577 from hot-leaf-juice/master | Jack Humbert | 2016-07-28 | 3 | -0/+211 |
|\ \ | | | | | | | Pull request to include my keymap if you want it! | ||||
| * | | Added readme.md for custom layout. | Callum Oakley | 2016-07-28 | 1 | -0/+48 |
| | | | |||||
| * | | Added custom keymap. | Callum Oakley | 2016-07-27 | 2 | -0/+163 |
| | | | | | | | | | | | | Added custom keymap. | ||||
* | | | Merge pull request #573 from algernon/f/make-all-stop-on-error | Jack Humbert | 2016-07-28 | 1 | -2/+2 |
|\ \ \ | |_|/ |/| | | tmk_core/rules.mk: Make PRINT_ERROR* stop on error | ||||
| * | | tmk_core/rules.mk: Make PRINT_ERROR* stop on error | Gergely Nagy | 2016-07-27 | 1 | -2/+2 |
| |/ | | | | | | | | | | | | | Instead of `&& false`, explicitly `exit 1` to make the rules using these macros fail. This fixes #571, and likely breaks Travis badly. Signed-off-by: Gergely Nagy <algernon@madhouse-project.org> | ||||
* | | Merge pull request #572 from algernon/f/tap-dance-debug | Jack Humbert | 2016-07-28 | 2 | -0/+16 |
|\ \ | | | | | | | tap-dance: Add some debugging support | ||||
| * | | tap-dance: Add some debugging support | Gergely Nagy | 2016-07-27 | 2 | -0/+16 |
| |/ | | | | | | | Signed-off-by: Gergely Nagy <algernon@madhouse-project.org> | ||||
* | | Merge pull request #570 from sethbc/fix_bone2planck_build | Jack Humbert | 2016-07-28 | 1 | -10/+8 |
|\ \ | | | | | | | Fix bone2planck build | ||||
| * | | remove unnecessary includes | Seth Chandler | 2016-07-27 | 1 | -2/+0 |
| | | | |||||
| * | | fix numerous errors in bone2planck keymap | Seth Chandler | 2016-07-27 | 1 | -10/+10 |
| |/ | |||||
* | | Merge pull request #569 from sethbc/fix_stanleylai_warnings | Jack Humbert | 2016-07-28 | 1 | -10/+5 |
|\ \ | | | | | | | kill warnings filling up travis buildlog | ||||
| * | | kill warnings filling up travis buildlog | Seth Chandler | 2016-07-27 | 1 | -10/+5 |
| |/ | |||||
* | | Merge pull request #568 from sethbc/fix-colemak-osx-pc-no | Jack Humbert | 2016-07-28 | 1 | -1/+1 |
|\ \ | | | | | | | update NO_AMP to NO_AMPR | ||||
| * | | update NO_AMP to NO_AMPR | Seth Chandler | 2016-07-27 | 1 | -1/+1 |
| |/ | |||||
* | | Merge pull request #566 from SmackleFunky/master | Jack Humbert | 2016-07-28 | 1 | -2/+2 |
|\ \ | | | | | | | Allow toggling out of plover layer | ||||
| * | | Allow toggling out of plover layer | SmackleFunky | 2016-07-27 | 1 | -2/+2 |
| |/ | |||||
* | | Merge pull request #559 from Talljoe/fix-compiler-warning | Jack Humbert | 2016-07-28 | 1 | -1/+1 |
|\ \ | | | | | | | Fix compiler warning when PREVENT_STUCK_MODIFIERS is enabled. | ||||
| * | | Fix compiler warning when PREVENT_STUCK_MODIFIERS is enabled. | Joe Wasson | 2016-07-24 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #564 from mazinbokhari/master | Jack Humbert | 2016-07-28 | 2 | -0/+0 |
|\ \ \ | |_|/ |/| | | Move to keyboards | ||||
| * | | Move to keyboards | Mazin Bokhari | 2016-07-26 | 2 | -0/+0 |
|/ / | |||||
* | | Merge pull request #562 from michaelklos/doc | Erez Zukerman | 2016-07-26 | 1 | -1/+26 |
|\ \ | | | | | | | Added Tap Dance Example | ||||
| * | | Added Tap Dance Example | Michael Klos | 2016-07-26 | 1 | -1/+26 |
| | | | | | | | | | | | | Added (simple) Tap Dance example implementation steps. | ||||
* | | | Merge pull request #533 from mazinbokhari/master | Erez Zukerman | 2016-07-26 | 2 | -0/+350 |
|\ \ \ | |/ / |/| | | Add my layout optimized for working in emacs, vim, command line, etc. | ||||
| * | | Delete default.png | erlo muvman | 2016-07-25 | 1 | -0/+0 |
| | | | |||||
| * | | Delete default_highres.png | erlo muvman | 2016-07-25 | 1 | -0/+0 |
| | | | |||||
| * | | Update readme.md | erlo muvman | 2016-07-25 | 1 | -18/+18 |
| | | | |||||
| * | | Update readme.md | erlo muvman | 2016-07-25 | 1 | -18/+18 |
| | | | |||||
| * | | Update readme.md | erlo muvman | 2016-07-25 | 1 | -6/+0 |
| | | | |||||
| * | | Update readme. My layout optimized for emacs & vim | Mazin Bokhari | 2016-07-17 | 1 | -0/+1 |
| | | | |||||
| * | | Update readme. My layout optimized for emacs & vim | Mazin Bokhari | 2016-07-17 | 1 | -27/+61 |
| | | | |||||
| * | | Merge branch 'master' of https://github.com/mazinbokhari/qmk_firmware | Mazin Bokhari | 2016-07-17 | 1 | -5/+87 |
| |\ \ | |||||
| | * | | Update readme.md | Mazin Bokhari | 2016-06-22 | 1 | -1/+1 |
| | | | | |||||
| | * | | Update readme.md | Mazin Bokhari | 2016-06-22 | 1 | -50/+49 |
| | | | | |||||
| | * | | Update readme.md | Mazin Bokhari | 2016-06-22 | 1 | -1/+1 |
| | | | | |||||
| | * | | Update readme.md | Mazin Bokhari | 2016-06-22 | 1 | -1/+14 |
| | | | | |||||
| | * | | Update readme.md | Mazin Bokhari | 2016-06-22 | 1 | -22/+22 |
| | | | | |||||
| | * | | Update readme.md | Mazin Bokhari | 2016-06-22 | 1 | -0/+70 |
| | | | | |||||
| * | | | Add caps lock; sucks that there is no light for it... | Mazin Bokhari | 2016-07-17 | 1 | -6/+2 |
| | | | | |||||
| * | | | Remove more keys | Mazin Bokhari | 2016-07-17 | 1 | -9/+9 |
| | | | |