Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #849 from hot-leaf-juice/master | Jack Humbert | 2016-10-26 | 1 | -4/+4 |
|\ | |||||
| * | replace lock key with general power key | Callum Oakley | 2016-10-25 | 1 | -2/+2 |
| * | switched to standard volume keys | Callum Oakley | 2016-10-25 | 1 | -2/+2 |
* | | Merge pull request #848 from andrebeat/fix-dockerfile | Jack Humbert | 2016-10-26 | 1 | -1/+2 |
|\ \ | |||||
| * | | add subproject env var to dockerfile | Andre Silva | 2016-10-24 | 1 | -1/+2 |
| |/ | |||||
* | | Merge pull request #847 from yinshanyang/master | Jack Humbert | 2016-10-26 | 1 | -0/+13 |
|\ \ | |||||
| * | | added notes on using Arduino Pro Micro 3.3V with Let’s Split | Yin Shanyang | 2016-10-24 | 1 | -0/+13 |
| |/ | |||||
* | | Merge pull request #844 from priyadi/unicode_wincompose_input | Jack Humbert | 2016-10-26 | 2 | -4/+10 |
|\ \ | |||||
| * | | Unicode WinCompose input method | Priyadi Iman Nurcahyo | 2016-10-23 | 2 | -4/+10 |
| |/ | |||||
* | | Merge pull request #842 from priyadi/unicode_map_length | Jack Humbert | 2016-10-26 | 2 | -9/+35 |
|\ \ | |||||
| * | | UNICODE_MAP: remove 5 char limit; ignore leading zeroes; handle OS limitations | Priyadi Iman Nurcahyo | 2016-10-23 | 2 | -9/+35 |
| |/ | |||||
* | | Merge pull request #841 from jacwib/master | Jack Humbert | 2016-10-26 | 3 | -27/+118 |
|\ \ | |||||
| * | | 1.2 update | jacwib | 2016-10-23 | 3 | -20/+105 |
| * | | Update readme to reflect 1.1 changes. | jacwib | 2016-10-22 | 1 | -1/+1 |
| * | | Update keymap to reflect 1.1 changes. | jacwib | 2016-10-22 | 1 | -9/+9 |
| * | | Update readme to reflect changes | jacwib | 2016-10-22 | 1 | -0/+6 |
| |/ | |||||
* | | Merge pull request #831 from kejadlen/master | Jack Humbert | 2016-10-26 | 5 | -0/+261 |
|\ \ | |||||
| * | | [alphadox] remove tmk reset code | Alpha Chen | 2016-10-25 | 2 | -10/+0 |
| * | | [ergodox][alphadox] undefine tapping_term, ignore_mod_tap_interrupt | Alpha Chen | 2016-10-25 | 1 | -0/+3 |
| * | | add alphadox layouts to atreus and ergodox | Alpha Chen | 2016-10-25 | 5 | -0/+268 |
| |/ | |||||
* | | Merge pull request #834 from kazufukurou/master | Jack Humbert | 2016-10-26 | 1 | -0/+82 |
|\ \ | |/ |/| | |||||
| * | add programmer dvorak keymap | Artyom Mironov | 2016-10-19 | 1 | -0/+82 |
* | | Merge pull request #833 from h-parks/master | Erez Zukerman | 2016-10-20 | 8 | -0/+482 |
|\ \ | |||||
| * | | Win10 Writer's Block - An ErgoDox Keymap | h-parks | 2016-10-19 | 2 | -9/+12 |
| * | | Win10 Writer's Block - An ErgoDox Keymap | h-parks | 2016-10-18 | 8 | -0/+479 |
| |/ | |||||
* | | Merge pull request #832 from PhoenixRion/master | Erez Zukerman | 2016-10-20 | 2 | -0/+194 |
|\ \ | |/ |/| | |||||
| * | update header file | Ryan Ascheman | 2016-10-18 | 1 | -1/+1 |
| * | didn't read PR comment close enough, correcting folder | Ryan Ascheman | 2016-10-18 | 2 | -0/+0 |
| * | moving keymap to new location | Ryan Ascheman | 2016-10-18 | 2 | -0/+0 |
| * | Merge remote-tracking branch 'upstream/master' | Ryan Ascheman | 2016-10-18 | 6939 | -2419915/+106820 |
| |\ | |/ |/| | |||||
* | | Merge pull request #829 from r2d2rogers/master | Jack Humbert | 2016-10-18 | 2 | -21/+22 |
|\ \ | |||||
| * | | Update ez.c | Rob Rogers | 2016-10-18 | 1 | -1/+0 |
| * | | Move hand_swap_config to ez.c, removes error for infinity | Rob Rogers | 2016-10-17 | 2 | -20/+22 |
* | | | Merge pull request #824 from dsvensson/pegasushoof | Jack Humbert | 2016-10-18 | 11 | -0/+662 |
|\ \ \ | |||||
| * | | | Support the Pegasus Hoof controller. | Daniel Svensson | 2016-10-13 | 11 | -0/+662 |
* | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | Jack Humbert | 2016-10-18 | 9 | -103/+189 |
|\ \ \ \ | |||||
| * \ \ \ | Merge pull request #826 from algernon/ergodox-ez/algernon | Erez Zukerman | 2016-10-17 | 9 | -103/+189 |
| |\ \ \ \ | | |_|/ / | |/| | | | |||||
| | * | | | ergodox: Update algernon's keymap to v1.9 | Gergely Nagy | 2016-10-16 | 9 | -103/+189 |
| | |/ / | |||||
* | / / | removes planck/rev3 temporarily | Jack Humbert | 2016-10-18 | 1 | -3/+0 |
|/ / / | |||||
* | | | Update Makefile | Jack Humbert | 2016-10-16 | 1 | -72/+1 |
* | | | Merge pull request #815 from priyadi/unicode_map | Jack Humbert | 2016-10-16 | 9 | -0/+495 |
|\ \ \ | |||||
| * | | | Add example keymap | Priyadi Iman Nurcahyo | 2016-10-10 | 3 | -0/+444 |
| * | | | Unicode map framework. Allow unicode up to 0xFFFFF using separate | Priyadi Iman Nurcahyo | 2016-10-10 | 6 | -0/+51 |
* | | | | Merge pull request #825 from replicaJunction/pr-vscode | Jack Humbert | 2016-10-16 | 1 | -0/+1 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | Added VS Code dir to .gitignore | Joshua T | 2016-10-15 | 1 | -0/+1 |
|/ / / | |||||
* | | | Merge pull request #818 from pvinis/pvinis-keymap | Erez Zukerman | 2016-10-13 | 4 | -0/+511 |
|\ \ \ | |||||
| * | | | add readme | Pavlos Vinieratos | 2016-10-11 | 2 | -0/+72 |
| * | | | use wait_ms instead of _delay_ms | Pavlos Vinieratos | 2016-10-11 | 1 | -7/+7 |
| * | | | add messenger | Pavlos Vinieratos | 2016-10-11 | 1 | -2/+3 |
| * | | | init keymap | Pavlos Vinieratos | 2016-10-11 | 2 | -0/+438 |