| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-10-16 | 2 | -2/+3 | |
| |\| | ||||||
| | * | [Keymap] Userspace updates (#14832) | stanrc85 | 2021-10-15 | 2 | -2/+3 | |
| | | | ||||||
| * | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-10-14 | 1 | -1/+13 | |
| |\| | ||||||
| | * | [Keymap] Display default layer name (#14819) | Reibl János Dániel | 2021-10-14 | 1 | -1/+13 | |
| | | | ||||||
| * | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-10-12 | 2 | -0/+8 | |
| |\| | ||||||
| | * | [Keymap] Add workman layout (#14792) | Reibl János Dániel | 2021-10-11 | 2 | -0/+8 | |
| | | | ||||||
| * | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-10-12 | 4 | -43/+112 | |
| |\| | ||||||
| | * | [Keymap] Jonavin new obe keymap (#14657) | jonavin | 2021-10-11 | 4 | -43/+112 | |
| | | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Jonavin <=> | |||||
| * | | Remove sysex API (#14723) | Ryan | 2021-10-06 | 1 | -1/+0 | |
| | | | ||||||
| * | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-10-05 | 4 | -4/+20 | |
| |\| | ||||||
| | * | [Keymap] Some updates to mechmerlin userspace and keymaps (#14711) | MechMerlin | 2021-10-05 | 4 | -4/+20 | |
| | | | ||||||
| * | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-09-29 | 5 | -47/+43 | |
| |\| | ||||||
| | * | [Keymap] Update to Drashna Code (#14644) | Drashna Jaelre | 2021-09-29 | 5 | -47/+43 | |
| | | | ||||||
| * | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-09-29 | 2 | -1/+75 | |
| |\| | ||||||
| | * | [Keymap] Jonavin murphpad keymap update (#14637) | jonavin | 2021-09-29 | 2 | -1/+75 | |
| | | | | | | | Co-authored-by: Jonavin <=> | |||||
| * | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-09-28 | 3 | -57/+87 | |
| |\| | ||||||
| | * | [Keymap] fix NKRO - switch to get_mods() and refactor encoder action code ↵ | jonavin | 2021-09-28 | 3 | -57/+87 | |
| | | | | | | | | | | | (#14278) Co-authored-by: Jonavin <=> | |||||
| * | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-09-28 | 1 | -0/+4 | |
| |\| | ||||||
| | * | [Keymap] arkag userspace/keymap -- new macro and minor preonic keymap change ↵ | Alexander Kagno | 2021-09-28 | 1 | -0/+4 | |
| | | | | | | | | | | | (#14623) Co-authored-by: Ryan <fauxpark@gmail.com> | |||||
| * | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-09-27 | 1 | -2/+1 | |
| |\| | ||||||
| | * | Cleanup issues identified by lgtm (#14459) | Zach White | 2021-09-27 | 1 | -2/+1 | |
| | | | | | | | | | | | * cleanup issues identified by lgtm * fix the git_status check | |||||
| * | | Merge remote-tracking branch 'upstream/master' into develop | fauxpark | 2021-09-20 | 10 | -48/+216 | |
| |\| | ||||||
| | * | [Keymap] Updates to existing keymaps and userspace (#14503) | Konstantin Đorđević | 2021-09-19 | 10 | -48/+216 | |
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> | |||||
| * | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-09-13 | 2 | -0/+40 | |
| |\| | ||||||
| | * | [Keymap] Userspace updates (#14418) | stanrc85 | 2021-09-13 | 2 | -0/+40 | |
| | | | ||||||
| * | | Move Bluetooth config to common_features.mk (#14404) | Ryan | 2021-09-12 | 1 | -2/+2 | |
| |/ | | | | | | | | | * Move Bluetooth config to common_features.mk * Update common_features.mk Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Drashna Jaelre <drashna@live.com> | |||||
| * | [Keymap] moults31 userspace and keymaps (#12025) | Zac Moulton | 2021-09-10 | 10 | -0/+482 | |
| | | ||||||
| * | [Keymap] Fix Drashna Keymap issues missed before Develop merge (#14271) | Drashna Jaelre | 2021-09-01 | 3 | -105/+113 | |
| | | ||||||
| * | [Keymap] hvp keymap for Cornelius, updated ut47.2 and userspace (#14187) | hvp | 2021-09-01 | 5 | -7/+120 | |
| | | ||||||
| * | [Keymap] Jonavin keymap gmmk pro (#14220) | jonavin | 2021-09-01 | 3 | -2/+30 | |
| | | | | | | add rgb nightmode and optional colemak layer Co-authored-by: Jonavin <=> | |||||
| * | [Keymap] cwebster2 Keymap and userspace updates (#14258) | Casey Webster | 2021-08-31 | 2 | -20/+21 | |
| | | ||||||
| * | [Keymap] reflects current rick's keymap (#14169) | Ibnu Daru Aji | 2021-08-31 | 9 | -243/+210 | |
| | | ||||||
| * | [Keymap] Drashna keymap fixups (#14140) | Drashna Jaelre | 2021-08-24 | 3 | -13/+7 | |
| | | ||||||
| * | [Core] Refactor OLED to allow easy addition of other types (#13454) | Xelus22 | 2021-08-24 | 21 | -37/+51 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * add docs * core changes * update keyboards to new OLED * updated users to new OLED * update layouts to new OLED * fixup docs * drashna's suggestion * fix up docs * new keyboards with oled * core split changes * remaining keyboard files * Fix The Helix keyboards oled options * reflect develop Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: mtei <2170248+mtei@users.noreply.github.com> | |||||
| * | Updated RGB Matrix suspend define part 3 (#13954) | Drashna Jaelre | 2021-08-22 | 1 | -1/+1 | |
| | | | | | | | | | | * Updated RGB Matrix suspend define part 3 * Revert "Update config.h for kbdfans/kbd67/mkiirgb/v3 (#13978)" This reverts commit 80015f7fb023f27ad5307815fd5433694a3bcb4a. * Add additional boards/keymaps | |||||
| * | [Keymap] Drashna's Improve OLEDs and custom Split code (#14063) | Drashna Jaelre | 2021-08-21 | 13 | -309/+303 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fill the oleds with right mods * Enable double mods on x32 oleds * Disable forced NKRO * Make oleds fancy only on good MCUs * Overhaul oled display * Further enhance oled, with kitty! * Final oled form * Not working transport * Transport id of woring * Add acceleration * fix button placement for accel macro * Fix accelartion location and behavior * Remove OLED sync code * Fix alignment issue * Remove audio hack * Fix up zima keymap * Add matrix slave scan function and cleanup drashna.h * Clean up user space * Allow userspace sync to be disable-able * Fix weird issue with audio * Fix alignment issue with user split sync * Disable second rgb matrix task * Disable additional animations * Change dynamic keymap settings * Hacky fix for borked corne * Add Blackpill (F411) support to tractyl manuform * remove manual via eeprom reset * Remove all references to rgblight twinkle * Fix issues with config processing | |||||
| * | Merge remote-tracking branch 'upstream/master' into develop | James Young | 2021-08-19 | 8 | -1/+465 | |
| |\ | | | | | | | | | | | Conflicts: keyboards/gmmk/pro/ansi/keymaps/jonavin/rules.mk keyboards/space_space/rules.mk | |||||
| | * | [Keymap] Add jonavin user space / common functions (#13876) | jonavin | 2021-08-19 | 5 | -0/+432 | |
| | | | | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Jonavin <=> | |||||
| | * | [Keymap] Quark AJP10304 layout (#13290) | Alan Pocklington | 2021-08-19 | 3 | -1/+33 | |
| | | | ||||||
| * | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-08-14 | 22 | -326/+1086 | |
| |\| | ||||||
| | * | [Keymap] clean up userspace, add XD75 / Keyboardio Atreus (#13121) | Joshua T | 2021-08-13 | 22 | -326/+1086 | |
| | | | | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Drashna Jaelre <drashna@live.com> | |||||
| * | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-08-13 | 2 | -5/+23 | |
| |\| | ||||||
| | * | [Keymap] Updates to jdelkins userspace and keymaps (#13216) | Joel Elkins | 2021-08-13 | 2 | -5/+23 | |
| | | | | | | | | | | | | | | | - Remove disused dz60/jdelkins_ss keymap - Manage configured features for firmware size - Improve build configuration for the secrets feature - Various keymap tweaks - Clean up formatting in various places | |||||
| * | | Merge remote-tracking branch 'origin/master' into develop | Drashna Jael're | 2021-08-12 | 22 | -908/+794 | |
| |\| | ||||||
| | * | [Keymap] add kuatsure planck keymap (#10625) | Jarrett Drouillard | 2021-08-12 | 2 | -13/+11 | |
| | | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> | |||||
| | * | [Keymap] JJerrell - Add Userspace and ZSA Keyboard Keymaps (#13548) | Jacob Jerrell | 2021-08-12 | 20 | -895/+783 | |
| | | | ||||||
| * | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-08-11 | 8 | -0/+414 | |
| |\| | ||||||
| | * | [Userspace] Add custom tap dancing function (#13963) | Kyle Xiao | 2021-08-11 | 8 | -0/+414 | |
| | | | ||||||
| * | | Merge remote-tracking branch 'upstream/master' into develop | James Young | 2021-08-09 | 6 | -47/+364 | |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes merge conflicts in: - keyboards/bm40hsrgb/config.h - Conflict from PR 13132: - RGB_DISABLE_WHEN_USB_SUSPENDED signature updated in develop branch, unmodified in master branch - updated file with changes from master branch - keyboards/keebio/iris/keymaps/nstickney/keymap.c - Conflict from PR 11456: - layer_state_set_user() updated in develop branch, removed in master branch - updated file with changes from master branch | |||||
| | * | [User] changes to nstickney's keymaps (#11456) | Stick | 2021-08-09 | 6 | -47/+364 | |
| | | | | | | | | | | | | | 0) Built a Bastyl, gave away the ErgoDoxEZ 1) UNICODEMAP 2) Iris left is now Elite-C 3) New QMK flashing instructions | |||||
 |
index : qmk_firmware | |
| [no description] |
| summaryrefslogtreecommitdiffstats |