Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | cbbrowne | 2016-09-07 | 45 | -797/+2748 |
|\ | |||||
| * | Merge pull request #732 from romanzolotarev/master | Erez Zukerman | 2016-09-06 | 2 | -27/+40 |
| |\ | | | | | | | Change CTL_T(KC_ESC) to KC_LCTRL and update readme | ||||
| | * | Change CTL_T(KC_ESC) to KC_LCTRL and update readme | Roman Zolotarev | 2016-09-07 | 2 | -27/+40 |
| | | | |||||
| * | | norwegian programmer-friendly layout | joar | 2016-09-06 | 6 | -0/+420 |
| |/ | |||||
| * | Merge pull request #728 from fitzsim/yoruian | Erez Zukerman | 2016-09-06 | 6 | -0/+277 |
| |\ | | | | | | | Add new ErgoDox EZ keymap, YORUIAN | ||||
| | * | Fix ergodox_yoruian XKB naming | Thomas Fitzsimmons | 2016-09-06 | 2 | -2/+2 |
| | | | |||||
| | * | Add new ErgoDox EZ keymap, YORUIAN | Thomas Fitzsimmons | 2016-09-05 | 6 | -0/+277 |
| | | | |||||
| * | | Merge pull request #686 from coderkun/coderkun_neo2 | Erez Zukerman | 2016-09-05 | 2 | -7/+19 |
| |\ \ | | | | | | | | | Merge Ergodox keymap “coderkun_neo2” | ||||
| | * | | Add box-drawing Unicode characters to keymap “coderkun_neo2” | coderkun | 2016-08-26 | 1 | -6/+6 |
| | | | | |||||
| | * | | Set Unicode input mode and override unicode_input_start() method to keymap ↵ | coderkun | 2016-08-26 | 1 | -2/+14 |
| | | | | | | | | | | | | | | | | “coderkun_neo2” | ||||
| | * | | Disable debugging for Ergodox keymap “coderkun_neo2” | coderkun | 2016-08-26 | 2 | -1/+1 |
| | | | | |||||
| * | | | Merge pull request #678 from algernon/ergodox-ez/algernon | Erez Zukerman | 2016-09-05 | 8 | -523/+552 |
| |\ \ \ | | |_|/ | |/| | | ergodox: Update algernon's keymap to v1.6 | ||||
| | * | | ergodox: Update algernon's keymap to v1.6 | Gergely Nagy | 2016-08-24 | 8 | -523/+552 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Major changes include: Base layer changes ------------------ * The parentheses & bracket keys have been merged: tapping them results in `[` or `{` (if it was shifted), double tapping leads to `(`. * The `:;` and `-_` keys are now available on the base layer, on their **ADORE** location, too, just below `[{(`/`]})`. * The `Apps` key has been replaced by `F12`. * The `-`/`_` is no longer a tap-dance key. ADORE layer changes ------------------- * Adjustments were made to the **ADORE** layer, to separate some inconvenient combinations. Miscellaneous changes --------------------- * `LEAD u` now starts the symbolic unicode input system, instead of the OS-one. * The mouse acceleration keys on the **Navigation and Media* layer have been turned into toggles: tap them once to turn them on, until tapped again. Tapping an accelerator button will turn all the others off. * When the **ARROW** layer is on, the *red* and *blue* LEDs light up now. Heatmap ------- * The built-in keylogger has been greatly enhanced, it now outputs the pressed state, and the layer (Dvorak or ADORE). As such, the `ADORE_AUTOLOG` option has been removed, instead there is `AUTOLOG_ENABLE` now, which when enabled, makes the keylogger start when the keyboard boots. It defaults to off. * The heatmap generator received a lot of updates. Signed-off-by: Gergely Nagy <algernon@madhouse-project.org> | ||||
| * | | | Merge pull request #724 from sgoodwin/master | Jack Humbert | 2016-09-05 | 3 | -0/+268 |
| |\ \ \ | | | | | | | | | | | Add my keymap. | ||||
| | * | | | Add my keymap. | Samuel Ryan Goodwin | 2016-09-05 | 3 | -0/+268 |
| | | | | | |||||
| * | | | | Merge pull request #719 from IBNobody/master | Jack Humbert | 2016-09-05 | 2 | -199/+238 |
| |\ \ \ \ | | | | | | | | | | | | | Updated docs to show more info on backlight breathing. | ||||
| | * | | | | Added diagonal mice macros, breathing ala Atomic | IBNobody | 2016-09-04 | 2 | -199/+238 |
| | |/ / / | |||||
| * | | | | Merge pull request #716 from MajorKoos/master | Jack Humbert | 2016-09-05 | 7 | -0/+474 |
| |\ \ \ \ | | | | | | | | | | | | | Add support for JD40 MKII PCB | ||||
| | * | | | | Add rules.mk file | Major Koos | 2016-09-02 | 1 | -0/+69 |
| | | | | | | |||||
| | * | | | | Add support for JD40 MKII PCB | Major Koos | 2016-09-02 | 6 | -0/+405 |
| | |/ / / | | | | | | | | | | | | | | | | RGB Included. | ||||
| * | | | | fixed incorrect key combination for locking screen on macOS | Callum Oakley | 2016-09-02 | 2 | -5/+5 |
| | | | | | |||||
| * | | | | changed some of the wording in the readme | Callum Oakley | 2016-09-01 | 1 | -4/+4 |
| | | | | | |||||
| * | | | | changed order of modifiers after experimentation, updated readme | Callum Oakley | 2016-09-01 | 2 | -12/+7 |
| | | | | | |||||
| * | | | | Merge remote-tracking branch 'upstream/master' | Callum Oakley | 2016-09-01 | 342 | -7039/+22799 |
| |\| | | | |||||
| | * | | | Merge branch 'master' | Jason Janse van Rensburg | 2016-08-30 | 583 | -6781/+26180 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: keyboards/planck/keymaps/bone2planck/keymap.c | ||||
| | | * | | | Update README | Jack Henahan | 2016-08-29 | 1 | -3/+9 |
| | | | | | | |||||
| | | * | | | jhenahan layout | Jack Henahan | 2016-08-29 | 4 | -0/+383 |
| | | | | | | |||||
| | * | | | | include base config.h instead of copying it | Jason Janse van Rensburg | 2016-07-26 | 1 | -88/+5 |
| | | | | | | |||||
| | * | | | | added config.h, and missing Ins of filpped navigation layer | Jason Janse van Rensburg | 2016-07-26 | 2 | -3/+93 |
| | | | | | | |||||
| | * | | | | Merged branch master into bone2planck | Jason Janse van Rensburg | 2016-07-25 | 31 | -244/+3166 |
| | |\ \ \ \ | |||||
| | * | | | | | added missing F keys in flipped layer | Jason Janse van Rensburg | 2016-07-25 | 1 | -6/+6 |
| | | | | | | | |||||
| | * | | | | | added readme | Jason Janse van Rensburg | 2016-07-24 | 1 | -0/+8 |
| | | | | | | | |||||
| | * | | | | | moved insert | Jason Janse van Rensburg | 2016-07-24 | 1 | -5/+5 |
| | | | | | | | |||||
| | * | | | | | moved ctrl | Jason Janse van Rensburg | 2016-07-24 | 1 | -11/+12 |
| | | | | | | | |||||
| | * | | | | | fixed stupid errors | Jason Janse van Rensburg | 2016-07-24 | 1 | -12/+17 |
| | | | | | | | |||||
| * | | | | | | added a lock screen key | Callum Oakley | 2016-08-12 | 1 | -3/+16 |
| | | | | | | | |||||
| * | | | | | | Merge remote-tracking branch 'upstream/master' | Callum Oakley | 2016-08-09 | 255 | -2062/+4267 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | updated readme.md to reflect keymap changes | Callum Oakley | 2016-08-09 | 1 | -2/+2 |
| | | | | | | | | |||||
| * | | | | | | | changed order of bottom row of symbol layer to ease acess to brackets | Callum Oakley | 2016-08-09 | 1 | -2/+2 |
| | | | | | | | | |||||
* | | | | | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | cbbrowne | 2016-08-29 | 139 | -5814/+6444 |
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | |||||
| * | | | | | | | Merge pull request #696 from fredizzimo/community_boards | Jack Humbert | 2016-08-27 | 1 | -19/+28 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Update list of community keyboards | ||||
| | * | | | | | | | Update list of community keyboards | Fred Sundvik | 2016-08-28 | 1 | -19/+28 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge pull request #689 from jeebak/tv44-jeebak | Jack Humbert | 2016-08-27 | 4 | -0/+596 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Port jeebak's Planck/JD45 keymap to TV44 | ||||
| | * | | | | | | | | [tv44] Port jeebak's planck keymap to tv44 | JeeBak Kim | 2016-08-26 | 3 | -69/+538 |
| | | | | | | | | | | |||||
| | * | | | | | | | | [tv44] Add "jeebak" keymap folder as a copy of the "default" folder | JeeBak Kim | 2016-08-26 | 4 | -0/+127 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Merge pull request #684 from tomb0y/kc60_workman_dead | Jack Humbert | 2016-08-27 | 2 | -4/+4 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Correct typo in kc60 workman-dead keymap | ||||
| | * | | | | | | | | | Correct typo in kc60 workman-dead keymap | zs | 2016-08-26 | 2 | -4/+4 |
| | | |_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | and rename README.md to readme.md | ||||
| * | | | | | | | | | Rename infinity_chibios to infinity60, and add readme | Fred Sundvik | 2016-08-27 | 16 | -9/+37 |
| | |_|/ / / / / / | |/| | | | | | | | |||||
| * | | | | | | | | Merge branch 'master' into fix_line_endings | Fred Sundvik | 2016-08-27 | 102 | -2716/+2713 |
| |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' into makefile_overhaul | Fred Sundvik | 2016-08-26 | 1 | -23/+142 |
| | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | | | |