Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'user_led_configuration' of https://github.com/jpetermans/qmk_fi... | jpetermans | 2017-05-08 | 0 | -0/+0 |
|\ | |||||
| * | minor change on lock leds | jpetermans | 2017-05-08 | 1 | -6/+4 |
| * | simplified lock led function | jpetermans | 2017-04-29 | 2 | -42/+17 |
* | | Merge remote-tracking branch 'upstream/master' into user_led_configuration | jpetermans | 2017-05-08 | 233 | -1958/+7085 |
|\ \ | |||||
| * \ | Merge pull request #1279 from awpr/master | Erez Zukerman | 2017-05-07 | 2 | -26/+38 |
| |\ \ | |||||
| | * | | Change to per-key eager debouncing for ErgoDox EZ. | Andrew Pritchard | 2017-04-26 | 2 | -26/+38 |
| * | | | Merge pull request #1275 from Vifon/dynamic_macro/trailing_keypresses | Jack Humbert | 2017-05-07 | 1 | -5/+52 |
| |\ \ \ | |||||
| | * | | | dynamic_macro.h: Do not use backlight_toggle if backlight is disabled | Wojciech Siewierski | 2017-05-05 | 1 | -0/+2 |
| | * | | | dynamic_macro.h: Add debug logs | Wojciech Siewierski | 2017-05-04 | 1 | -0/+30 |
| | * | | | dynamic_macro.h: Make the documentation more clear | Wojciech Siewierski | 2017-05-04 | 1 | -2/+5 |
| | * | | | dynamic_macro.h: Do not save the keys being held when stopping the recording | Wojciech Siewierski | 2017-05-04 | 1 | -3/+15 |
| * | | | | Merge pull request #1278 from shieldsd/master | Jack Humbert | 2017-05-07 | 3 | -0/+132 |
| |\ \ \ \ | |||||
| | * | | | | Add new keymap for dshields. | Daniel Shields | 2017-05-05 | 3 | -0/+132 |
| * | | | | | Merge pull request #1280 from tobsn/patch-1 | Jack Humbert | 2017-05-07 | 1 | -1/+1 |
| |\ \ \ \ \ | |||||
| | * | | | | | lowercase .jpg I think | Tobias O | 2017-05-05 | 1 | -1/+1 |
| | |/ / / / | |||||
| * | | | | | Merge pull request #1282 from coderkun/coderkun_neo2 | Jack Humbert | 2017-05-07 | 2 | -38/+137 |
| |\ \ \ \ \ | |||||
| | * | | | | | Update README for keymap “coderkun_neo2” | coderkun | 2017-05-06 | 1 | -9/+2 |
| | * | | | | | Merge tag '0.5.43' into coderkun_neo2 | coderkun | 2017-05-06 | 266 | -2009/+8608 |
| | |\ \ \ \ \ | |||||
| | * | | | | | | Fix F-keys on right hand to start on first key | coderkun | 2017-05-06 | 1 | -1/+1 |
| | * | | | | | | Fix keymap “coderkun_neo” to use LALT instead of RALT | coderkun | 2017-04-01 | 1 | -6/+6 |
| | * | | | | | | Add several Unicode symbols to keymap “coderkun_neo2” | coderkun | 2017-04-01 | 2 | -20/+20 |
| | * | | | | | | Add keymap diagrams to readme of keymap “coderkun_neo2” | coderkun | 2017-04-01 | 1 | -9/+114 |
| | * | | | | | | Merge branch 'master' into coderkun_neo2 | coderkun | 2017-04-01 | 586 | -5506/+32053 |
| | |\ \ \ \ \ \ | |||||
| | * | | | | | | | Fix return value of hex_to_keycode() function in keymap “coderkun_neo2” | coderkun | 2016-12-28 | 1 | -4/+5 |
| * | | | | | | | | Merge pull request #1284 from bigtunaIO/master | Jack Humbert | 2017-05-07 | 11 | -19/+450 |
| |\ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | | | |||||
| | * | | | | | | | Merge branch 'dev' | Adam Lee | 2017-05-07 | 9 | -12/+408 |
| | |\ \ \ \ \ \ \ | |||||
| | | * | | | | | | | [Miuni32] Rm accidentally committed file | Adam Lee | 2017-05-07 | 1 | -42/+0 |
| | | * | | | | | | | Merge remote-tracking branch 'bigtunaio/layouts/adam-lee' into dev | Adam Lee | 2017-05-07 | 5 | -0/+191 |
| | | |\ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ | Merge branch 'master' into layouts/adam-lee | Adam YH Lee | 2017-04-16 | 42 | -72/+115 |
| | | | |\ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | | Add a personal layout for adam | Adam YH Lee | 2017-04-16 | 5 | -0/+191 |
| | | * | | | | | | | | | Merge remote-tracking branch 'upstream/master' into dev | Adam Lee | 2017-05-07 | 123 | -459/+3724 |
| | | |\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | | | |||||
| | | * | | | | | | | | | Modified ht_156 keymap | htang156 | 2017-04-27 | 1 | -9/+13 |
| | | * | | | | | | | | | Added simple macros to test. | htang156 | 2017-04-16 | 1 | -9/+62 |
| | | * | | | | | | | | | Added media layer for ht_156 | htang156 | 2017-04-16 | 1 | -3/+18 |
| | | * | | | | | | | | | Added ht_156 keymap files | htang156 | 2017-04-16 | 4 | -0/+139 |
| | | * | | | | | | | | | Merge branch 'master' into dev | Adam YH Lee | 2017-04-16 | 42 | -72/+115 |
| | | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | |/| / / / / / / / | | | | |/ / / / / / / | |||||
| | | * | | | | | | | | Replace RALT with RSFT | Adam YH Lee | 2017-04-16 | 1 | -2/+2 |
| | | * | | | | | | | | Added END and other keymap file formatting. | htang156 | 2017-04-16 | 1 | -13/+13 |
| | | * | | | | | | | | Added DEL and F1 to F12 keys | htang156 | 2017-04-16 | 1 | -6/+6 |
| | | * | | | | | | | | Added keymap commets to default layout. | htang156 | 2017-04-16 | 1 | -0/+36 |
| | | * | | | | | | | | Add TAB, N, LSFT on Layer 2 | Adam YH Lee | 2017-04-14 | 1 | -1/+1 |
| | | * | | | | | | | | Add KC_T on Layer 2 | Adam YH Lee | 2017-04-13 | 1 | -1/+1 |
| | | * | | | | | | | | Add LCTL + L on Layer 2 | Adam YH Lee | 2017-04-13 | 1 | -1/+1 |
| | * | | | | | | | | | Merge remote-tracking branch 'upstream/master' | Adam Lee | 2017-05-07 | 164 | -521/+3829 |
| | |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| / / / / / / / / | | |/ / / / / / / / | |||||
| * | | | | | | | | | Merge pull request #1272 from Thor77/ps2avrGB-keymap-kc-prefix | Jack Humbert | 2017-05-04 | 2 | -8/+26 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | Use KC_KEYMAP for default-keymap | Thor77 | 2017-05-03 | 1 | -8/+8 |
| | * | | | | | | | | | Add KEYMAP without KC_##-prefix | Thor77 | 2017-05-03 | 1 | -0/+18 |
| | | |_|_|_|/ / / / | | |/| | | | | | | | |||||
| * | | | | | | | | | Merge pull request #1273 from Vifon/pr_1267_fix | Jack Humbert | 2017-05-04 | 6 | -12/+270 |
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / | | |/| | | | | | | | |||||
| | * | | | | | | | | dynamic_macro.h: Fix an off-by-two error | Wojciech Siewierski | 2017-05-04 | 1 | -3/+3 |
| | * | | | | | | | | dynamic_macro.h: Always toggle the backlight twice as a notification | Wojciech Siewierski | 2017-05-04 | 1 | -3/+1 |