Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into promethium | Priyadi Iman Nurcahyo | 2017-02-12 | 1 | -2/+3 |
|\ | |||||
| * | Merge pull request #1089 from priyadi/fix_ps2_mouse_warning | Jack Humbert | 2017-02-11 | 1 | -2/+3 |
| |\ | | | | | | | Suppress warnings from ps2_mouse.h | ||||
| | * | Supress warnings from ps2_mouse.h | Priyadi Iman Nurcahyo | 2017-02-12 | 1 | -2/+3 |
| |/ | |||||
* | | Update my Planck layout | Priyadi Iman Nurcahyo | 2017-02-12 | 1 | -151/+365 |
| | | |||||
* | | Forgot to add ifdef to optional feature | Priyadi Iman Nurcahyo | 2017-02-12 | 1 | -0/+2 |
| | | |||||
* | | Merge branch 'master' into promethium | Priyadi Iman Nurcahyo | 2017-02-12 | 30 | -231/+756 |
|\| | |||||
| * | Merge pull request #1065 from milestogo/master | Jack Humbert | 2017-02-11 | 2 | -78/+131 |
| |\ | | | | | | | Update to kinesis keymaps | ||||
| | * | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | milestogo | 2017-02-04 | 121 | -750/+6291 |
| | |\ | |||||
| | * | | fixing kinesis reboot | milestogo | 2017-01-30 | 1 | -2/+2 |
| | | | | |||||
| | * | | split kinesis layout into ergodox and planck style symbol layers | milestogo | 2017-01-27 | 1 | -76/+129 |
| | | | | |||||
| * | | | Merge pull request #1082 from priyadi/right-side-dual-function | Jack Humbert | 2017-02-11 | 3 | -10/+24 |
| |\ \ \ | | | | | | | | | | | Implement tap mod dual role for right side mods. | ||||
| | * | | | Make room for 'loose keycodes' by halving UNICODE_MAP range | Priyadi Iman Nurcahyo | 2017-02-11 | 1 | -2/+2 |
| | | | | | |||||
| | * | | | Implement tap mod dual role for right side mods. | Priyadi Iman Nurcahyo | 2017-02-10 | 3 | -9/+23 |
| | | | | | |||||
| * | | | | Merge pull request #1085 from priyadi/promethium | Jack Humbert | 2017-02-11 | 8 | -293/+780 |
| |\ \ \ \ | | | | | | | | | | | | | Promethium keyboard layout update | ||||
| * \ \ \ \ | Merge pull request #1087 from mneme/master | Jack Humbert | 2017-02-11 | 6 | -55/+64 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Updated keymap for atreus62/mneme | ||||
| | * | | | | | correct spelling in readme | David Olsson | 2017-02-11 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | David Olsson | 2017-02-11 | 154 | -966/+6752 |
| | |\ \ \ \ \ | |||||
| | * | | | | | | update readme | David Olsson | 2017-02-11 | 6 | -7/+9 |
| | | | | | | | | |||||
| | * | | | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | David Olsson | 2017-01-18 | 69 | -361/+2594 |
| | |\ \ \ \ \ \ | |||||
| | * | | | | | | | Don't change ralt to lalt, it's really not the same thing on windows. | David Olsson | 2017-01-17 | 1 | -39/+41 |
| | | | | | | | | | |||||
| | * | | | | | | | whitespace fixes | David Olsson | 2017-01-16 | 1 | -10/+12 |
| | | | | | | | | | |||||
| | * | | | | | | | vi style arrow keys. Live unicode switch support | David Olsson | 2017-01-16 | 1 | -8/+11 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge pull request #1088 from Mauin/gon_nerd | Jack Humbert | 2017-02-11 | 12 | -0/+331 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | add GON NerD | ||||
| | * | | | | | | | | add GON NerD | Marvin Ramin | 2017-02-11 | 12 | -0/+331 |
| | | |_|_|_|/ / / | | |/| | | | | | | |||||
| * | | | | | | | | don't try to build the readme | Jack Humbert | 2017-02-11 | 1 | -1/+1 |
| | |_|_|/ / / / | |/| | | | | | | |||||
| * | | | | | | | Merge pull request #1083 from VoodaGod/bone2planck | Jack Humbert | 2017-02-10 | 1 | -4/+4 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | fixed readme (i swear) | ||||
| | * | | | | | | | fixed readme (i swear) | VoodaGod | 2017-02-10 | 1 | -4/+4 |
| |/ / / / / / / | |||||
| * | | | | | | | Merge pull request #1073 from qmk/backlight_changes | Jack Humbert | 2017-02-09 | 1 | -32/+62 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Open backlight functionality to all ports | ||||
| | * | | | | | | | added functionality for just a port | Jack Humbert | 2017-02-07 | 1 | -32/+62 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge pull request #1078 from VoodaGod/bone2planck | Jack Humbert | 2017-02-09 | 4 | -54/+142 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | updated Bone2Planck Keymap, Readme & fixed Makefile | ||||
| | * | | | | | | | | updated layout & readme | VoodaGod | 2017-02-09 | 2 | -37/+39 |
| | | | | | | | | | | |||||
| | * | | | | | | | | more formatting | VoodaGod | 2017-02-09 | 1 | -2/+13 |
| | | | | | | | | | | |||||
| | * | | | | | | | | readme formatting changes | VoodaGod | 2017-02-09 | 1 | -61/+61 |
| | | | | | | | | | | |||||
| | * | | | | | | | | updated readme | VoodaGod | 2017-02-09 | 1 | -7/+10 |
| | | | | | | | | | | |||||
| | * | | | | | | | | updated bone2planck keymap & readme | VoodaGod | 2017-02-09 | 4 | -26/+98 |
| | | |/ / / / / / | | |/| | | | | | | |||||
| * | | | | | | | | Merge pull request #1079 from r2d2rogers/patch-1 | Jack Humbert | 2017-02-09 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | [Typo] correct link to default keymap in readme. | ||||
| | * | | | | | | | [Typo] correct link to default keymap in readme. | Rob Rogers | 2017-02-09 | 1 | -1/+1 |
| |/ / / / / / / | |||||
* | | | | | | | | Remove assignment warning | Priyadi Iman Nurcahyo | 2017-02-12 | 1 | -1/+1 |
| | | | | | | | | |||||
* | | | | | | | | Workaround to remove warning | Priyadi Iman Nurcahyo | 2017-02-12 | 2 | -1/+2 |
| | | | | | | | | |||||
* | | | | | | | | Some space optimization and housekeeping | Priyadi Iman Nurcahyo | 2017-02-12 | 1 | -44/+30 |
| |_|_|_|/ / / |/| | | | | | | |||||
* | | | | | | | Add regular space to B+N on GUI layer for repeating space | Priyadi Iman Nurcahyo | 2017-02-11 | 1 | -1/+1 |
| | | | | | | | |||||
* | | | | | | | Switch to Emoji layer using Punc + greek | Priyadi Iman Nurcahyo | 2017-02-11 | 1 | -20/+4 |
| | | | | | | | |||||
* | | | | | | | Turn off capslock when entering num layer | Priyadi Iman Nurcahyo | 2017-02-11 | 1 | -0/+8 |
| | | | | | | | |||||
* | | | | | | | Move X in number layer away from space | Priyadi Iman Nurcahyo | 2017-02-11 | 1 | -1/+1 |
| | | | | | | | |||||
* | | | | | | | LSpace + RSpace = switch layer | Priyadi Iman Nurcahyo | 2017-02-11 | 2 | -1/+92 |
| | | | | | | | |||||
* | | | | | | | Implement Capslock LED | Priyadi Iman Nurcahyo | 2017-02-11 | 2 | -4/+22 |
| | | | | | | | |||||
* | | | | | | | simplify battery calculation for now | Priyadi Iman Nurcahyo | 2017-02-11 | 4 | -24/+92 |
| | | | | | | | |||||
* | | | | | | | Fix emoji layer | Priyadi Iman Nurcahyo | 2017-02-11 | 1 | -1/+1 |
| | | | | | | | |||||
* | | | | | | | RShift + LShift = Capslock | Priyadi Iman Nurcahyo | 2017-02-11 | 1 | -0/+8 |
| | | | | | | | |||||
* | | | | | | | Add reset keycode | Priyadi Iman Nurcahyo | 2017-02-11 | 1 | -2/+2 |
| | | | | | | |