Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-02-23 | 1 | -1/+1 | |
|\| | ||||||
| * | pill60 fix info.json to be used in configurator (#11979) | Ikta | 2021-02-23 | 1 | -1/+1 | |
| | | ||||||
* | | Bugfix for Jacky Studio keyboards (#11981) | James Young | 2021-02-22 | 35 | -4304/+0 | |
| | | | | | | | | | | PR 10528 was intended to move the source for the Bear 65 and S7 Elephant to the new `jacky_studio` vendor directory. Instead of moving the source files, that PR added the source as if they were newly-supported. The result is that the Bear 65 and both revisions of the S7 Elephant have working, identical firmware in two different directories. This commit removes the source from the old directories. | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-02-22 | 18 | -0/+629 | |
|\| | ||||||
| * | [Keyboard] Disarray (#11583) | SneakboxKB | 2021-02-21 | 18 | -0/+629 | |
| | | | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: mujimanic <64090325+mujimanic@users.noreply.github.com> | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-02-22 | 12 | -0/+591 | |
|\| | ||||||
| * | [Keyboard] Add Manibus keyboard and layout from Blank Tehnologii (#11832) | Alex Paulescu | 2021-02-21 | 12 | -0/+591 | |
| | | | | | | | | 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-02-22 | 9 | -0/+527 | |
|\| | ||||||
| * | [Keyboard] Tokyo Keyboard alix40 initial commit (#11918) | James | 2021-02-21 | 9 | -0/+527 | |
| | | | | | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: QuadCube <quadcube@QuadCube-Mac-mini.local> | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-02-22 | 13 | -0/+1844 | |
|\| | ||||||
| * | [Keyboard] Add Daji Seis Cinco (#11955) | toraifu | 2021-02-21 | 13 | -0/+1844 | |
| | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-02-22 | 3 | -3/+53 | |
|\| | ||||||
| * | [Keyboard] Graystudio COD67 VIA support (#11961) | Rys Sommefeldt | 2021-02-21 | 3 | -3/+53 | |
| | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-02-22 | 3 | -3/+8 | |
|\| | ||||||
| * | [Keyboard] reduce confusion for kbdfans/kbd75 rounds/revisions (#11972) | Joshua Diamond | 2021-02-21 | 3 | -3/+8 | |
| | | ||||||
* | | Clean up some user keymaps specifying MCU (#11966) | Ryan | 2021-02-22 | 19 | -1398/+31 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-02-21 | 5 | -0/+134 | |
|\| | ||||||
| * | [Keymap] Add via support to Durgod K320 (#11960) | Maxime Coirault | 2021-02-21 | 5 | -0/+134 | |
| | | | | | | Co-authored-by: Maxime Coirault <maxime.coirault@zerokeyboard.com> | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-02-21 | 1 | -2/+2 | |
|\| | ||||||
| * | [Keyboard] Rebound: change vendor and product ID for VIA (#11965) | Ross Montsinger | 2021-02-21 | 1 | -2/+2 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-02-21 | 2 | -55/+55 | |
|\| | ||||||
| * | [Keyboard] Pill60: fix default keymap shift key, fix info.json to default ↵ | Ikta | 2021-02-20 | 2 | -55/+55 | |
| | | | | | | | | keymap (#11919) | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-02-21 | 4 | -0/+149 | |
|\| | ||||||
| * | [Keymap] Adding my v60 Type R keymap (#11911) | IFo Hancroft | 2021-02-20 | 4 | -0/+149 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-02-21 | 4 | -0/+129 | |
|\| | ||||||
| * | [Keymap] My Prime_E Keymap (#11899) | IFo Hancroft | 2021-02-20 | 4 | -0/+129 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-02-21 | 8 | -0/+294 | |
|\| | ||||||
| * | [Keymap] My Idobo Keymap (#11897) | IFo Hancroft | 2021-02-20 | 4 | -0/+151 | |
| | | ||||||
| * | [Keymap] My ErgoDash Keymap (#11895) | IFo Hancroft | 2021-02-20 | 4 | -0/+143 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-02-21 | 3 | -0/+373 | |
|\| | ||||||
| * | [Keymap] Bongo Cat + WPM Counter OLED keymap (#11871) | Jonathan Law | 2021-02-20 | 3 | -0/+373 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-02-21 | 3 | -0/+196 | |
|\| | ||||||
| * | [Keyboard] Support MJ64 REV3 - a 60% RGB Hotswap with arrow (#11785) | MelGeek | 2021-02-20 | 3 | -0/+196 | |
| | | | | | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> Co-authored-by: Drashna Jaelre <drashna@live.com> | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-02-21 | 5 | -31/+228 | |
|\| | ||||||
| * | [Keyboard] Update MJ63 architecture to support multi version (#11788) | MelGeek | 2021-02-20 | 5 | -31/+228 | |
| | | | | | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> Co-authored-by: Drashna Jaelre <drashna@live.com> | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-02-21 | 13 | -10/+445 | |
|\| | ||||||
| * | [Keyboard] Add DimplePlus 7u Layout (#11816) | James Skeen | 2021-02-20 | 3 | -10/+118 | |
| | | | | | | Co-authored-by: James Skeen <skeen@macbook.attlocal.net> | |||||
| * | [Keyboard] Add MIO keyboard (#11852) | Naoto Takai | 2021-02-20 | 10 | -0/+327 | |
| | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-02-21 | 10 | -0/+448 | |
|\| | ||||||
| * | [Keyboard] Added Ketch support (#11656) | Ethan Madden | 2021-02-20 | 10 | -0/+448 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-02-21 | 1 | -157/+162 | |
|\| | ||||||
| * | ergodox_ez / dvorak_42_key layout: convert macros to new format (#11139) | LucW | 2021-02-20 | 1 | -157/+162 | |
| | | | | | | Co-authored-by: luc wastiaux <luc.wastiaux@airpost.net> | |||||
* | | added unix60, moved togehter with southpaw75 into fr4 folder (#11195) | mkdl | 2021-02-20 | 14 | -0/+182 | |
| | | | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-02-20 | 9 | -0/+243 | |
|\| | ||||||
| * | Added ConsoleKeyboard (#11950) | gazeddy | 2021-02-21 | 9 | -0/+243 | |
| | | | | | | | | Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Ryan <fauxpark@gmail.com> | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-02-20 | 1 | -2/+2 | |
|\| | ||||||
| * | Fix minor typo (#11962) | Jonathan Haddock | 2021-02-20 | 1 | -2/+2 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-02-20 | 21 | -0/+447 | |
|\| | ||||||
| * | [Keyboard] keyboards/anavi: Add ANAVI Macro Pad 2 (#11821) | Leon Anavi | 2021-02-20 | 21 | -0/+447 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ANAVI Macro Pad 2 is an open source mini mechanical keyboard with 2 keys and backlit. Powered by ATtiny 85 microcontroller and with microUSB connector. Designed with KiCad. Provides the following keymaps for ANAVI Macro Pad 2: - Default (with a, b and combo to control the LEDs) - Copy & paste - Tap dance example with a, b and c - Mute - Volume - Zoom - Jitsi Meet Co-authored-by: Drashna Jaelre <drashna@live.com> Signed-off-by: Leon Anavi <leon@anavi.org> Co-authored-by: Drashna Jaelre <drashna@live.com> | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-02-20 | 11 | -0/+339 | |
|\| |