Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'upstream/master' | Joshua T | 2016-08-07 | 24 | -199/+2015 |
|\ | |||||
| * | Merge pull request #599 from Depariel/master | Jack Humbert | 2016-08-03 | 6 | -154/+196 |
| |\ | | | | | | | Fixed compiling errors and updated keymaps for infinity_chibios | ||||
| | * | added support for Infinity 1.1a (4th drop) matrix, no LED support yet | Depariel | 2016-07-31 | 2 | -5/+50 |
| | | | |||||
| | * | fixed typo in hasu/keymap.c | Depariel | 2016-07-31 | 1 | -1/+1 |
| | | | |||||
| | * | fixed compiling bugs in infinity_chibios.h, updated keymaps, added depariel ↵ | Depariel | 2016-07-31 | 5 | -149/+146 |
| | | | | | | | | | | | | keymap | ||||
| * | | Merge pull request #592 from sethbc/ez-sethbc | Erez Zukerman | 2016-08-02 | 3 | -0/+119 |
| |\ \ | | | | | | | | | Ez sethbc | ||||
| | * | | rebase | Seth Chandler | 2016-07-30 | 3 | -1/+1 |
| | | | | |||||
| | * | | update makefile | Seth Chandler | 2016-07-30 | 1 | -1/+1 |
| | | | | |||||
| | * | | initial commit of sethbc keymap | Seth Chandler | 2016-07-30 | 3 | -0/+119 |
| | | | | |||||
| * | | | Merge pull request #593 from J3RN/master | Erez Zukerman | 2016-08-02 | 2 | -22/+26 |
| |\ \ \ | | | | | | | | | | | Updated the J3RN ErgoDox keymap | ||||
| | * | | | Updated readme with recent changes | Jonathan Arnett | 2016-07-30 | 1 | -3/+6 |
| | | | | | |||||
| | * | | | Updated my keymap | Jack Humbert | 2016-07-30 | 3 | -21/+22 |
| | |\| | | |||||
| * | | | | Merge pull request #600 from adiabatic/master | Erez Zukerman | 2016-08-02 | 4 | -14/+1167 |
| |\ \ \ \ | | | | | | | | | | | | | zweihander-osx: add left-hand-thumb tab key | ||||
| | * | | | | Thumb ⌫ into ⇥, numpad & into :, yank home/end | Nathan Sharfi | 2016-07-31 | 3 | -13/+1166 |
| | | | | | | | | | | | | | | | | | | | | | | | | Also: add (back?) in the light-shine disabler | ||||
| | * | | | | Merge branch 'master' of github.com:jackhumbert/qmk_firmware | Nathan Sharfi | 2016-07-31 | 1 | -1/+1 |
| | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # keyboard/ergodox_ez/keymaps/zweihander-osx/keymap.c # keyboard/ergodox_ez/keymaps/zweihander-osx/zweihander-osx.hex | ||||
| * | | | | Updates ErgoDox readme | Erez Zukerman | 2016-08-01 | 1 | -9/+6 |
| | | | | | |||||
| * | | | | Merge pull request #596 from fredizzimo/rid_of_quick | Jack Humbert | 2016-08-01 | 5 | -0/+5 |
| |\ \ \ \ | | |/ / / | |/| | | | Fix the makefile dependencies and remove quick targets | ||||
| | * | | | Generate version information to version.h | Fred Sundvik | 2016-07-31 | 5 | -0/+5 |
| | | |/ | | |/| | | | | | | | | | So that only the files that really needs a version are recompiled. | ||||
| * | | | Update readme.md | JeeBak Kim | 2016-07-30 | 1 | -1/+106 |
| | | | | |||||
| * | | | Add additional shortcut keymaps to TOUCHCURSOR layer | JeeBak Kim | 2016-07-30 | 1 | -4/+7 |
| | | | | |||||
| * | | | Add additional maps for [, and ], to LOWER | JeeBak Kim | 2016-07-30 | 1 | -4/+4 |
| | | | | |||||
| * | | | Make RAISE layer an all numbers/arithmatic layer | JeeBak Kim | 2016-07-30 | 1 | -6/+6 |
| | | | | |||||
| * | | | Move reset to a less accessible location | JeeBak Kim | 2016-07-30 | 1 | -4/+4 |
| | | | | |||||
| * | | | Add -, +, and . to RAISE | JeeBak Kim | 2016-07-30 | 1 | -4/+4 |
| | | | | |||||
| * | | | Change calls from persistant_default_layer_set() to default_layer_set() | JeeBak Kim | 2016-07-30 | 1 | -3/+3 |
| | | | | |||||
| * | | | PrintScreen and RGUI replace BACKLIT and Ctrl. Move BACKLIT to LOWER/RAISE ↵ | JeeBak Kim | 2016-07-30 | 1 | -10/+10 |
| | | | | | | | | | | | | | | | | layers | ||||
| * | | | Media keys for all the "regular" layers | JeeBak Kim | 2016-07-30 | 1 | -10/+10 |
| | | | | |||||
| * | | | Add mouse layer, and remove default arrow keys (touchcursor only, now) | JeeBak Kim | 2016-07-30 | 1 | -15/+36 |
| | | | | |||||
| * | | | Add numbers to _RAISE | JeeBak Kim | 2016-07-30 | 1 | -4/+4 |
| | | | | |||||
| * | | | Move _RAISE symbols to _LOWER | JeeBak Kim | 2016-07-30 | 1 | -6/+6 |
| | | | | |||||
| * | | | Tap for Enter, hold for Shift | JeeBak Kim | 2016-07-30 | 1 | -30/+31 |
| | | | | |||||
| * | | | Add personalized TouchCursor layer | JeeBak Kim | 2016-07-30 | 1 | -6/+28 |
| | | | | |||||
| * | | | Tap for Esc, hold for Control | JeeBak Kim | 2016-07-30 | 1 | -30/+33 |
| | | | | |||||
| * | | | Add "jeebak" keymap folder as a copy of the "default" folder | JeeBak Kim | 2016-07-30 | 3 | -0/+341 |
| |/ / | |||||
* | | | Moved PREVENT_STUCK_MODIFIERS to config.h | Joshua T | 2016-07-30 | 2 | -3/+3 |
| | | | |||||
* | | | Moved my Ergodox keymap to match upstream changes | Joshua T | 2016-07-30 | 2 | -8/+10 |
| | | | |||||
* | | | Merge remote-tracking branch 'upstream/master' | Joshua T | 2016-07-30 | 234 | -1700/+2992 |
|\| | | |||||
| * | | Update some obsolete references | Gergely Nagy | 2016-07-30 | 2 | -2/+2 |
| |/ | | | | | | | | | | | | | | | | | | | | | Some links were still pointing to `/keyboards/ergodox_ez`, while the directory is `/keyboards/erdogox` now. Not all references have been updated, and some of the text here and there may need updating to mention the ErgoDox Infinity too, but that's out of the scope for this quick fix. Signed-off-by: Gergely Nagy <algernon@madhouse-project.org> | ||||
| * | Small fix for infinity include guard | Fred Sundvik | 2016-07-29 | 1 | -3/+3 |
| | | |||||
| * | Fix typo in the readme. | Fred Sundvik | 2016-07-29 | 1 | -1/+1 |
| | | |||||
| * | A couple of more Ergodox readme fixes | Fred Sundvik | 2016-07-29 | 1 | -2/+2 |
| | | |||||
| * | Unify the ErgoDox EZ and Infinity documentation | Fred Sundvik | 2016-07-29 | 1 | -8/+13 |
| | | |||||
| * | Refer to the right path in the readme | Fred Sundvik | 2016-07-29 | 1 | -1/+1 |
| | | |||||
| * | Move Ergodox readme from ez subfolder to parent | Fred Sundvik | 2016-07-29 | 1 | -0/+0 |
| | | |||||
| * | Include the main Makefile before including Ergodox infinity drivers | Fred Sundvik | 2016-07-29 | 1 | -4/+4 |
| | | |||||
| * | Move Infinity Ergodox drivers to subproject, and fix makefile | Fred Sundvik | 2016-07-29 | 14 | -2/+2 |
| | | |||||
| * | Remove the Infinity Ergodox default keymap | Fred Sundvik | 2016-07-29 | 2 | -282/+0 |
| | | |||||
| * | Cleanup the townk_osx config.h and make files | Fred Sundvik | 2016-07-29 | 2 | -52/+2 |
| | | |||||
| * | Rename supercoder config_user to config.h | Fred Sundvik | 2016-07-29 | 1 | -1/+1 |
| | | | | | | | | Also fixup the include path of parent config | ||||
| * | Fix config.h include guards | Fred Sundvik | 2016-07-29 | 2 | -4/+4 |
| | |