summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master' into developfauxpark2021-06-2114-112/+112
|\
| * Cleanup junk characters, part 1 (#13282)Ryan2021-06-2114-112/+112
| |
* | Remove dfu-util arguments from mcu_selection (#13150)Ryan2021-06-211-40/+0
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-205-91/+51
|\|
| * [Docs] Update Japanese getting started documents. (#12806)shela2021-06-215-91/+51
| | | | | | | | | | | | | | * Update Japanese getting started documents. * Update faq_build.md * fix typo
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-201-1/+1
|\|
| * OLED font easter egg (#13269)Ryan2021-06-201-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-201-0/+1
|\|
| * Fix/keyboard/dz65rgbv3 (#13268)Erovia2021-06-201-0/+1
| | | | | | | | With the 'lufa-ms' bootloader LTO is needed so the keyboard can be built with Configurator.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-204-46/+160
|\|
| * Update Python dependencies for Nix (#12855)Sergey Vlasov2021-06-204-46/+160
| | | | | | Co-authored-by: Steve Purcell <steve@sanityinc.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-201-0/+57
|\|
| * rect44: add LAYOUT_all data (#13260)James Young2021-06-201-0/+57
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-203-2/+75
|\|
| * Adding my Bear65 keymap (#12962)stanrc852021-06-203-2/+75
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-2017-39/+403
|\|
| * [Keyboard] Add Constellation Rev2 (#13103)Xelus222021-06-2017-39/+403
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-204-4/+4
|\|
| * [Bug] Pachi keymap compile fix (#13261)Xelus222021-06-204-4/+4
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-201-9/+9
|\|
| * [Bug] Pachi RGB: fix RGB modifiers (#13262)Xelus222021-06-201-9/+9
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-205-41/+104
|\|
| * MisonoWorks Karina Layout Macro Rework (#13259)James Young2021-06-205-41/+104
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-201-2/+5
|\|
| * Fix issue with crkbd json mapping (#13255)Drashna Jaelre2021-06-191-2/+5
| |
* | Add Per Key exclusions for Haptic Feedback (#12386)Roland Huber2021-06-192-3/+94
| | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-207-28/+478
|\|
| * [Keyboard] Add LED matrix and 2 layouts to hub20 (#12505)peepeetee2021-06-197-28/+478
| | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-201-0/+3
|\|
| * [Keymap] Fix Preonic rev3 default keymap (#12698)nopjmp2021-06-191-0/+3
| | | | | | | | | | The rev3 boards use RGBLIGHT_ENABLE now instead of BACKLIGHT_ENABLE. This resolves the issue of flashing and losing functionality with the default keymap.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-202-4/+3
|\|
| * [Keyboard] YMDK Wings: enable Backlight (#12714)alittlepeace2021-06-192-4/+3
| |
* | Add sync_timer support over serial_link (i.e. Ergodox Infinity) (#12845)Joakim Tufvegren2021-06-193-2/+24
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-2010-28/+246
|\|
| * [Keyboard] Add PLX Keyboard (#12954)Nick Abe2021-06-197-0/+201
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
| * Add Mac centric Shift and Alt + GUI Macros (#13107)Albert Y2021-06-193-28/+45
| | | | | | Co-authored-by: filterpaper <filterpaper@localhost>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-203-0/+140
|\|
| * [Keymap] Add stanrc85 Abasic keymap (#13180)stanrc852021-06-193-0/+140
| |
* | Merge remote-tracking branch 'upstream/master' into developfauxpark2021-06-20102-652/+3076
|\|
| * Telophase cleanup (#13225)Ryan2021-06-207-310/+177
| |
| * pistachio_mp: correct key object order in info.json (#13250)James Young2021-06-201-19/+25
| |
| * [Keyboard] Pachi restructure and keyboard addition (#13080)Xelus222021-06-1931-13/+692
| |
| * [Keyboard Update] Trinity XT TKL fix license and add forgotten indicators ↵Xelus222021-06-193-16/+51
| | | | | | | | (#13202)
| * bm60rgb: fix layout macro references (#13246)James Young2021-06-195-9/+13
| | | | | | ... and enable Community Layout support
| * [Keyboard] Add Switchplate 910 keyboard (#13235)Jumail Mundekkat2021-06-1810-0/+581
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
| * [Keymap] Add my keymaps for the Keebio Iris and Planck (#13005)Mats Nilsson2021-06-1812-0/+493
| |
| * [Keyboard] add dztech/dz65rgb/v3 keyboard (#13017)moyi46812021-06-1817-136/+704
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
| * [Keymap] adding keymap for pistachio (#12996)rate2021-06-184-1/+149
| | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com>
| * [Keyboard] Murphpad Changes and Updates (#12995)Kyle McCreery2021-06-184-66/+80
| | | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
| * [Docs] update Japanese translation of tap_hold.md (#12820)umi2021-06-181-6/+24
| | | | | | | | | | * update tap_hold.md translation * restore unnecessary change line