Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-02-12 | 7 | -0/+273 |
|\ | |||||
| * | [Keyboard] Add bastyl mini keyboard (#11782) | Quentin | 2021-02-11 | 7 | -0/+273 |
| | | | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> Co-authored-by: NullSense <matas234@gmail.com> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-02-12 | 6 | -7/+9 |
|\| | |||||
| * | [Keyboard] Fix noxary Product IDs (#11771) | Rozakiin | 2021-02-11 | 6 | -7/+9 |
| | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ruari <ruari.armstrong@gmail.com> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-02-12 | 11 | -0/+493 |
|\| | |||||
| * | [Keyboard] Support MJ65 - a 65% RGB Hotswap keyboard (#11764) | MelGeek | 2021-02-11 | 11 | -0/+493 |
| | | | | | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> Co-authored-by: Drashna Jaelre <drashna@live.com> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-02-10 | 12 | -488/+525 |
|\| | |||||
| * | [Keymap] add noroadsleft userspace; add and update keymaps (#11686) | James Young | 2021-02-10 | 12 | -488/+525 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-02-10 | 3 | -0/+115 |
|\| | |||||
| * | [Keymap] Added german_gaming keymap for hidtech/bastyl (#11446) | Joschua Gandert | 2021-02-10 | 3 | -0/+115 |
| | | | | | | | | | | | | | | | | * Added german_gaming keymap for hidtech/bastyl * Apply suggestions from code review * Added missing brace | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-02-10 | 2 | -4/+0 |
|\| | |||||
| * | Userspace updates (#11841) | stanrc85 | 2021-02-10 | 2 | -4/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * enable LTO for smaller firmware size * delete since this was added to userspace rules.mk * readme updates and new images * Add -j to compile and flash commands in userpsace * Enable NKRO * Enable NKRO, VIA, LTO by default * Stanrc85-ansi readme update * Stanrc85-alice readme * quick RGB layer indicator fix in keymap | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-02-10 | 9 | -0/+194 |
|\| | |||||
| * | [Keyboard] Add keyboard yun65 (#11714) | Spaceman | 2021-02-09 | 9 | -0/+194 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-02-10 | 22 | -0/+3591 |
|\| | |||||
| * | [Keyboard] Add sowbug/68keys and sowbug/ansi_tkl (#11589) | Mike Tsao | 2021-02-09 | 22 | -0/+3591 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-02-10 | 1 | -1/+1 |
|\| | |||||
| * | Play Keyboard Helen 80: fix matrix mapping (#11585) | LSChyi | 2021-02-09 | 1 | -1/+1 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-02-09 | 1 | -1/+1 |
|\| | |||||
| * | Fix VENDOR_ID for ymd67 (#11838) | Konstantin Shpits | 2021-02-10 | 1 | -1/+1 |
| | | |||||
* | | Remove FAUXCLICKY feature (deprecated) (#11829) | Drashna Jaelre | 2021-02-09 | 467 | -520/+42 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-02-09 | 12 | -0/+400 |
|\| | |||||
| * | [Keyboard] Add Splitty keyboard (#11613) | Nicolas Schodet | 2021-02-09 | 12 | -0/+400 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-02-09 | 10 | -436/+77 |
|\| | |||||
| * | Simplify NIBBLE encoder code and clean up keymaps (#11808) | Jay Greco | 2021-02-09 | 10 | -436/+77 |
| | | | | | | | | | | | | | | | | | | * Simplify encoder code and clean up keymaps. -Removed overly complex VIA encoder code. It wasn't adding any value and was confusing users who were trying to customize encoder functionality on VIA keymaps. -Replaced KC_TILDE with KC_HOME in all keymaps, as KC_TILDE sends a left shift, which was confusing some folks as they tested their build. -Move layer names to enum * Change encoder_update_kb to encoder_update_user per PR feedback | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-02-08 | 4 | -4/+4 |
|\| | |||||
| * | Fix RGBLIGHT_LIMIT_VAL typo (#11826) | Ryan | 2021-02-08 | 4 | -4/+4 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-02-07 | 3 | -47/+1 |
|\| | |||||
| * | Migrate some tmk_core files to quantum (#11791) | Joel Challis | 2021-02-07 | 3 | -47/+1 |
| | | | | | | | | | | * Migrate some tmk_core files to quantum * Fix build errors | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-02-07 | 4 | -2/+62 |
|\| | |||||
| * | via support for bat43 (#11729) | yfuku | 2021-02-07 | 4 | -2/+62 |
| | | | | | | | | | | * via support for bat43 * add adjust layer for via | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-02-07 | 1 | -5/+8 |
|\| | |||||
| * | [Update] Allow APM32 on TrinityXTtkl (#11715) | Xelus22 | 2021-02-07 | 1 | -5/+8 |
| | | | | | | | | | | * amp32 initial change * fix spacing | ||||
* | | Merge remote-tracking branch 'upstream/master' into develop | fauxpark | 2021-02-08 | 19 | -0/+2193 |
|\| | |||||
| * | Add DSP40 (#11579) | Danny | 2021-02-07 | 19 | -0/+2193 |
| | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-02-07 | 9 | -0/+307 |
|\| | |||||
| * | [Keyboard] Add The Stick keyboard (#11745) | Danny | 2021-02-07 | 9 | -0/+307 |
| | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-02-07 | 2 | -2/+1 |
|\| | |||||
| * | [Keymap] Update keymap for keebio/nyquist (#11734) | George Petri | 2021-02-07 | 2 | -2/+1 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-02-07 | 2 | -0/+92 |
|\| | |||||
| * | [Keymap] Shadyproject/bfo9000 (#11753) | Chris M | 2021-02-07 | 2 | -0/+92 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-02-07 | 2 | -0/+101 |
|\| | |||||
| * | [Keyboard] Add my keymap for Mark65 (#11717) | stanrc85 | 2021-02-07 | 2 | -0/+101 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-02-07 | 13 | -0/+636 |
|\| | |||||
| * | [Keyboard] Add nknl7jp keyboard (#11591) | Salicylic-acid3 | 2021-02-07 | 13 | -0/+636 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add nknl7jp keyboard A 73 keys JIS Layout split keyboard. Salicylic-acid3 * Keymap Update Fixed default keymap. * Update keyboards/nknl7jp/keymaps/salicylic/keymap.c Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/nknl7jp/keymaps/salicylic/keymap.c Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/nknl7jp/keymaps/salicylic/keymap.c Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/nknl7jp/keymaps/salicylic/keymap.c Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Drashna Jaelre <drashna@live.com> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-02-07 | 13 | -0/+637 |
|\| | |||||
| * | [Keyboard] Add nknl7en keyboard (#11590) | Salicylic-acid3 | 2021-02-07 | 13 | -0/+637 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add nknl7en keyboard A 70 keys ANSI Layout split keyboard. Salicylic-acid3 * Update readme.md The name, photo, and link were wrong, so they have been corrected. * Update keyboards/nknl7en/keymaps/salicylic/keymap.c Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/nknl7en/keymaps/salicylic/keymap.c Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/nknl7en/keymaps/salicylic/keymap.c Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/nknl7en/keymaps/salicylic/keymap.c Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Drashna Jaelre <drashna@live.com> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-02-07 | 13 | -0/+606 |
|\| | |||||
| * | [Keyboard] Add ergoarrows keyboard (#11592) | Salicylic-acid3 | 2021-02-07 | 13 | -0/+606 |
| | | | | | | | | A 76 keys Ergo Layout split keyboard. Salicylic-acid3 | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-02-07 | 8 | -0/+287 |
|\| |