summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-301-0/+48
|\
| * [Keymap] Adding Sunsetter keymap (#16126)peott-fr2022-01-301-0/+48
| |
* | [Keyboard] Re-org Hillside folders and fix default keymap (#16128)mmccoyd2022-01-3010-352/+323
| | | | | | Co-authored-by: mmccoyd <mmccoyd@cs.berkley.edu>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-306-0/+405
|\|
| * [Keymap] Add hachetman layout for GMMK Pro (#16131)Christian Grumbein2022-01-304-0/+360
| |
| * [Keyboard] added via keymap for ferris sweep (#16130)Andrew Garver2022-01-302-0/+45
| |
* | [Keyboard] move @ibnuda 's keebs into /ibnuda (#16108)peepeetee2022-01-3058-6/+6
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-304-4/+7
|\|
| * Cutie Club Giant Macro Pad: Update QMK Configurator Implementation (#16132)James Young2022-01-304-4/+7
| |
* | Rename `AdafruitBLE` to `BluefruitLE` (#16127)Ryan2022-01-3035-109/+109
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-308-7/+431
|\|
| * Xelus Pachi: add info.json files; rename layout macros (#16123)James Young2022-01-298-7/+431
| | | | | | | | | | | | | | | | | | | | | | | | | | * xelus/pachi/mini_32u4: add info.json * xelus/pachi/rev1: add info.json * xelus/pachi/rgb/rev1: add info.json * xelus/pachi/rgb/rev2: add info.json * rename LAYOUT_ansi_tsangan to LAYOUT_tkl_ansi_tsangan Rename `LAYOUT_ansi_tsangan` to `LAYOUT_tkl_ansi_tsangan` for the Pachi RGB revisions.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-291-181/+38
|\|
| * Takashi Company Center x Enter: correct info.json key sequence (#16120)James Young2022-01-291-181/+38
| | | | | | | | | | | | | | * info.json: apply friendly formatting * info.json: update labels for clarity * info.json: correct key sequence
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-291-147/+39
|\|
| * Takashi Company QooLee: correct info.json key sequence (#16121)James Young2022-01-291-147/+39
| | | | | | | | | | | | | | | | | | * info.json: apply friendly formatting * info.json: correct maintainer field Fixes a typo. * info.json: correct key sequence
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-294-552/+552
|\|
| * Wuque Mammoth75x: refactor (#16122)James Young2022-01-294-552/+552
| | | | | | | | | | | | | | | | | | | | | | | | * info.json: apply/polish friendly formatting * refactor LAYOUT_all macro - move the argument/keycode for the right half of split Backspace next to the left half - update QMK Configurator layout data * update QMK Configurator layout data for the other macros Moves the EncoderClick objects up, and offsets the arrow keys down 0.25u.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-292-280/+712
|\|
| * Cutie Club x Keebcats Denis: codebase touch-up and info.json update (#16124)James Young2022-01-292-280/+712
| | | | | | | | | | | | | | | | | | * denis.h: use QMK 3-character notation * info.json: apply friendly formatting * info.json: add missing layout trees * info.json: fix key sequence on ISO layouts
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-299-81/+171
|\|
| * Studio Kestra Bourgeau: rename LAYOUT_all to LAYOUT_75_ansi_rwkl (#16119)James Young2022-01-294-9/+12
| | | | | | | | | | | | | | * rename LAYOUT_all to LAYOUT_75_ansi_rwkl The only supported layout is 75% ANSI, with two modifier keys on the right of the Spacebar instead of three. * info.json: use maintainer's GitHub username
| * CK65: LAYOUT_65_iso compatibility (#16118)James Young2022-01-295-72/+159
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * info.json: apply friendly formatting * ck65.h: use QMK 3-character notation * move Enter keycode/argument to home row This commit makes the `LAYOUT` macro conformant to `LAYOUT_65_iso` in QMK. * rename LAYOUT to LAYOUT_65_iso * use QMK-native KC_TRNS alias in keymaps Replaces instances of `KC_TRNS` with `_______` in keymaps. * info.json: update maintainer field
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-291-1/+1
|\|
| * Fix Cypher rev6 VIA keymap (#16117)Ryan2022-01-291-1/+1
| |
* | 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>