summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | More specifically, we save them and then place the `macro_end` pointer before them so they are essentially ignored and the other macro may freely overwrite them.
* | | | | | | Merge pull request #1278 from shieldsd/masterJack Humbert2017-05-073-0/+132
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Add new keymap for dshields.
| * | | | | | | 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
| * | | | | | | | lowercase .jpg I thinkTobias O2017-05-051-1/+1
| |/ / / / / / / | | | | | | | | | | | | | | | | i guess that fixes the image link - currently its broken
* | | | | | | | Merge pull request #1282 from coderkun/coderkun_neo2Jack Humbert2017-05-072-38/+137
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Merge changes for coderkun’s Neo2 layout
| * | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | | [Bigtuna.IO] Updating Miuni32 Layouts
| * | | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Collectively we should keep on working on the "default" layout. I am adding my own layout to freely explore adjustments and new features.
| | * | | | | | | | | | | | 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
| | | | | | | | | | | | |
| * | | | | | | | | | | | Merge remote-tracking branch 'upstream/master'Adam Lee2017-05-07164-521/+3829
| |\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| / / / / / / / / / / / | |/ / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #1272 from Thor77/ps2avrGB-keymap-kc-prefixJack Humbert2017-05-042-8/+26
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | [ps2avrGB] Add KEYMAP without KC-prefix
| * | | | | | | | | | | | Use KC_KEYMAP for default-keymapThor772017-05-031-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and remove obsolete explicit line-separator "\"
| * | | | | | | | | | | | Add KEYMAP without KC_##-prefixThor772017-05-031-0/+18
| | |_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and rename old variant to KEYMAP_KC
* | | | | | | | | | | | Merge pull request #1273 from Vifon/pr_1267_fixJack Humbert2017-05-046-12/+270
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / | |/| | | | | | | | | | Add DYN_REC_STOP to the dynamic macros, cleanup PR #1267
| * | | | | | | | | | | dynamic_macro.h: Fix an off-by-two errorWojciech Siewierski2017-05-041-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |