summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | | | | | | | | | | | | | Merge branch 'master' into promethiumPriyadi Iman Nurcahyo2017-02-121-2/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Update my Planck layoutPriyadi Iman Nurcahyo2017-02-121-151/+365
| | * | | | | | | | | | | | | | | Forgot to add ifdef to optional featurePriyadi Iman Nurcahyo2017-02-121-0/+2
| | * | | | | | | | | | | | | | | Merge branch 'master' into promethiumPriyadi Iman Nurcahyo2017-02-1230-231/+756
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | Remove assignment warningPriyadi Iman Nurcahyo2017-02-121-1/+1
| | * | | | | | | | | | | | | | | | Workaround to remove warningPriyadi Iman Nurcahyo2017-02-122-1/+2
| | * | | | | | | | | | | | | | | | Some space optimization and housekeepingPriyadi Iman Nurcahyo2017-02-121-44/+30
| * | | | | | | | | | | | | | | | | Update my Planck layoutPriyadi Iman Nurcahyo2017-02-131-151/+365
| * | | | | | | | | | | | | | | | | Forgot to add ifdef to optional featurePriyadi Iman Nurcahyo2017-02-131-0/+2
| * | | | | | | | | | | | | | | | | Remove assignment warningPriyadi Iman Nurcahyo2017-02-131-1/+1
| * | | | | | | | | | | | | | | | | Workaround to remove warningPriyadi Iman Nurcahyo2017-02-132-1/+2
| * | | | | | | | | | | | | | | | | Some space optimization and housekeepingPriyadi Iman Nurcahyo2017-02-131-44/+30
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge pull request #1104 from qmk/layer_tap_toggleJack Humbert2017-02-1513-451/+490
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | fix weirdness with arm and modsJack Humbert2017-02-152-19/+20
| * | | | | | | | | | | | | | | | unique variable nameJack Humbert2017-02-152-19/+19
| * | | | | | | | | | | | | | | | publicise variablesJack Humbert2017-02-152-4/+3
| * | | | | | | | | | | | | | | | add unicode common file, get names rightJack Humbert2017-02-151-0/+86
| * | | | | | | | | | | | | | | | add unicode common file, get names rightJack Humbert2017-02-157-209/+137
| * | | | | | | | | | | | | | | | split up unicode systems into different filesJack Humbert2017-02-159-239/+253
| * | | | | | | | | | | | | | | | give error if both unicode/map are enabledJack Humbert2017-02-151-0/+3
| * | | | | | | | | | | | | | | | adds layer tap toggleJack Humbert2017-02-152-4/+12
|/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge pull request #1101 from priyadi/layer_state_set_kbJack Humbert2017-02-142-0/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | / / / / / | |_|_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Fix bug fix attemptPriyadi Iman Nurcahyo2017-02-151-2/+2
| | |_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Bug fix & added default_layer_state_set_kbPriyadi Iman Nurcahyo2017-02-152-2/+11
| | |_|_|_|_|/ / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Add layer_state_set_kb hookPriyadi Iman Nurcahyo2017-02-152-0/+8
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #1094 from priyadi/faux_clickyJack Humbert2017-02-1310-3/+227
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Add keycodes to turn on, turn off and toggle faux clickyPriyadi Iman Nurcahyo2017-02-133-0/+43
| * | | | | | | | | | | Implement faux-clicky featurePriyadi Iman Nurcahyo2017-02-138-3/+184
| | |_|_|/ / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge pull request #1095 from Mauin/gonnerd/reset_documentationJack Humbert2017-02-133-16/+60
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | define missing KC_NO macroMarvin Ramin2017-02-131-6/+7
| * | | | | | | | | | adds documentation for reset button and adds one to the default keymapMarvin Ramin2017-02-133-15/+58
|/ / / / / / / / / /
* | | | | | | | | | adds planck/rev3 makefile so subproject is foundJack Humbert2017-02-121-0/+3
* | | | | | | | | | update travis badgeJack Humbert2017-02-121-1/+1
* | | | | | | | | | Merge pull request #1092 from lucwastiaux/masterJack Humbert2017-02-123-61/+18
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | updated readmeluc wastiaux2017-02-131-1/+1
| * | | | | | | | | | Merge remote-tracking branch 'upstream/master'luc wastiaux2017-02-13157-914/+6390
| |\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
* | | | | | | | | | | Merge pull request #1091 from smt/smt/tv44Jack Humbert2017-02-125-0/+415
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Add smt keymap for tv44 (MiniVan)Stephen Tudor2017-02-125-0/+415
* | | | | | | | | | | | send travis stuff to gitterJack Humbert2017-02-121-0/+7
| |_|/ / / / / / / / / |/| | | | | | | | | |
* | | | | | | | | | | Merge pull request #1089 from priyadi/fix_ps2_mouse_warningJack Humbert2017-02-111-2/+3
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Supress warnings from ps2_mouse.hPriyadi Iman Nurcahyo2017-02-121-2/+3
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #1065 from milestogo/masterJack Humbert2017-02-112-78/+131
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | |
| * | | | | | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwaremilestogo2017-02-04121-750/+6291
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | fixing kinesis rebootmilestogo2017-01-301-2/+2
| * | | | | | | | | | split kinesis layout into ergodox and planck style symbol layersmilestogo2017-01-271-76/+129
* | | | | | | | | | | Merge pull request #1082 from priyadi/right-side-dual-functionJack Humbert2017-02-113-10/+24
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Make room for 'loose keycodes' by halving UNICODE_MAP rangePriyadi Iman Nurcahyo2017-02-111-2/+2
| * | | | | | | | | | | Implement tap mod dual role for right side mods.Priyadi Iman Nurcahyo2017-02-103-9/+23
* | | | | | | | | | | | Merge pull request #1085 from priyadi/promethiumJack Humbert2017-02-118-293/+780
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / | |/| | | | | | | | | |
| * | | | | |