summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into promethiumPriyadi Iman Nurcahyo2017-02-1230-231/+756
|\
| * 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
| |\ \ \ \
| * \ \ \ \ Merge pull request #1087 from mneme/masterJack Humbert2017-02-116-55/+64
| |\ \ \ \ \
| | * | | | | correct spelling in readmeDavid Olsson2017-02-111-1/+1
| | * | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareDavid Olsson2017-02-11154-966/+6752
| | |\ \ \ \ \
| | * | | | | | update readmeDavid Olsson2017-02-116-7/+9
| | * | | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareDavid Olsson2017-01-1869-361/+2594
| | |\ \ \ \ \ \
| | * | | | | | | Don't change ralt to lalt, it's really not the same thing on windows.David Olsson2017-01-171-39/+41
| | * | | | | | | whitespace fixesDavid Olsson2017-01-161-10/+12
| | * | | | | | | vi style arrow keys. Live unicode switch supportDavid Olsson2017-01-161-8/+11
| * | | | | | | | Merge pull request #1088 from Mauin/gon_nerdJack Humbert2017-02-1112-0/+331
| |\ \ \ \ \ \ \ \
| | * | | | | | | | add GON NerDMarvin Ramin2017-02-1112-0/+331
| | | |_|_|_|/ / / | | |/| | | | | |
| * | | | | | | | don't try to build the readmeJack Humbert2017-02-111-1/+1
| | |_|_|/ / / / | |/| | | | | |
| * | | | | | | Merge pull request #1083 from VoodaGod/bone2planckJack Humbert2017-02-101-4/+4
| |\ \ \ \ \ \ \
| | * | | | | | | fixed readme (i swear)VoodaGod2017-02-101-4/+4
| |/ / / / / / /
| * | | | | | | Merge pull request #1073 from qmk/backlight_changesJack Humbert2017-02-091-32/+62
| |\ \ \ \ \ \ \
| | * | | | | | | added functionality for just a portJack Humbert2017-02-071-32/+62
| * | | | | | | | Merge pull request #1078 from VoodaGod/bone2planckJack Humbert2017-02-094-54/+142
| |\ \ \ \ \ \ \ \
| | * | | | | | | | updated layout & readmeVoodaGod2017-02-092-37/+39
| | * | | | | | | | more formattingVoodaGod2017-02-091-2/+13
| | * | | | | | | | readme formatting changesVoodaGod2017-02-091-61/+61
| | * | | | | | | | updated readmeVoodaGod2017-02-091-7/+10
| | * | | | | | | | updated bone2planck keymap & readmeVoodaGod2017-02-094-26/+98
| | | |/ / / / / / | | |/| | | | | |
| * | | | | | | | Merge pull request #1079 from r2d2rogers/patch-1Jack Humbert2017-02-091-1/+1
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | [Typo] correct link to default keymap in readme.Rob Rogers2017-02-091-1/+1
| |/ / / / / / /
* | | | | | | | 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
| |_|_|_|/ / / |/| | | | | |
* | | | | | | Add regular space to B+N on GUI layer for repeating spacePriyadi Iman Nurcahyo2017-02-111-1/+1
* | | | | | | Switch to Emoji layer using Punc + greekPriyadi Iman Nurcahyo2017-02-111-20/+4
* | | | | | | Turn off capslock when entering num layerPriyadi Iman Nurcahyo2017-02-111-0/+8
* | | | | | | Move X in number layer away from spacePriyadi Iman Nurcahyo2017-02-111-1/+1
* | | | | | | LSpace + RSpace = switch layerPriyadi Iman Nurcahyo2017-02-112-1/+92
* | | | | | | Implement Capslock LEDPriyadi Iman Nurcahyo2017-02-112-4/+22
* | | | | | | simplify battery calculation for nowPriyadi Iman Nurcahyo2017-02-114-24/+92
* | | | | | | Fix emoji layerPriyadi Iman Nurcahyo2017-02-111-1/+1
* | | | | | | RShift + LShift = CapslockPriyadi Iman Nurcahyo2017-02-111-0/+8
* | | | | | | Add reset keycodePriyadi Iman Nurcahyo2017-02-111-2/+2
* | | | | | | Generalize layer indicatorsPriyadi Iman Nurcahyo2017-02-112-83/+61
* | | | | | | Add ifdefs for keyboard layoutsPriyadi Iman Nurcahyo2017-02-102-13/+29
* | | | | | | Implement battery level indicatorPriyadi Iman Nurcahyo2017-02-106-11/+97
* | | | | | | Add function to cycle backlight modesPriyadi Iman Nurcahyo2017-02-101-78/+74
* | | | | | | Activate SYS layer by pressing both CtrlsPriyadi Iman Nurcahyo2017-02-101-9/+25