summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-10
|\
| * Remove commented out BLUETOOTH_ENABLE rules (#14361)Ryan2021-09-10
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-10
|\|
| * Align rgb/led matrix docs with current behaviour (#14367)Joel Challis2021-09-10
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-09
|\|
| * [Keyboard] Add custom pcb for Polaris (#14347)Uy Bui2021-09-09
| | | | | | | | | | | | | | | | | | | | | | * [Keyboard] pcb for Polaris * [Keyboard] pcb for Polaris: update layout * Update keyboards/wekey/polaris/info.json Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'upstream/master' into developfauxpark2021-09-09
|\|
| * Fix CRLF in lyra/rev1 (#14360)Ryan2021-09-09
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-09
|\|
| * [Keyboard] add lyra (#13977)Malevolti2021-09-08
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-09
|\|
| * [Keyboard] Add Olly JF PCB (#14056)mechlovin2021-09-08
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-09
|\|
| * Backport F_CPU/F_USB hack from system76 (#14286)Drashna Jaelre2021-09-08
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-09
|\|
| * [Keymap] Fix Maker Keyboards Alexa Keymap (#14355)Felix Jen2021-09-08
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-09
|\|
| * [Keyboard] Add 61Key (#14259)Ethan Yates2021-09-08
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-09
|\|
| * `ST7565_TIMEOUT 0` and `ST7565_DISABLE_TIMEOUT` should behave the same (#14315)JayceFayne2021-09-08
| |
| * `OLED TIMEOUT 0` and `OLED_DISABLE_TIMEOUT` should behave the same (#14302)JayceFayne2021-09-08
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-09
|\|
| * [Keyboard] Minor tweaks to Work Board layout (#14351)Drashna Jaelre2021-09-08
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-09
|\|
| * Bugfix for Joystick and JSON schema (#14295)Ryan2021-09-09
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-08
|\|
| * [Keyboard] Add new Mokey keyboard (#14329)rhmokey2021-09-08
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-08
|\|
| * [Keymap] Add Gaston's Lily58 custom keymap (#14334)Gastón Jorquera2021-09-08
| | | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Gaston Jorquera <gjorquera@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-08
|\|
| * [Keyboard] Tractyl Manuform - configuration updates (#14314)Drashna Jaelre2021-09-08
| | | | | | | | | | | | | | | | | | | | | | | | | | * [Keyboard] Tractyl Manuform - configuration updates * Update readmes * Add more details * Fix issues with encoder pins * Additional fixes for pin config * Fix up some comments
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-08
|\|
| * [Keyboard] Add VIA keymap for the reviung39 (#14234)Keenan Brock2021-09-08
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-08
|\|
| * Fixes for recent i2c migrations (#14352)Joel Challis2021-09-08
| |
* | Remove Arduino-style `analogRead()` (#14348)Ryan2021-09-08
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-08
|\|
| * [Keyboard] Update VIA support for lazydesigners/the40 (#14240)jackytrabbit2021-09-08
| | | | | | Co-authored-by: Joel Challis <git@zvecr.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-08
|\|
| * [Keymap] New keymap for bm40 (#14182)Gabriel Bustamante2021-09-07
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-08
|\|
| * [Keyboard] add wang ergo (#14245)Rifaa Subekti2021-09-07
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-08
|\|
| * Sneakbox Ava tidy-up (#14298)James Young2021-09-07
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-08
|\|
| * [Keymap] Adding IFo Hancroft's ErgoDox EZ Keymap (#14342)IFo Hancroft2021-09-07
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-08
|\|
| * [Keyboard] Fix issues with 3w6 rev2 matrix (#14346)Drashna Jaelre2021-09-08
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-08
|\|
| * handwired/dactyl - Refactor use of legacy i2c implementation (#14344)Joel Challis2021-09-07
| |