summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-299-0/+279
|\
| * [Keyboard] Add the demiurge keyboard (#16074)ojthetiny2022-01-299-0/+279
| | | | | | | | | | Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-298-0/+355
|\|
| * [Keyboard] add synthesis60 (#15864)Bahrul Hidayat2022-01-298-0/+355
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-2917-21/+38
|\|
| * Move kbdpad_mk2 to kbdpad/mk2, add numpad layout to mk2.h (#15892)Felipe Bastos2022-01-2915-16/+33
| |
| * [Keymap] Add media keys to default UT47.2 keymap (#15893)Alex Grover2022-01-292-5/+5
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-291-0/+255
|\|
| * [Docs] zh-cn documentation translate: hand-wire (#15666)IskandarMa2022-01-291-0/+255
| | | | | | | | Co-authored-by: peepeetee <43021794+peepeetee@users.noreply.github.com> Co-authored-by: Dasky <32983009+daskygit@users.noreply.github.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-294-0/+252
|\|
| * Planck/Preonic - Enable default encoder behaviour on configurator (#16104)Joel Challis2022-01-292-0/+40
| |
| * [Docs] zh-cn document translate: IDE configuration (#15575)IskandarMa2022-01-292-0/+212
| | | | | | | | Co-authored-by: peepeetee <43021794+peepeetee@users.noreply.github.com> Co-authored-by: Dasky <32983009+daskygit@users.noreply.github.com>
* | Format code according to conventions (#16110)QMK Bot2022-01-291-3/+2
| |
* | Combo `TAP_CODE_DELAY` and `clear_weak_mods` (#15866)Pete Sevander2022-01-281-0/+13
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-2915-0/+453
|\|
| * [Keyboard] add cypher rev6 (#14647)Cable Car Designs2022-01-2815-0/+453
| | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-298-0/+343
|\|
| * [Keyboard] Added sandwich/keeb68 to keyboards (#15007)SandwichRising2022-01-288-0/+343
| | | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-2910-0/+254
|\|
| * [Keyboard] Add misterdeck 3d-printed handwired stream deck (#15556)Chris Broekema2022-01-2810-0/+254
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Adjust tap_code16 to account for TAP_HOLD_CAPS_DELAY (#15635)Ga682022-01-281-3/+6
| | | | | | Co-authored-by: Ga68 <github.ga68.e@grxme.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-294-42/+82
|\|
| * [Keymap] Further improvements to ifohancroft ErgoDox keymap (#15672)IFo Hancroft2022-01-284-42/+82
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-292-8/+0
|\|
| * [Keyboard] Fix Nasu Indicators (#15878)yiancar2022-01-282-8/+0
| | | | | | Co-authored-by: yiancar <yiancar@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-2910-0/+323
|\|
| * [Keyboard] Add keyprez unicorn (#15998)Christian Sandven2022-01-2810-0/+323
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Joel Challis <git@zvecr.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-291-1/+4
|\|
| * [Docs] Update Encoder docs about multiple encoders (#16036)Monksoffunk2022-01-281-1/+4
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-2920-23/+23
|\|
| * Remove missing and trailing commas in info.json files. (#16088)Gabriel Harel2022-01-2820-23/+23
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-2925-63/+533
|\|
| * [Keyboard] Adds Elongate Revision Delta PCB support (#15498)Álvaro A. Volpato2022-01-2825-63/+533
| | | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-284-0/+149
|\|
| * [Keymap] Added personal 36 key layout for 40percentclub's nori (#15980)wyethGR2022-01-284-0/+149
| | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-271-1/+3
|\|
| * [Docs] OLED documentation edits (#15977)Albert Y2022-01-271-1/+3
| | | | | | | | | | * Clarify OLED_TIMEOUT * Add a section on logo file location
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-2722-0/+764
|\|
| * Add support for Mode SeventyFive (#16030)Álvaro A. Volpato2022-01-2722-0/+764
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Initial M75H support * Remove BSLS key * Add M75S initial support * Define DYNAMIC_KEYMAP_EEPROM_MAX_ADDR to allow VIA * Add layer 1 for M75H * Add layer 1 for M75H * Fix layouts * Add BOOTLOADER and remove BOOTLOADER address from rules.mk Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-272-29/+36
|\|
| * [Keyboard] fixed led_config: missing key, missing/wrong flags (#16048)p4yne2022-01-272-29/+36
| | | | | | | | | | | | | | | | | | | | | | * fixed ledmap: missing key, missing/wrong flags * Update keyboards/kprepublic/bm65hsrgb_iso/bm65hsrgb_iso.c Co-authored-by: Albert Y <76888457+filterpaper@users.noreply.github.com> * corrected c&p error user name in GPL header Co-authored-by: Albert Y <76888457+filterpaper@users.noreply.github.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-271-3/+2
|\|
| * Fixes for slovak language-specific keycodes (#16019)KraXen722022-01-271-3/+2
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-271-27/+28
|\|
| * [Keyboard] Fix compilation issues for creatkeebs thera (#16071)Drashna Jaelre2022-01-271-27/+28
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-272-3/+2
|\|
| * Mehkee96 LED state & count + transposed keys fixes (#16061)Damien Guard2022-01-272-3/+2
| | | | | | | | | | | | | | | | | | * Fix transposed keys at top right of board. * Correct LED on state * Correct number of LEDs * Default LED state is fine
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-2717-702/+682
|\|
| * Keychron QMK Configurator Refactor (#16034)James Young2022-01-2617-702/+682
| |
* | Deprecate split transactions status field (#16023)Stefan Kerkmann2022-01-267-91/+28
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 17:48:38 +0000