summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ \ \
| * | | | 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
| * | | | Restore GUI layerPriyadi Iman Nurcahyo2017-02-101-13/+11
| * | | | Add slash/question mark to punc/num layerPriyadi Iman Nurcahyo2017-02-101-9/+9
| * | | | Reimplement GUI LayerPriyadi Iman Nurcahyo2017-02-101-20/+21
| * | | | Reorganize punctuation & numbers layerPriyadi Iman Nurcahyo2017-02-101-12/+12
| * | | | Fix LED indicatorPriyadi Iman Nurcahyo2017-02-101-1/+1
| * | | | Add dvorak & norman layout. Add sys layer.Priyadi Iman Nurcahyo2017-02-101-79/+148
| * | | | Remove audio stuffPriyadi Iman Nurcahyo2017-02-101-60/+0
| * | | | Add USB-BLE manual output switching and indicatorPriyadi Iman Nurcahyo2017-02-091-12/+44
| * | | | Merge branch 'master' into promethiumPriyadi Iman Nurcahyo2017-02-0992-370/+3945
| |\| | |
| * | | | Merge branch 'promethium' of github.com:priyadi/qmk_firmware into promethiumPriyadi Iman Nurcahyo2017-01-290-0/+0
| |\ \ \ \
| | * \ \ \ Merge branch 'master' into promethiumPriyadi Iman Nurcahyo2017-01-1772-312/+3010
| | |\ \ \ \
| | * | | | | minimize LEDsPriyadi Iman Nurcahyo2017-01-091-74/+74
| | * | | | | fix greek layersPriyadi Iman Nurcahyo2017-01-092-4/+5
| | * | | | | Implement greek layers on my Promethium layoutPriyadi Iman Nurcahyo2017-01-091-5/+182
| * | | | | | minimize LEDsPriyadi Iman Nurcahyo2017-01-291-74/+74
| * | | | | | fix greek layersPriyadi Iman Nurcahyo2017-01-292-4/+5
| * | | | | | Implement greek layers on my Promethium layoutPriyadi Iman Nurcahyo2017-01-291-5/+182
* | | | | | | 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