aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'refs/remotes/qmk/master'Stanley Lai2017-02-13307-2365/+16213
|\
| * Merge pull request #1094 from priyadi/faux_clickyJack Humbert2017-02-1310-3/+227
| |\ | | | | | | Implement faux-clicky feature
| | * 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
| |\ \ | | | | | | | | GON NerD: Add reset button to documentation and default keymap
| | * | 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 ergodox/dvorak_programmer keymap
| | * | 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)
| | * | | 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
| |\ \ \ | | | | | | | | | | Suppress warnings from ps2_mouse.h
| | * | | Supress warnings from ps2_mouse.hPriyadi Iman Nurcahyo2017-02-121-2/+3
| |/ / /
| * | | Merge pull request #1065 from milestogo/masterJack Humbert2017-02-112-78/+131
| |\ \ \ | | | | | | | | | | Update to kinesis keymaps
| | * \ \ 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
| |\ \ \ \ \ | | | | | | | | | | | | | | Implement tap mod dual role for right side mods.
| | * | | | | 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
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Promethium keyboard layout update
| | * | | | | | 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
| | |\ \ \ \ \ \