summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into developQMK Bot2023-04-124-0/+428
|\
| * [Keymap] PHSC138 Keymap for Atom47 (#18768)Ryan2023-04-124-0/+428
| | | | | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-04-123-1/+24
|\|
| * [Keyboard] add kb2040 flavor of gherkin (#18360)Jeff Epler2023-04-123-1/+24
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-04-1210-0/+485
|\|
| * [Keyboard] ymdk/id75 (#19967)Less/Rikki2023-04-1210-0/+485
| | | | | | | | | | Co-authored-by: jack <0x6a73@protonmail.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
* | quantum/action_util.c: Use uint8_t for oneshot_layer_data (#20423)Manuel Ullmann2023-04-121-1/+1
| |
* | Fix preprocessor condition for SPLIT_HAPTIC_ENABLE (#20411)Giuseppe Rota2023-04-121-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-04-121-2/+2
|\|
| * fixing bug that caused KC_DEL and KC_MUTE (encoder press) to be swapped (#20420)Mike Killewald2023-04-121-2/+2
| |
* | Move single `LAYOUT`s to data driven (#20365)Ryan2023-04-121443-60150/+45441
| |
* | Merge remote-tracking branch 'origin/master' into developJames Young2023-04-112-100/+142
|\|
| * 4pplet/bootleg/rev_a Layout Macro Conversion and Addition (#20400)James Young2023-04-113-117/+142
| | | | | | | | | | | | | | * info.json: apply friendly formatting * move matrix data to info.json * add LAYOUT_60_ansi_split_bs_rshift
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-04-116-237/+190
|\|
| * 4pplet/aekiso60 Layout Macro Conversion and Additions (#20399)James Young2023-04-118-257/+190
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * add matrix_diagram.md Adds `matrix_diagram.md` to the `4pplet/aekiso60` directory, and removes the diagrams from the keyboard revision header files. * info.json: apply friendly formatting * move matrix data to info.json * create keyboard-level info.json * add LAYOUT_60_iso_tsangan * enable Community Layout support
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-04-111-0/+3
|\|
| * Reject info.json at keymap level (#20408)Joel Challis2023-04-111-0/+3
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-04-101-1/+1
|\|
| * Bump anothrNick/github-tag-action from 1.61.0 to 1.62.0 (#20407)dependabot[bot]2023-04-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [anothrNick/github-tag-action](https://github.com/anothrNick/github-tag-action) from 1.61.0 to 1.62.0. - [Release notes](https://github.com/anothrNick/github-tag-action/releases) - [Commits](https://github.com/anothrNick/github-tag-action/compare/1.61.0...1.62.0) --- updated-dependencies: - dependency-name: anothrNick/github-tag-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-04-101-2/+2
|\|
| * [Keyboard] Update angle65 VID/PID (#20401)Vertex-kb2023-04-101-2/+2
| |
* | Prevent Tri-Layer keys from stopping caps words (#20398)Ricardo Hermida Ruiz2023-04-102-0/+6
| |
* | Fix up via keymap builds. (#20397)Nick Brassel2023-04-101-2/+2
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-04-091-6/+12
|\|
| * Run CI builds for each push, limit queued workflow depth to 1. (#20362)Nick Brassel2023-04-091-6/+12
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-04-091-3/+17
|\|
| * Add numpad 0-9 to second layer, update keycodes for QMK 0.17.5, fix layout ↵Ryan2023-04-091-3/+17
| | | | | | | | (#20375)
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-04-091-3/+5
|\|
| * Add autocomplete to generate-compilation-database (#20387)Dasky2023-04-091-3/+5
| |
* | Add swap hands toggle functions (#20381)Albert Y2023-04-093-3/+33
| |
* | Fix up via keymap builds. (#20383)Nick Brassel2023-04-0913-73/+73
| | | | | | | | | | | | | | | | | | * Fix up via keymap builds. - Usages of old IS_PRESSED. * Fix up bad code. * Fix up bad code.
* | Move `default` layouts to data driven (#20349)Ryan2023-04-0892-6691/+7103
| |
* | Move split space/backspace layouts to data driven (#20356)Ryan2023-04-0867-5563/+5445
| |
* | Set up DEFAULT_FOLDER for primekb/meridian (#20367)Nick Brassel2023-04-081-0/+2
| |
* | Move `RGB_MATRIX_DRIVER` to data driven (#20350)Ryan2023-04-08833-437/+1250
| |
* | Merge remote-tracking branch 'upstream/master' into developNick Brassel2023-04-087-11/+53
|\|
| * [Keyboard] Add audio support to Adafruit MacroPad RP2040 (#20353)Drashna Jaelre2023-04-087-11/+53
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-04-071-1/+0
|\|
| * Convertors documentation: Removed duplicate table entry (#20360)Duncan Sutherland2023-04-071-1/+0
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-04-071-1/+3
|\|
| * Avoid generating empty ENCODER_RESOLUTION (#20179)Joel Challis2023-04-071-1/+3
| |
* | Add layer-cycle example (#19069)Pablo Martínez2023-04-071-0/+48
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-04-071-1/+1
|\|
| * Fixup CI build variables. (#20357)Nick Brassel2023-04-071-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-04-074-3/+61
|\|
| * Add Discord webhook at end of each CI run. (#20355)Nick Brassel2023-04-074-3/+61
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-04-074-94/+54
|\|
| * Move a_dux to data-driven (#20043)Albert Y2023-04-064-94/+54
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-04-0615-0/+958
|\|
| * [Keyboard] Add Keychron Q11 (#20125)lalalademaxiya12023-04-0615-0/+958
| | | | | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: adophoxia <100170946+adophoxia@users.noreply.github.com> Co-authored-by: Ryan <fauxpark@gmail.com>