summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-07-20Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-07-20[Keyboard] 0xcb 1337 - Added keymap "conor" and fixed some minor stuff (#12744)Conor Burns
Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-07-20Move all our CLI file formatters to the format dir (#13296)Zach White
* move all our file formatters to the format dir * Apply suggestions from code review Co-authored-by: Erovia <Erovia@users.noreply.github.com> Co-authored-by: Erovia <Erovia@users.noreply.github.com>
2021-07-20Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-07-20[Keyboard] Added Kineticlabs Emu (#12968)kb-elmo
2021-07-20Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-07-20[Keymap] Updates to personal Drop ALT keymap (#13058)Paul Ewers
2021-07-20[Keyboard] Add Momoka ergo (#13127)StefanGrindelwald
Co-authored-by: precondition <57645186+precondition@users.noreply.github.com> Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
2021-07-20Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-07-20[Keyboard] Update lm60n.h (#13249)gkeyboard
2021-07-20Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-07-20[Keyboard] Add keyboard GRS-70EC (#11296)sekigon-gonnoc
2021-07-20Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-07-20[Docs] Added note about no split support (#12512)aydenvis
Currently, this feature isn't supported on splits, spent about an hour troubleshooting my board and firmware before asking, and turns out it's not in place. Note added to save others from this in the future.
2021-07-20Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-07-20[Keyboard] Hard Light - Add keyboard, basic keymap (#12654)FateEverywhere
Co-authored-by: ridingqwerty <george.g.koenig@gmail.com> Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Ryan <fauxpark@gmail.com>
2021-07-20[Keyboard] Add Durgod Hades, Galaxy and Venus Keyboards (#12893)Jsully
Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Don Kjer <don.kjer@gmail.com>
2021-07-20Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-07-20[Keymap] Adding user code & keymaps for dumbpad & hotdox (#12924)imchipwood
Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
2021-07-20Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-07-20[Keyboard] luggage rack (#12959)AlisGraveNil
2021-07-20Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-07-20[Keyboard] add anomalykb a65i (#12967)lfgberg
Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
2021-07-20Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-07-20[Keyboard] Add Vicious40 to QMK (#12981)Andrew Kannan
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-07-20Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-07-20Adds Swedish Mac ISO and ANSI keymaps (#13055)Carl-Fredrik Arvidson
* Adds Swedish Mac ISO and ANSI keymaps * Replaces NBSP with space * Adds missing keys * Remove duplicates * Remove duplicates * Update quantum/keymap_extras/keymap_swedish_osx_iso.h Co-authored-by: Ryan <fauxpark@gmail.com> * Update quantum/keymap_extras/keymap_swedish_osx_iso.h Co-authored-by: Ryan <fauxpark@gmail.com> * Update quantum/keymap_extras/keymap_swedish_osx_iso.h Co-authored-by: Ryan <fauxpark@gmail.com> * Update quantum/keymap_extras/keymap_swedish_osx_iso.h Co-authored-by: Ryan <fauxpark@gmail.com> * Change case and remove whitespace * Update quantum/keymap_extras/keymap_swedish_osx_ansi.h Co-authored-by: Ryan <fauxpark@gmail.com> * Update quantum/keymap_extras/keymap_swedish_osx_ansi.h Co-authored-by: Ryan <fauxpark@gmail.com> * Update quantum/keymap_extras/keymap_swedish_osx_ansi.h Co-authored-by: Ryan <fauxpark@gmail.com> * Update quantum/keymap_extras/keymap_swedish_osx_iso.h Co-authored-by: Ryan <fauxpark@gmail.com> * Update quantum/keymap_extras/keymap_swedish_osx_iso.h Co-authored-by: Ryan <fauxpark@gmail.com> * Update quantum/keymap_extras/keymap_swedish_osx_iso.h Co-authored-by: Ryan <fauxpark@gmail.com> * Update quantum/keymap_extras/keymap_swedish_osx_iso.h Co-authored-by: Ryan <fauxpark@gmail.com> * Update quantum/keymap_extras/keymap_swedish_osx_iso.h Co-authored-by: Ryan <fauxpark@gmail.com> * Update quantum/keymap_extras/keymap_swedish_osx_iso.h Co-authored-by: Ryan <fauxpark@gmail.com> * Update quantum/keymap_extras/keymap_swedish_osx_ansi.h Co-authored-by: Ryan <fauxpark@gmail.com> * Update quantum/keymap_extras/keymap_swedish_osx_ansi.h Co-authored-by: Ryan <fauxpark@gmail.com> * Fix uppercase * Update quantum/keymap_extras/keymap_swedish_osx_ansi.h Co-authored-by: Ryan <fauxpark@gmail.com> * Update quantum/keymap_extras/keymap_swedish_osx_ansi.h Co-authored-by: Ryan <fauxpark@gmail.com> * Update quantum/keymap_extras/keymap_swedish_osx_ansi.h Co-authored-by: Ryan <fauxpark@gmail.com> * Add specific files for Swedish Pro * Update quantum/keymap_extras/keymap_swedish_osx_iso.h Co-authored-by: Ryan <fauxpark@gmail.com> * Update quantum/keymap_extras/keymap_swedish_osx_iso.h Co-authored-by: Ryan <fauxpark@gmail.com> * Update quantum/keymap_extras/keymap_swedish_osx_ansi.h Co-authored-by: Ryan <fauxpark@gmail.com> * Update quantum/keymap_extras/keymap_swedish_osx_ansi.h Co-authored-by: Ryan <fauxpark@gmail.com> * Update quantum/keymap_extras/keymap_swedish_osx_ansi.h Co-authored-by: Ryan <fauxpark@gmail.com> * Update quantum/keymap_extras/keymap_swedish_osx_ansi.h Remove whitespace Co-authored-by: Ryan <fauxpark@gmail.com> * Update quantum/keymap_extras/keymap_swedish_osx_ansi.h Co-authored-by: Ryan <fauxpark@gmail.com> * Update quantum/keymap_extras/keymap_swedish_pro_osx_ansi.h Co-authored-by: Ryan <fauxpark@gmail.com> * Update quantum/keymap_extras/keymap_swedish_osx_iso.h Co-authored-by: Ryan <fauxpark@gmail.com> * Update quantum/keymap_extras/keymap_swedish_osx_iso.h Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Ryan <fauxpark@gmail.com>
2021-07-20Merge remote-tracking branch 'upstream/master' into developfauxpark
2021-07-20Fix CRLF in xbows/knight:via config.h (#13614)Ryan
2021-07-20Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-07-19[Keyboard] Add vault45 (#13119)projectcain
* adding my keymap * Update keyboards/projectcain/vault45/keymaps/default/config.h Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/projectcain/vault45/keymaps/default/keymap.c Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/projectcain/vault45/keymaps/default/keymap.c Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/projectcain/vault45/vault45.c Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/projectcain/vault45/keymaps/default/keymap.c Co-authored-by: Drashna Jaelre <drashna@live.com> * Update readme.md * Update keyboards/projectcain/vault45/keymaps/default/config.h Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keymap.c * Update keyboards/projectcain/vault45/keymaps/default/config.h Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/projectcain/vault45/readme.md Co-authored-by: ridingqwerty <george.g.koenig@gmail.com> * Update info.json * Update keyboards/projectcain/vault45/vault45.c Co-authored-by: ridingqwerty <george.g.koenig@gmail.com> * Update keyboards/projectcain/vault45/readme.md Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/projectcain/vault45/readme.md Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/projectcain/vault45/readme.md Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: ridingqwerty <george.g.koenig@gmail.com> Co-authored-by: Ryan <fauxpark@gmail.com>
2021-07-20Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-07-19[Keyboard] Add q4z keyboard (#13198)Ryan Boone
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-07-20Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-07-19[Keyboard] Add we27 numpad (#13137)Uy Bui
Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
2021-07-20Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-07-19[Keyboard] fix LED issue BOCC keyboard (#13175)Michael
Co-authored-by: Michael Wamsley <wamsl@Michaels-MacBook-Pro.local>
2021-07-20Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-07-19[Keyboard] mnk1800s initial commit (#13444)yiancar
2021-07-20Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-07-19[Keyboard] Boardsource technik (#13111)cole smith
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-07-20Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-07-19[Keyboard] PORTICO: add support for wt_rgb (#13241)TerryMathews
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-07-20Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-07-19[Keyboard] Add tone (#13337)ぺらねこ
Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Takeshi ISHII <2170248+mtei@users.noreply.github.com> Co-authored-by: kakunpc <15257475+kakunpc@users.noreply.github.com>
2021-07-20Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-07-19[Keyboard] Aella Keyboard PCB (#13372)Andrew Kannan
Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Ryan <fauxpark@gmail.com>
2021-07-19Switch Ergodox Infinity over to split_common (#13481)Joakim Tufvegren
2021-07-20Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-07-19[Keyboard] Add CannonKeys Balance PCB to QMK (#13489)Andrew Kannan
Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>