summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1291 from adzenith/persistentJack Humbert2017-05-1258-198/+198
|\
| * Fix spelling of "persistent"Nikolaus Wittenstein2017-05-1158-198/+198
|/
* Merge pull request #1283 from TerryMathews/masterJack Humbert2017-05-1111-0/+544
|\
| * Fix compile errorTerryMathews2017-05-071-0/+2
| * Establish support for Bathroom Epiphanies Tiger Lily controllerTerryMathews2017-05-0711-0/+542
| * Merge pull request #1 from qmk/masterTerryMathews2017-04-08547-5080/+28776
| |\
* | \ Merge pull request #1288 from Nephiel/led-set-on-layer-changeJack Humbert2017-05-111-0/+15
|\ \ \
| * | | Call led_set for layer action events to update LEDs on layer changesNephiel2017-05-101-0/+15
* | | | Merge pull request #1290 from shieldsd/masterJack Humbert2017-05-115-32/+55
|\ \ \ \ | |/ / / |/| | |
| * | | Add new features to dshields keymap.Daniel Shields2017-05-115-32/+55
|/ / /
* | | Add smt keymap for Clueboard (HHKB-style layout) (#1286)Stephen Tudor2017-05-083-0/+211
* | | Merge pull request #1279 from awpr/masterErez Zukerman2017-05-072-26/+38
|\ \ \
| * | | Change to per-key eager debouncing for ErgoDox EZ.Andrew Pritchard2017-04-262-26/+38
* | | | Merge pull request #1275 from Vifon/dynamic_macro/trailing_keypressesJack Humbert2017-05-071-5/+52
|\ \ \ \
| * | | | dynamic_macro.h: Do not use backlight_toggle if backlight is disabledWojciech Siewierski2017-05-051-0/+2
| * | | | dynamic_macro.h: Add debug logsWojciech Siewierski2017-05-041-0/+30
| * | | | dynamic_macro.h: Make the documentation more clearWojciech Siewierski2017-05-041-2/+5
| * | | | dynamic_macro.h: Do not save the keys being held when stopping the recordingWojciech Siewierski2017-05-041-3/+15
* | | | | Merge pull request #1278 from shieldsd/masterJack Humbert2017-05-073-0/+132
|\ \ \ \ \
| * | | | | Add new keymap for dshields.Daniel Shields2017-05-053-0/+132
* | | | | | Merge pull request #1280 from tobsn/patch-1Jack Humbert2017-05-071-1/+1
|\ \ \ \ \ \
| * | | | | | lowercase .jpg I thinkTobias O2017-05-051-1/+1
| |/ / / / /
* | | | | | Merge pull request #1282 from coderkun/coderkun_neo2Jack Humbert2017-05-072-38/+137
|\ \ \ \ \ \
| * | | | | | Update README for keymap “coderkun_neo2”coderkun2017-05-061-9/+2
| * | | | | | Merge tag '0.5.43' into coderkun_neo2coderkun2017-05-06266-2009/+8608
| |\ \ \ \ \ \
| * | | | | | | Fix F-keys on right hand to start on first keycoderkun2017-05-061-1/+1
| * | | | | | | Fix keymap “coderkun_neo” to use LALT instead of RALTcoderkun2017-04-011-6/+6
| * | | | | | | Add several Unicode symbols to keymap “coderkun_neo2”coderkun2017-04-012-20/+20
| * | | | | | | Add keymap diagrams to readme of keymap “coderkun_neo2”coderkun2017-04-011-9/+114
| * | | | | | | Merge branch 'master' into coderkun_neo2coderkun2017-04-01586-5506/+32053
| |\ \ \ \ \ \ \
| * | | | | | | | Fix return value of hex_to_keycode() function in keymap “coderkun_neo2”coderkun2016-12-281-4/+5
* | | | | | | | | Merge pull request #1284 from bigtunaIO/masterJack Humbert2017-05-0711-19/+450
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | Merge branch 'dev'Adam Lee2017-05-079-12/+408
| |\ \ \ \ \ \ \ \
| | * | | | | | | | [Miuni32] Rm accidentally committed fileAdam Lee2017-05-071-42/+0
| | * | | | | | | | Merge remote-tracking branch 'bigtunaio/layouts/adam-lee' into devAdam Lee2017-05-075-0/+191
| | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge branch 'master' into layouts/adam-leeAdam YH Lee2017-04-1642-72/+115
| | | |\ \ \ \ \ \ \ \
| | | * | | | | | | | | Add a personal layout for adamAdam YH Lee2017-04-165-0/+191
| | * | | | | | | | | | Merge remote-tracking branch 'upstream/master' into devAdam Lee2017-05-07123-459/+3724
| | |\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | |
| | * | | | | | | | | | Modified ht_156 keymaphtang1562017-04-271-9/+13
| | * | | | | | | | | | Added simple macros to test.htang1562017-04-161-9/+62
| | * | | | | | | | | | Added media layer for ht_156htang1562017-04-161-3/+18
| | * | | | | | | | | | Added ht_156 keymap fileshtang1562017-04-164-0/+139
| | * | | | | | | | | | Merge branch 'master' into devAdam YH Lee2017-04-1642-72/+115
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| / / / / / / / / | | | |/ / / / / / / /
| | * | | | | | | | | Replace RALT with RSFTAdam YH Lee2017-04-161-2/+2
| | * | | | | | | | | Added END and other keymap file formatting.htang1562017-04-161-13/+13
| | * | | | | | | | | Added DEL and F1 to F12 keyshtang1562017-04-161-6/+6
| | * | | | | | | | | Added keymap commets to default layout.htang1562017-04-161-0/+36
| | * | | | | | | | | Add TAB, N, LSFT on Layer 2Adam YH Lee2017-04-141-1/+1
| | * | | | | | | | | Add KC_T on Layer 2Adam YH Lee2017-04-131-1/+1
| | * | | | | | | | | Add LCTL + L on Layer 2Adam YH Lee2017-04-131-1/+1