Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-02-20 | 3 | -0/+186 | |
|\| | ||||||
| * | Bliss Hotdox keymaps (#13160) | Benjamin Chausse | 2022-02-19 | 3 | -0/+186 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Bliss Hotdox keymaps * Update keyboards/hotdox/keymaps/bliss/keymap.c * Update keyboards/hotdox/keymaps/bliss/keymap.c * Add GPL License to keymap.c file Changes to be committed: modified: keymap.c * make changes requested by fauxpark * Update keyboards/hotdox/keymaps/bliss/readme.md * Update keyboards/hotdox/keymaps/bliss/keymap.c * Update keyboards/hotdox/keymaps/bliss/readme.md | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-02-20 | 8 | -0/+266 | |
|\| | ||||||
| * | Add kikkou keyboard (#15291) | Matthew Dias | 2022-02-19 | 8 | -0/+266 | |
| | | | | | | | | | | | | | | | | | | | | * Add kikkou keyboard * Apply suggestions from code review * Update keyboards/kikkou/rules.mk * Apply suggestions from code review1 | |||||
* | | Merge remote-tracking branch 'upstream/master' into develop | fauxpark | 2022-02-19 | 13 | -17/+23 | |
|\| | ||||||
| * | Fix a couple of boards being wrongly identified as AVR (#16377) | Ryan | 2022-02-19 | 2 | -1/+7 | |
| | | ||||||
| * | [Keyboard] Renamed Frooastboard to Frooastboard Nano (#16373) | Simon | 2022-02-17 | 11 | -16/+16 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/master' into develop | Drashna Jael're | 2022-02-17 | 22 | -1980/+531 | |
|\| | ||||||
| * | `mokey/xox70`: clean up layouts (#16375) | Ryan | 2022-02-17 | 5 | -310/+531 | |
| | | ||||||
| * | [Keyboard] Remove Helix/rev1 (#16389) | Takeshi ISHII | 2022-02-17 | 17 | -1672/+0 | |
| | | ||||||
* | | Bodge for helix build failures (#16376) | Joel Challis | 2022-02-16 | 3 | -0/+12 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-02-15 | 1 | -2/+2 | |
|\| | ||||||
| * | Update USB VID and PID for Aya (#16363) | Dan Nixon | 2022-02-15 | 1 | -2/+2 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-02-15 | 3 | -3/+3 | |
|\| | ||||||
| * | Add extra braces for trackball keymaps (#16361) | Ryan | 2022-02-15 | 3 | -3/+3 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-02-15 | 7 | -15/+9 | |
|\| | ||||||
| * | Fix multiple definition errors for trackball "boards" with no keys (#16350) | Ryan | 2022-02-15 | 7 | -15/+9 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-02-14 | 1 | -25/+25 | |
|\| | ||||||
| * | Xenon: correct QMK Configurator key sequence (#16332) | James Young | 2022-02-13 | 1 | -25/+25 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-02-14 | 13 | -48/+1450 | |
|\| | ||||||
| * | Mode M75S Layout Additions, Configurator Data and Code Touch-Up (#16327) | James Young | 2022-02-13 | 13 | -48/+1450 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * m75s.h: correct matrix position identifier `K5C` is actually on row 4, so it should be `K4C`. * m75s.h: add matrix diagram * add QMK Configurator data * polish whitespace - convert tabs to spaces - update indent to four spaces - remove trailing whitespace * update readme Didn't seem to be fully updated after being copied from the M65S codebase. * add LAYOUT_ansi with keymap ANSI layout with 2u Backspace. * add LAYOUT_iso with keymap ISO layout with 2u Backspace. * add LAYOUT_ansi_tsangan with keymap ANSI layout with 2u Backspace and 7u Spacebar. * add LAYOUT_iso_tsangan with keymap ISO layout with 2u Backspace and 7u Spacebar. * add LAYOUT_ansi_split_bs with keymap ANSI layout with Split Backspace. * add LAYOUT_iso_split_bs with keymap ISO layout with Split Backspace. * add LAYOUT_ansi_tsangan_split_bs with keymap ANSI layout with Split Backspace and 7u Spacebar. * add LAYOUT_iso_tsangan_split_bs with keymap ISO layout with Split Backspace and 7u Spacebar. | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-02-14 | 2 | -331/+331 | |
|\| | ||||||
| * | Digicarp65: fix layouts (#16328) | Ryan | 2022-02-14 | 2 | -331/+331 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-02-12 | 3 | -128/+348 | |
|\| | ||||||
| * | [Keyboard] Convert Maxr1998/Phoebe to use info.json where possible (#16309) | Max Rumpf | 2022-02-11 | 3 | -128/+348 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-02-12 | 9 | -0/+657 | |
|\| | ||||||
| * | [Keyboard] Lulu keyboard by boardsource (#15951) | cole smith | 2022-02-11 | 9 | -0/+657 | |
| | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> | |||||
* | | [Keyboard] move g heavy industry boards into /gboards (#16040) | peepeetee | 2022-02-11 | 89 | -22/+22 | |
| | | | | | | Co-authored-by: zvecr <git@zvecr.com> | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-02-12 | 10 | -0/+522 | |
|\| | ||||||
| * | [Keymap] Add uqs' keymaps for various boards and ploopy mouse (#16265) | uqs | 2022-02-11 | 10 | -0/+522 | |
| | | ||||||
* | | move montex to IDOBAO vendor folder (#15668) | peepeetee | 2022-02-12 | 9 | -2/+2 | |
| | | | | | | | | | | * move montex to IDOBAO vendor folder * move montex to montex/v1 | |||||
* | | move @satt99 's comet46 to satt/ (#16059) | peepeetee | 2022-02-12 | 28 | -1/+1 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-02-12 | 1 | -0/+105 | |
|\| | ||||||
| * | Add wren configurator data (#16321) | Joel Challis | 2022-02-12 | 1 | -0/+105 | |
| | | ||||||
* | | move mechkeys keyboards into the mechkeys/ vendor folder (#15760) | peepeetee | 2022-02-11 | 79 | -13/+13 | |
| | | | | | | | | | | | | | | * move mechkeys keyboards to mechkeys/ * fix compilation * fix default folder | |||||
* | | move @takashiski 's keebs into /takashiski (#16089) | peepeetee | 2022-02-11 | 50 | -6/+6 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-02-11 | 1 | -1/+1 | |
|\| | ||||||
| * | handwired/promethium: fix missing include (#16317) | Ryan | 2022-02-11 | 1 | -1/+1 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-02-11 | 1 | -1/+1 | |
|\| | ||||||
| * | mechlovin/kay60: fix mismatched layout name (#16314) | Ryan | 2022-02-11 | 1 | -1/+1 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-02-11 | 6 | -34/+85 | |
|\| | ||||||
| * | maxr1998/pulse4k: Move Combo code to keymap level (#16301) | Ryan | 2022-02-11 | 6 | -34/+85 | |
| | | | | | | | | | | * maxr1998/pulse4k: Move Combo code to keymap level * Reorder code | |||||
* | | [Keyboard] move latincompass's boards to /latincompass (#16039) | peepeetee | 2022-02-10 | 65 | -8/+8 | |
| | | ||||||
* | | move id80 and id75 to v1 to accommodate for id75 v2 and id80 v3 (#15992) | peepeetee | 2022-02-10 | 33 | -11/+11 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * move id80 to a v1 to acommondate for v2 and a future v3 * move id75 to v1 * fix manufacturer and product fields, enable backlight * move user keymap * Fix DEFAULT_FOLDER * Update build command Co-authored-by: zvecr <git@zvecr.com> | |||||
* | | move ID87 to IDOBAO vendor folder (#15667) | peepeetee | 2022-02-10 | 10 | -3/+3 | |
| | | | | | | | | | | * move ID87 to IDOBAO vendor folder * move to v1 to acommondate for v2 | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-02-10 | 4 | -37/+154 | |
|\| | ||||||
| * | Mode 75H Touch-UP (#16310) | James Young | 2022-02-10 | 4 | -37/+154 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * m75h.h: correct matrix position identifier `K5C` is actually on row 4, so it should be `K4C`. * m75h.h: add matrix diagram * add QMK Configurator data * polish whitespace - convert tabs to spaces - update indent to four spaces - remove trailing whitespace | |||||
* | | Remove manual enable of LTO within user keymaps (#15378) | Joel Challis | 2022-02-10 | 12 | -13/+11 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-02-10 | 5 | -10/+15 | |
|\| | ||||||
| * | keyten kt60-M: rename LAYOUT to LAYOUT_60_tsangan_hhkb (#16307) | James Young | 2022-02-10 | 5 | -10/+15 | |
| | | | | | | | | | | | | | | | | | | * rename LAYOUT to LAYOUT_60_tsangan_hhkb * info.json: correct maintainer value Field is meant to reference the maintainer's GitHub username. * rules.mk: enable Community Layout support |