Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-05-16 | 18 | -38/+213 |
|\ | |||||
| * | [Keyboard] Add SiddersKB Majbritt Rev2 (#12598) | Sleepdealer | 2021-05-15 | 18 | -38/+213 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-05-16 | 3 | -0/+372 |
|\| | |||||
| * | [Keymap] Reviung41_Ciutadellla (#12668) | Ciutadellla | 2021-05-15 | 3 | -0/+372 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-05-16 | 8 | -0/+329 |
|\| | |||||
| * | [Keyboard] Add Specskeys support (#12813) | Nico | 2021-05-15 | 8 | -0/+329 |
| | | | | | | | | 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-05-16 | 9 | -0/+376 |
|\| | |||||
| * | [Keyboard] Added Bolsa Supply Midway60 Keyboard (#12747) | Felix Jen | 2021-05-15 | 9 | -0/+376 |
| | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-05-16 | 19 | -0/+1035 |
|\| | |||||
| * | [Keyboard] Added Lucid KB Scarlet [Maker KB] (#12748) | Felix Jen | 2021-05-15 | 9 | -0/+394 |
| | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> | ||||
| * | [Keyboard] Add Chevron (#12762) | Ramon Imbao | 2021-05-15 | 10 | -0/+641 |
| | | | | | | | | 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-05-16 | 17 | -0/+618 |
|\| | |||||
| * | [Keyboard] Add Rosa (#12884) | Brandon Lee | 2021-05-15 | 17 | -0/+618 |
| | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-05-15 | 11 | -0/+345 |
|\| | |||||
| * | [Keyboard] Add Potato65 Hotswap keyboard (#12874) | Aeonstrife | 2021-05-15 | 11 | -0/+345 |
| | | | | | | | | 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-05-15 | 10 | -0/+336 |
|\| | |||||
| * | [Keyboard] Add Frusta Fundamental (#12583) | William Lam | 2021-05-15 | 10 | -0/+336 |
| | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> | ||||
* | | Merge remote-tracking branch 'upstream/master' into develop | fauxpark | 2021-05-15 | 17 | -297/+702 |
|\| | |||||
| * | [Keyboard] Add Neopad macropad (#12614) | rookiebwoy | 2021-05-14 | 10 | -0/+387 |
| | | |||||
| * | Fix Marauder and add readme (#12906) | Ryan | 2021-05-14 | 7 | -297/+315 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-05-14 | 25 | -88/+1099 |
|\| | |||||
| * | [Keyboard] Add Marauder (#12550) | Cosmin | 2021-05-14 | 6 | -0/+297 |
| | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> | ||||
| * | [Keyboard] split right shift iso layout for ok60 (#12890) | Faehriss | 2021-05-14 | 1 | -0/+14 |
| | | |||||
| * | TKC Portico: layout macro/Configurator touch-up (#12897) | James Young | 2021-05-14 | 6 | -88/+97 |
| | | |||||
| * | [Keyboard] Add UM-70 (#12556) | duoshock | 2021-05-14 | 12 | -0/+691 |
| | | | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: online <33636898+online@users.noreply.github.com> | ||||
* | | [Keymap] Fix QWERTY/DVORAK status output for kzar keymap (#12895) | Dave Vandyke | 2021-05-14 | 1 | -1/+1 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-05-14 | 9 | -0/+371 |
|\| | |||||
| * | [Keyboard] Added FJLabs Polaris (#12746) | Felix Jen | 2021-05-13 | 9 | -0/+371 |
| | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-05-14 | 15 | -0/+608 |
|\| | |||||
| * | [Keymap] csc027/keymap-updates (#12694) | csc027 | 2021-05-13 | 2 | -0/+33 |
| | | |||||
| * | [Keyboard] Add Studio Kestra Cascade PCB (#12704) | studiokestra | 2021-05-13 | 13 | -0/+575 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-05-14 | 8 | -0/+4859 |
|\| | |||||
| * | [Keyboard] Add Training Wheel 40 (#12542) | KnoblesseOblige | 2021-05-13 | 8 | -0/+4859 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-05-14 | 11 | -0/+286 |
|\| | |||||
| * | [Keyboard] Added smAllice (#12543) | Brandon | 2021-05-13 | 11 | -0/+286 |
| | | | | | | Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-05-14 | 1 | -2/+2 |
|\| | |||||
| * | [Keyboard] update dactyl manuform 4x5 thumb cluster wiring(#12545) | Nathaniel | 2021-05-13 | 1 | -2/+2 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-05-14 | 8 | -0/+301 |
|\| | |||||
| * | [Keyboard] Add fluxlab zplit keyboard (#12396) | cccywj | 2021-05-13 | 8 | -0/+301 |
| | | | | | | | | 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-05-14 | 1 | -5/+5 |
|\| | |||||
| * | [Keyboard] Fix Alix40 layout (#12398) | Ross Nelson | 2021-05-13 | 1 | -5/+5 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-05-14 | 9 | -0/+246 |
|\| | |||||
| * | [Keyboard] add feels/feels65 (#12426) | Brandon Claveria | 2021-05-13 | 9 | -0/+246 |
| | | | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Swiftrax <swiftrax@gmail.com> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-05-14 | 16 | -14/+654 |
|\| | |||||
| * | [Keyboard] Add Plaid-Pad Rev3 and oled keymap (#12464) | Ben | 2021-05-13 | 16 | -14/+654 |
| | | | | | | Co-authored-by: Erovia <Erovia@users.noreply.github.com> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-05-14 | 13 | -0/+372 |
|\| | |||||
| * | [Keyboard] Add pisces keyboard (#12287) | knaruo | 2021-05-13 | 13 | -0/+372 |
| | | | | | | Co-authored-by: Nick Brassel <nick@tzarc.org> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-05-14 | 3 | -47/+26 |
|\| | |||||
| * | [Keyboard][PloopyCo] Fix code for Mini and Nano Trackballs (#12889) | Drashna Jaelre | 2021-05-13 | 3 | -47/+26 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-05-14 | 16 | -0/+1007 |
|\| |