summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-254-2/+74
|\
| * Add VIA support for Filco Majestouch 2 /w The Tiger Lily (#12401)Christian Fehmer2021-04-254-2/+74
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-251-10/+0
|\|
| * not accessible and not needed anyway for a test keymap (#12366)Pavlos Vinieratos2021-04-251-10/+0
| |
* | Format code according to conventions (#12680)github-actions[bot]2021-04-251-2/+2
| | | | | | Co-authored-by: QMK Bot <hello@qmk.fm>
* | feat: infinite timeout for leader key (#6580)Daniel Rodríguez Rivero2021-04-253-2/+25
| | | | | | | | | | * feat: implement leader_no_timeout logic * docs(leader_key): infinite leader timeout docs
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-2211-0/+393
|\|
| * adding keyboard (#12414)SonOfAres2021-04-2211-0/+393
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * adding keyboard * Update keyboards/iriskeyboards/readme.md - picture size Co-authored-by: Ryan <fauxpark@gmail.com> * Delete iriskeyboards.json, it belongs in VIA repo * Update info.json * Update readme.md * Update keyboards/iriskeyboards/keymaps/default/keymap.c Removing unnecessary layers Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-2211-4/+115
|\|
| * VIA support for Planck Rev6 (#9144)George Wietor2021-04-2211-4/+115
| | | | | | | | | | Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: George Wietor <george@LIGHT-GRAY.local> Co-authored-by: Jack Humbert <jack.humb@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-229-0/+240
|\|
| * Delilah keyboard added (#12638)rainkeebs2021-04-229-0/+240
| | | | | | | | | | | | | | | | | | | | | | | | | | * Delilah keyboard added * Apply suggestions from code review Co-authored-by: Drashna Jaelre <drashna@live.com> * removed unnecessary lines as per review * removed unnecessary lines as per review Co-authored-by: Drashna Jaelre <drashna@live.com>
* | [CI] Format code according to conventions (#12650)github-actions[bot]2021-04-222-19/+19
| | | | | | Co-authored-by: QMK Bot <hello@qmk.fm>
* | LED Matrix: Split (#12633)Ryan2021-04-222-6/+56
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-212-0/+94
|\|
| * Personal keymap for dztech DZ60RGB plus README.md (#12485)MechMaster482021-04-212-0/+94
| | | | | | | | | | | | | | * Personal keymap and README to go along with it. * Noticed typo in README and removed name from comment in keymap * Added GPL copyright notice
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-203-168/+74
|\|
| * Update for the dodger keymap for the Planck (#12456)Joshua Coffey2021-04-203-168/+74
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-201-0/+9
|\|
| * Add additional info to PR Checklist (#12630)Drashna Jaelre2021-04-201-0/+9
| | | | | | Co-authored-by: Nick Brassel <nick@tzarc.org>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-201-1/+1
|\|
| * Fix for gcc10 teensy_lc eeprom build warning (#12587)Joel Challis2021-04-201-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-209-0/+554
|\|
| * [Keyboard] Siris (#12415)Brandon Claveria2021-04-209-0/+554
| | | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Swiftrax <swiftrax@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-2018-0/+543
|\|
| * [Keyboard] add adelais rev4 (#12443)mechlovin2021-04-209-0/+155
| |
| * [Keyboard] Added BKS65 Solder PCB (#12451)Felix Jen2021-04-209-0/+388
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-207-0/+336
|\|
| * [Keyboard] Add amigopunk, a handwired 75% ALPS (#12489)Christiano Haesbaert2021-04-207-0/+336
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-204-18/+92
|\|
| * [Keyboard] Matrix 1.2og AVR PCB - VIA support (#12534)kb-elmo2021-04-204-18/+92
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-208-17/+57
|\|
| * [Keyboard] Added support for the older no_led revision (#12563)Mikkel Jeppesen2021-04-208-17/+57
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-201-1/+1
|\|
| * [Keyboard] Update ISO Macro vendor ID to meet VIA requirement (#12564)duoshock2021-04-201-1/+1
| | | | | | Co-authored-by: online <33636898+online@users.noreply.github.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-2018-2/+444
|\|
| * [Keyboard] fix bella debounce (#12568)kb-elmo2021-04-202-2/+2
| |
| * [Keyboard] Add Acperience12 macropad (#12573)yynmt2021-04-2016-0/+442
| | | | | | Co-authored-by: yynmt <yynmt@yynmt.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-201-24/+57
|\|
| * [Keyboard] Fix and improve SPI transport in the Lagrange (#12606)Dimitris Papavasiliou2021-04-201-24/+57
| | | | | | Co-authored-by: Dimitris Papavasiliou <dpapavas@gmail.com>
* | [Keyboard] kint2pp: reduce input latency by ≈10ms (#12625)Michael Stapelberg2021-04-202-0/+7
| |
* | [Keyboard] kint36: switch to sym_eager_pk debouncing (#12626)Michael Stapelberg2021-04-201-0/+4
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-206-0/+156
|\|
| * [Keyboard] doodle macropad - 03/14 (#12243)AlisGraveNil2021-04-206-0/+156
| | | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-203-4/+10
|\|
| * [Keyboard] Refactor IF87_rev1 (#12574)mechlovin2021-04-203-4/+10
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-202-4/+5
|\|
| * [Keyboard] Fixing files for Orto4exent (#12607)tszaboo2021-04-202-4/+5
| | | | | | | | | | 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 developQMK Bot2021-04-201-0/+2
|\|
| * [Keyboard] Set OLED_DISPLAY_128X64 for Arch-36 (#12609)obosob2021-04-201-0/+2
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-12 03:16:44 +0000