Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-07-22 | 12 | -95/+88 |
|\ | |||||
| * | [Keyboard] Updated keyboard & keymaps (#12667) | farfalleflickan | 2021-07-21 | 12 | -95/+88 |
| | | | | | | Co-authored-by: pastapojken <6597735+pastapojken@users.noreply.github.com> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-07-22 | 13 | -28/+302 |
|\| | |||||
| * | [Keyboard] add SPRH keyboard (#12999) | joedinkle | 2021-07-21 | 13 | -28/+302 |
| | | | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Drashna Jaelre <drashna@live.com> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-07-22 | 11 | -0/+399 |
|\| | |||||
| * | [Keyboard] Add keypad Satxri6key (#13423) | Sắn | 2021-07-21 | 11 | -0/+399 |
| | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-07-22 | 14 | -0/+594 |
|\| | |||||
| * | [Keyboard] Initial Tron Guy Labs keyboard implementation. (#13438) | jmaynard | 2021-07-21 | 14 | -0/+594 |
| | | | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Jay Maynard <jmaynard@conmicro.com> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-07-22 | 7 | -0/+257 |
|\| | |||||
| * | [Keyboard] Add Ristretto Keyboard (#13479) | Brandon Lewis | 2021-07-21 | 7 | -0/+257 |
| | | | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Brandon Lewis <blewis308@users.noreply.github.com> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-07-22 | 15 | -0/+552 |
|\| | |||||
| * | [Keyboard] New Keyboard - OBE (#13545) | Kyle McCreery | 2021-07-21 | 15 | -0/+552 |
| | | | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Drashna Jaelre <drashna@live.com> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-07-22 | 4 | -0/+420 |
|\| | |||||
| * | [Keyboard] Add personal planck keymap (#13635) | Adam Abrams | 2021-07-21 | 4 | -0/+420 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-07-22 | 2 | -0/+37 |
|\| | |||||
| * | [Keymap] narze/xd004 (#13634) | Manassarn "Noom" Manoonchai | 2021-07-21 | 2 | -0/+37 |
| | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-07-22 | 9 | -0/+354 |
|\| | |||||
| * | [Keyboard] Add h0oni hotduck keyboard (#13609) | Md. Mashur Shalehin Sakib | 2021-07-21 | 9 | -0/+354 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-07-21 | 4 | -28/+7 |
|\| | |||||
| * | Fix API generation failure caused by GRS-70EC (#13631) | Ryan | 2021-07-21 | 2 | -12/+2 |
| | | |||||
| * | Fix MATRIX_COLS for peranekofactory/tone (#13632) | Ryan | 2021-07-21 | 2 | -16/+5 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-07-21 | 2 | -4/+4 |
|\| | |||||
| * | fixed number layer on keymap (#13627) | Alabahuy | 2021-07-21 | 2 | -4/+4 |
| | | |||||
* | | Fix MATRIX_COLS for aeboards/constellation/rev2 (#13633) | Ryan | 2021-07-21 | 1 | -1/+1 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-07-21 | 1 | -10/+10 |
|\| | |||||
| * | [Keyboard] Fix iso layout compile error (#13628) | gkeyboard | 2021-07-21 | 1 | -10/+10 |
| | | | | | | Fix iso layout compile erreo on qmk web. | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-07-21 | 2 | -12/+12 |
|\| | |||||
| * | [Bug] VIA compile fixes (#13626) | Xelus22 | 2021-07-21 | 2 | -12/+12 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-07-21 | 9 | -0/+398 |
|\| | |||||
| * | [Keyboard] add rartland with via support (#13585) | Alabahuy | 2021-07-20 | 9 | -0/+398 |
| | | | | | | | | | | | | | | * add rartland and via support * moved encoder adn oled to c file * update c file | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-07-21 | 1 | -1/+1 |
|\| | |||||
| * | Fix vicious40 rules (#13623) | Andrew Kannan | 2021-07-21 | 1 | -1/+1 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-07-20 | 10 | -0/+298 |
|\| | |||||
| * | [Keyboard] Add Tiger910 (#12605) | Weirdo | 2021-07-20 | 10 | -0/+298 |
| | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> | ||||
* | | [Keyboard] GameBuddy v1.M (#12637) | AlisGraveNil | 2021-07-20 | 14 | -5/+204 |
| | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-07-20 | 10 | -96/+334 |
|\| | |||||
| * | [Keyboard] 0xcb 1337 - Added keymap "conor" and fixed some minor stuff (#12744) | Conor Burns | 2021-07-20 | 10 | -96/+334 |
| | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-07-20 | 19 | -0/+921 |
|\| | |||||
| * | [Keyboard] Added Kineticlabs Emu (#12968) | kb-elmo | 2021-07-20 | 19 | -0/+921 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-07-20 | 10 | -51/+488 |
|\| | |||||
| * | [Keymap] Updates to personal Drop ALT keymap (#13058) | Paul Ewers | 2021-07-20 | 2 | -51/+97 |
| | | |||||
| * | [Keyboard] Add Momoka ergo (#13127) | StefanGrindelwald | 2021-07-20 | 8 | -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 develop | QMK Bot | 2021-07-20 | 1 | -4/+4 |
|\| | |||||
| * | [Keyboard] Update lm60n.h (#13249) | gkeyboard | 2021-07-20 | 1 | -4/+4 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-07-20 | 10 | -0/+716 |
|\| | |||||
| * | [Keyboard] Add keyboard GRS-70EC (#11296) | sekigon-gonnoc | 2021-07-20 | 10 | -0/+716 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-07-20 | 8 | -0/+346 |
|\| | |||||
| * | [Keyboard] Hard Light - Add keyboard, basic keymap (#12654) | FateEverywhere | 2021-07-20 | 8 | -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) | Jsully | 2021-07-20 | 46 | -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 develop | QMK Bot | 2021-07-20 | 3 | -0/+334 |
|\| |