Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-01-13 | 1 | -1/+1 |
|\ | |||||
| * | Fix keymap.json macro example (#15567) | Tuk Bredsdorff | 2022-01-13 | 1 | -1/+1 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-01-13 | 1 | -0/+80 |
|\| | |||||
| * | Adding Quefrency keymap (#15852) | peott-fr | 2022-01-13 | 1 | -0/+80 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-01-13 | 1 | -26/+28 |
|\| | |||||
| * | [Keyboard] Fix xox70hot via layout (#15863) | Drashna Jaelre | 2022-01-13 | 1 | -26/+28 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-01-13 | 11 | -0/+548 |
|\| | |||||
| * | [Keyboard] Add UM-A Keyboard (#15584) | duoshock | 2022-01-13 | 11 | -0/+548 |
| | | | | | | | | | | 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> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-01-13 | 21 | -0/+2879 |
|\| | |||||
| * | [Keymap] Lily58 : HELL0 NAVI. Interface (#15469) | druotoni | 2022-01-13 | 21 | -0/+2879 |
| | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Joel Challis <git@zvecr.com> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-01-13 | 12 | -0/+554 |
|\| | |||||
| * | [Keyboard] Atlantis AK81_VE support (#15392) | fOmey | 2022-01-13 | 12 | -0/+554 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-01-13 | 15 | -2/+487 |
|\| | |||||
| * | [Keyboard] HoodrowG PCB (#15474) | Andrew Kannan | 2022-01-13 | 9 | -0/+278 |
| | | | | | | | | | | Co-authored-by: Julian <julianzabala1@gmail.com> Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> | ||||
| * | [Keyboard] new layout for squiggle (#15683) | Ibnu Daru Aji | 2022-01-13 | 6 | -2/+209 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-01-13 | 18 | -0/+998 |
|\| | |||||
| * | [Keyboard] Add Dactyl Manuform 6x6_4 and Kinesis keyboards (#15475) | Dmitriy Kuminov | 2022-01-13 | 14 | -0/+611 |
| | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> | ||||
| * | [Keymap] Kyria new custom keymap lw (#15729) | Lucas W | 2022-01-13 | 4 | -0/+387 |
| | | |||||
* | | move winry25tc to winry/ (#15637) | peepeetee | 2022-01-13 | 7 | -5/+10 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-01-13 | 19 | -735/+0 |
|\| | |||||
| * | [Keyboard] remove duplicate m65 (#15831) | Alin Marin Elena | 2022-01-13 | 19 | -735/+0 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-01-13 | 3 | -46/+84 |
|\| | |||||
| * | [Keyboard] move enum_layers in keymaps, in sync with the other mlego/m* (#15832) | Alin Marin Elena | 2022-01-13 | 3 | -46/+84 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-01-13 | 17 | -71/+74 |
|\| | |||||
| * | [Keymap] Misc userspace and keymap improvements (#15844) | Reibl János Dániel | 2022-01-13 | 6 | -53/+50 |
| | | |||||
| * | [Keyboard] Switch a_dux, cradio and ferris to split_3x5_2 (#15850) | Albert Y | 2022-01-13 | 11 | -18/+24 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-01-13 | 4 | -4/+101 |
|\| | |||||
| * | [Keyboard] Fix Simpler6x boards (#15862) | Drashna Jaelre | 2022-01-13 | 4 | -4/+101 |
| | | | | | | | | | | * [Keyboard] Fix simpler64 * [Keyboard] Fix simpler61 | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-01-13 | 10 | -0/+385 |
|\| | |||||
| * | [Keymap] Add personal keymap to GMMK Pro ANSI (#15314) | Choi Byungyoon | 2022-01-12 | 10 | -0/+385 |
| | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> | ||||
* | | PMW3389 Revert Firmware load during Initilization (#15859) | Alabastard-64 | 2022-01-13 | 2 | -5/+2 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-01-13 | 1 | -0/+2 |
|\| | |||||
| * | [Keyboard] Fix compile error caused by variable exclusion on Moonlander (#15860) | Albert Y | 2022-01-12 | 1 | -0/+2 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-01-13 | 2 | -17/+15 |
|\| | |||||
| * | [Docs] Move QMK newbs build environment guide to next section (#15386) | Albert Y | 2022-01-13 | 2 | -17/+15 |
| | | | | | | Co-authored-by: Dasky <32983009+daskygit@users.noreply.github.com> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-01-13 | 1 | -8/+0 |
|\| | |||||
| * | kbdfans/kbd67/mkiirgb/v4: remove duplicate definitions from config.h (#15858) | James Young | 2022-01-12 | 1 | -8/+0 |
| | | |||||
* | | [Keyboard] Fix suihankey/split | Drashna Jael're | 2022-01-12 | 1 | -1/+1 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-01-12 | 9 | -0/+271 |
|\| | |||||
| * | [Keyboard] add Endless80 keyboard (#15022) | moyi4681 | 2022-01-12 | 9 | -0/+271 |
| | | | | | | | | | | Co-authored-by: Joel Challis <git@zvecr.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 | 2022-01-12 | 14 | -0/+591 |
|\| | |||||
| * | [Keyboard] Add KBIC65 keyboard (#15151) | Karl B | 2022-01-12 | 14 | -0/+591 |
| | | | | | | | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Karl Berggren <berggren.karl+git@gmail.com> Co-authored-by: spacefrogfeds <73514335+spacefrogfeds@users.noreply.github.com> Co-authored-by: Karl Berggren <karber@raysearchlabs.com> | ||||
* | | move id67 (#15662) | peepeetee | 2022-01-12 | 20 | -4/+4 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-01-12 | 4 | -0/+254 |
|\| | |||||
| * | [Keymap] Planck Keymap: Inkwell (#14311) | Kevin Hartley | 2022-01-12 | 4 | -0/+254 |
| | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-01-12 | 9 | -0/+290 |
|\| | |||||
| * | [Keyboard] add AddOn macropad (#15841) | Rifaa Subekti | 2022-01-12 | 9 | -0/+290 |
| | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> | ||||
* | | move @kakunpc 's keebs into kakunpc/ (#15814) | peepeetee | 2022-01-12 | 132 | -19/+19 |
| | | | | | | Co-authored-by: kakunpc <15257475+kakunpc@users.noreply.github.com> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-01-12 | 18 | -0/+806 |
|\| | |||||
| * | [Keyboard] Add Simpler60 support (#15499) | EqualzC3 | 2022-01-12 | 18 | -0/+806 |
| | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> |