summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-212-4/+4
|\|
| * fixed number layer on keymap (#13627)Alabahuy2021-07-212-4/+4
| |
* | Fix MATRIX_COLS for aeboards/constellation/rev2 (#13633)Ryan2021-07-211-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-211-10/+10
|\|
| * [Keyboard] Fix iso layout compile error (#13628)gkeyboard2021-07-211-10/+10
| | | | | | Fix iso layout compile erreo on qmk web.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-212-12/+12
|\|
| * [Bug] VIA compile fixes (#13626)Xelus222021-07-212-12/+12
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-219-0/+398
|\|
| * [Keyboard] add rartland with via support (#13585)Alabahuy2021-07-209-0/+398
| | | | | | | | | | | | | | * add rartland and via support * moved encoder adn oled to c file * update c file
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-211-1/+1
|\|
| * Fix vicious40 rules (#13623)Andrew Kannan2021-07-211-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-2010-0/+298
|\|
| * [Keyboard] Add Tiger910 (#12605)Weirdo2021-07-2010-0/+298
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | [Keyboard] GameBuddy v1.M (#12637)AlisGraveNil2021-07-2014-5/+204
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-2010-96/+334
|\|
| * [Keyboard] 0xcb 1337 - Added keymap "conor" and fixed some minor stuff (#12744)Conor Burns2021-07-2010-96/+334
| | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Move all our CLI file formatters to the format dir (#13296)Zach White2021-07-207-148/+240
| | | | | | | | | | | | | | | | | | * 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>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-2019-0/+921
|\|
| * [Keyboard] Added Kineticlabs Emu (#12968)kb-elmo2021-07-2019-0/+921
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-2010-51/+488
|\|
| * [Keymap] Updates to personal Drop ALT keymap (#13058)Paul Ewers2021-07-202-51/+97
| |
| * [Keyboard] Add Momoka ergo (#13127)StefanGrindelwald2021-07-208-0/+391
| | | | | | | | | | 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>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-201-4/+4
|\|
| * [Keyboard] Update lm60n.h (#13249)gkeyboard2021-07-201-4/+4
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-2010-0/+716
|\|
| * [Keyboard] Add keyboard GRS-70EC (#11296)sekigon-gonnoc2021-07-2010-0/+716
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-201-0/+2
|\|
| * [Docs] Added note about no split support (#12512)aydenvis2021-07-201-0/+2
| | | | | | 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.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-208-0/+346
|\|
| * [Keyboard] Hard Light - Add keyboard, basic keymap (#12654)FateEverywhere2021-07-208-0/+346
| | | | | | | | | | Co-authored-by: ridingqwerty <george.g.koenig@gmail.com> Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | [Keyboard] Add Durgod Hades, Galaxy and Venus Keyboards (#12893)Jsully2021-07-2046-0/+1896
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Don Kjer <don.kjer@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-206-0/+528
|\|
| * [Keymap] Adding user code & keymaps for dumbpad & hotdox (#12924)imchipwood2021-07-206-0/+528
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-207-0/+190
|\|
| * [Keyboard] luggage rack (#12959)AlisGraveNil2021-07-207-0/+190
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-2013-0/+549
|\|
| * [Keyboard] add anomalykb a65i (#12967)lfgberg2021-07-2013-0/+549
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-2012-0/+371
|\|
| * [Keyboard] Add Vicious40 to QMK (#12981)Andrew Kannan2021-07-2012-0/+371
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-204-0/+958
|\|
| * Adds Swedish Mac ISO and ANSI keymaps (#13055)Carl-Fredrik Arvidson2021-07-204-0/+958
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
* | Merge remote-tracking branch 'upstream/master' into developfauxpark2021-07-201-64/+64
|\|
| * Fix CRLF in xbows/knight:via config.h (#13614)Ryan2021-07-201-64/+64
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-2010-0/+416
|\|
| * [Keyboard] Add vault45 (#13119)projectcain2021-07-1910-0/+416
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-2014-0/+461
|\|
| * [Keyboard] Add q4z keyboard (#13198)Ryan Boone2021-07-1914-0/+461
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-2014-0/+623
|\|
| * [Keyboard] Add we27 numpad (#13137)Uy Bui2021-07-1914-0/+623
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-201-1/+1
|\|
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-15 08:30:36 +0000