summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-231-22/+25
|\
| * [Docs] update Japanese translation of feature_backlight.md (#14403)umi2021-09-231-22/+25
| | | | | | | | | | * update feature_backlight.md translation * update file based on comments
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-231-20/+23
|\|
| * [Docs] update Japanese translation of feature_advanced_keycodes.md (#14309)umi2021-09-231-20/+23
| | | | | | | | | | * update feature_advanced_keycodes.md translation * update file based on comments
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-231-6/+16
|\|
| * [Docs] update Japanese translation of isp_flashing_guide.md (#13700)umi2021-09-231-6/+16
| | | | | | | | | | | | | | | | | | * update isp_flashing_guide.md translation * update isp_flashing_guide.md translation * correct url * trim remaining merge identifier
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-231-2/+15
|\|
| * [Docs] update Japanese translation of feature_leader_key.md (#13669)umi2021-09-231-2/+15
| | | | | | | | | | | | | | * update feature_leader_key.md translation * update file based on comments * update text based on comments
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-231-4/+7
|\|
| * [Docs] update Japanese translation of one_shot_keys.md (#13656)umi2021-09-231-4/+7
| | | | | | | | | | | | | | | | | | * update one_shot_keys.md translation * update one_shot_keys.md translation * correct paramter for function * add change of #13754
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-238-0/+251
|\|
| * [Keyboard] Bkf (#14534)drhigsby2021-09-228-0/+251
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'upstream/master' into developJames Young2021-09-226-8/+1
|\|
| * Remove BLUETOOTH_ENABLE from keyboard-level rules.mk (2021-09-22) (#14567)James Young2021-09-227-9/+1
| | | | | | | | | | * Remove BLUETOOTH_ENABLE from keyboard-level rules.mk (2021-09-22) * update keyboards/handwired/slash/rules.mk per fauxpark
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-221-2/+2
|\|
| * [Keyboard] Fix default keymap for Draytronics Elise V2 keyboard (#14562)Drashna Jaelre2021-09-231-2/+2
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-221-2/+2
|\|
| * [Keyboard] Disable console on Smallkeyboard (#14561)Drashna Jaelre2021-09-231-2/+2
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-2210-9/+1120
|\|
| * [Keyboard] Version 2 of Draytronics Elise Keyboard + ISO Keymap Change (#14253)Blake2021-09-2110-9/+1120
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-229-0/+505
|\|
| * [Keyboard] add kk980 keyboard (#14436)Sets3n2021-09-219-0/+505
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-225-137/+79
|\|
| * [Keyboard] Fix jkb65 compile issues (#14554)Drashna Jaelre2021-09-215-137/+79
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-221-1/+1
|\|
| * [Keyboard] Fix font file for Ein 60 Keyboard (#14553)Drashna Jaelre2021-09-211-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-229-0/+502
|\|
| * [Keyboard] Add Dango40 (#14437)Brandon Claveria2021-09-219-0/+502
| | | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Swiftrax <swiftrax@gmail.com> Co-authored-by: Swiftrax <swiftrax@github.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-2212-0/+368
|\|
| * [Keyboard] Add Free Willy Keyboard (#14394)Caleb Lightfoot2021-09-2112-0/+368
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-2214-0/+551
|\|
| * [Keyboard] 0-Sixty: Splits kb config into base and underglow (#14384)Vinam Arora2021-09-214-0/+84
| | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com>
| * [Keyboard] Add support for XT8x (#14440)kopibeng2021-09-2110-0/+467
| | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-221-2/+2
|\|
| * [Keyboard] fixed one of the unicode drawings of the layout in dz60.h (#14482)milostatsea2021-09-211-2/+2
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-2211-2/+379
|\|
| * [Keyboard] Add JadooKB JKB65 RGB (#14525)WiZ.GG2021-09-2110-0/+377
| | | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
| * Changed VENDOR_ID and PRODUCT_ID of Boston keyboard (#14528)Pylon2021-09-211-2/+2
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-221-0/+97
|\|
| * [Keyboard] Add commented out OLED/encoder code in default Kyria (#14539)precondition2021-09-211-0/+97
| | | | | | | | Co-authored-by: Dasky <32983009+daskygit@users.noreply.github.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-2216-0/+1182
|\|
| * [Keyboard] add ein_60 (#14398)James Smith2021-09-2116-0/+1182
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-221-28/+28
|\|
| * [Keyboard] smallkeyboard fix of rgb matrix config (#14548)Drashna Jaelre2021-09-211-28/+28
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-2215-22/+298
|\|
| * [Keyboard] Addition of VIA keymap and a few fixes for naked48 (#14177)Salicylic-acid32021-09-2115-22/+298
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | [Keyboard] Set USB max power consumption of kint* controllers to 100mA (#14546)Michael Stapelberg2021-09-213-0/+12
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-213-6/+6
|\|
| * [Docs] update suspend_*_user examples (#14542)Dasky2021-09-213-6/+6
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-219-0/+297
|\|
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-30 12:42:34 +0000