summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * Kopibeng MNK88 Layout Extension (#14796)James Young2021-10-122-106/+581
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * friendly-format info.json * mnk88.h: use QMK 3-character notation * mnk88.h: add matrix diagram * add LAYOUT_tkl_ansi_f13 * add LAYOUT_tkl_ansi_tsangan_f13 * add LAYOUT_tkl_iso_f13 * add LAYOUT_tkl_iso_tsangan_f13
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-1221-0/+909
|\|
| * [Keyboard] Add MachKeyboards Mach3 (#14791)etiennelepagel2021-10-1111-0/+269
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
| * [Keyboard] Add "Center x Enter" (#14790)takashicompany2021-10-1110-0/+640
| | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-125-234/+225
|\|
| * KabeDon98E Refactor (#14778)James Young2021-10-115-234/+225
| | | | | | Co-authored-by: Joel Challis <git@zvecr.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-123-10/+39
|\|
| * [Keymap] Add workman layout (#14792)Reibl János Dániel2021-10-113-10/+39
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-1210-5/+205
|\|
| * [Keyboard] Add ISOlation and some kb-elmo keyboard updates (#14656)kb-elmo2021-10-1110-5/+205
| | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-124-236/+437
|\|
| * Nordic60 layout rework/extension (#14794)James Young2021-10-114-236/+437
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-1216-0/+693
|\|
| * [Keyboard] Add Split65 to keyboards/handwired (#13264)Joris Wachsmuth2021-10-1116-0/+693
| | | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Joris Wachsmuth <jwachsmuth@techfak.uni-bielefeld.de>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-122-0/+47
|\|
| * [Keymap] Added Gherkin VIA keymap (#14779)thompson-ele2021-10-112-0/+47
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-1210-0/+309
|\|
| * [Keyboard] z34 split keyboard by zigotica (#14582)Sergi Meseguer2021-10-1110-0/+309
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-1212-43/+741
|\|
| * [Keymap] Adding my personal Planck layout (#14564)Jimmy Sjölund2021-10-114-0/+419
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
| * [Keymap] Jonavin new obe keymap (#14657)jonavin2021-10-118-43/+322
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Jonavin <=>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-113-77/+138
|\|
| * handwired/nicekey optimisation (#14788)Ryan2021-10-113-77/+138
| | | | | | | | | | | | | | * handwired/nicekey optimisation * Add some consts * Read address from progmem, pass it into send_string_with_delay_P
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-111-5/+5
|\|
| * Allow AVR Bootloader size to be configurable (#14783)Drashna Jaelre2021-10-111-5/+5
| | | | | | | | | | * Allow AVR Bootloader size to be configurable * revert changes to atmel dfu
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-112-0/+141
|\|
| * [Keymap] gipsy-king's layout for cornelius (#14602)bgrosse-midokura2021-10-112-0/+141
| | | | | | Co-authored-by: Benjamin Große <ste3ls@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-1114-1/+594
|\|
| * [Keyboard] Add ZSA Moonlander VIA support (#14603)Quinn Mikelson2021-10-114-1/+136
| | | | | | | | Co-authored-by: Quinn Mikelson <quinn.mikelson@tyvak.com> Co-authored-by: Drashna Jael're <drashna@live.com>
| * [Keyboard] Add Rart67M and support via (#14630)Alabahuy2021-10-1110-0/+458
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-1110-0/+421
|\|
| * [Keyboard] Add Jay60 PCB (#14676)mechlovin2021-10-1110-0/+421
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-119-0/+920
|\|
| * [Keymap] lets split keymap for shaymdev (#14663)Shay Merrill2021-10-113-0/+253
| | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com>
| * [Keymap] Architeutis Dux keymap (#14728)Dalius Dobravolskas2021-10-116-0/+667
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-1118-0/+804
|\|
| * [Keyboard] Add blank01 keyboard (#14698)gkeyboard2021-10-1111-0/+542
| | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com>
| * [Keyboard] New Keyboard: Horizon (#14776)Steven Karrmann2021-10-117-0/+262
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-114-70/+71
|\|
| * [Keyboard] Modify mokey64 matrix (#14761)rhmokey2021-10-114-70/+71
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-119-0/+1052
|\|
| * [Keyboard] Add BIOI F60 (#14763)kb-elmo2021-10-119-0/+1052
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-111-12/+12
|\|
| * [Keyboard] Fix lck75 via keymap (#14786)Drashna Jaelre2021-10-111-12/+12
| |
* | Fix misplaced endif in led_matrix_drivers.c (#14785)Ryan2021-10-101-4/+4
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-113-4/+17
|\|
| * [Keyboard] Add bootmagic lite keys to both halve of Sweep (#14732)Albert Y2021-10-103-4/+17
| | | | | | Co-authored-by: filterpaper <filterpaper@localhost>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-114-4/+11
|\|
| * [Keyboard] Add bootmagic lite keys to both halve of A.dux (#14731)Albert Y2021-10-104-4/+11
| | | | | | Co-authored-by: filterpaper <filterpaper@localhost>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-1111-76/+425
|\|