Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'upstream/master' | Xyverz | 2017-01-19 | 6 | -0/+252 |
|\ | |||||
| * | Merge pull request #999 from deadcyclo/master | Jack Humbert | 2017-01-15 | 5 | -0/+26 |
| |\ | |||||
| | * | Fixed incorrect layer image in deadcyclo readme | Brendan Johan Lee | 2017-01-10 | 1 | -1/+1 |
| | * | Merge remote-tracking branch 'upstream/master' | Brendan Johan Lee | 2017-01-10 | 11 | -1/+1643 |
| | |\ | |||||
| | * | | Added layer images to deadcyclo layout readme | Brendan Johan Lee | 2017-01-10 | 5 | -0/+26 |
| * | | | Merge pull request #1007 from bryan4887/bryan | Jack Humbert | 2017-01-15 | 1 | -0/+226 |
| |\ \ \ | | |_|/ | |/| | | |||||
| | * | | Added Bryan's keymap | Bryan Hernandez | 2017-01-13 | 1 | -0/+226 |
* | | | | Merge remote-tracking branch 'upstream/master' | xyverz | 2017-01-08 | 25 | -96/+2226 |
|\| | | | |||||
| * | | | Merged from upstream | Joshua T | 2017-01-07 | 86 | -449/+5505 |
| |\ \ \ | |||||
| | * | | | new file: keyboards/ergodox/keymaps/ishigoya-jp/img/keyboard-layout-enL.png | ishigoya | 2017-01-06 | 5 | -3/+57 |
| | * | | | new file: keyboards/ergodox/keymaps/ishigoya-jp/keymap.c | ishigoya | 2017-01-06 | 1 | -0/+962 |
| | * | | | Merge pull request #983 from common-nighthawk/master | Jack Humbert | 2017-01-04 | 2 | -0/+222 |
| | |\ \ \ | | | |_|/ | | |/| | | |||||
| | | * | | reverts change outside of personal keymap. | Daniel | 2017-01-01 | 1 | -2/+1 |
| | | * | | adds dedicated double-quote key. | Daniel | 2017-01-01 | 1 | -5/+9 |
| | | * | | removes double-tab brackets and adds back quot to left cmd. | Daniel | 2016-12-06 | 1 | -10/+10 |
| | | * | | removes the double actions from the metakeys. | Daniel | 2016-11-27 | 1 | -17/+15 |
| | | * | | moves brackets to top row. | Daniel | 2016-11-18 | 1 | -9/+9 |
| | | * | | moves brackets from J/K to U/I to remove block of common vim sequence. | Daniel | 2016-09-06 | 1 | -8/+8 |
| | | * | | adds tap dance and macro to move underscore and l- and r- brackets to base la... | Daniel | 2016-09-02 | 2 | -25/+57 |
| | | * | | adds Hyper key. improves media layer. first attempt at tap dance. | Daniel | 2016-09-01 | 2 | -35/+43 |
| | | * | | Merge remote-tracking branch 'upstream/master' | Daniel | 2016-08-31 | 34 | -1717/+2900 |
| | | |\ \ | |||||
| | | * | | | minor tweaks to numpad and media layer | Daniel | 2016-08-14 | 1 | -26/+24 |
| | | * | | | completes first-pass at media layer | Daniel | 2016-08-12 | 1 | -15/+15 |
| | | * | | | completes first-pass at symbol layer | Daniel | 2016-08-12 | 1 | -36/+36 |
| | | * | | | completes first-pass at base layer | Daniel | 2016-08-10 | 1 | -0/+183 |
| | * | | | | fix version macro making layer 3 sticky on deadcyclo layout | Brendan Johan Lee | 2017-01-03 | 1 | -2/+2 |
| | * | | | | Added the deadcyclo layout | Brendan Johan Lee | 2017-01-02 | 2 | -0/+283 |
| | * | | | | Update config.h | Jack Humbert | 2017-01-02 | 1 | -1/+1 |
| | * | | | | ergodox: Update algernon's keymap to v1.10 | Gergely Nagy | 2016-12-28 | 3 | -6/+21 |
| | * | | | | Update readme.md | Erez Zukerman | 2016-12-21 | 1 | -1/+1 |
| | * | | | | Update readme.md | Erez Zukerman | 2016-12-21 | 1 | -5/+4 |
| | * | | | | updates readme | Erez Zukerman | 2016-12-21 | 1 | -1/+4 |
| | * | | | | New default firmware graphic | Erez Zukerman | 2016-12-21 | 1 | -0/+0 |
| | * | | | | Merge branch 'master' of github.com:jackhumbert/qmk_firmware | Jack Humbert | 2016-12-19 | 6 | -82/+269 |
| | |\ \ \ \ | |||||
| | | * | | | | Flips off MIDI and API_SYSEX | Erez Zukerman | 2016-12-19 | 2 | -2/+2 |
| | | * | | | | Merge pull request #958 from pvinis/master | Jack Humbert | 2016-12-18 | 1 | -12/+12 |
| | | |\ \ \ \ | |||||
| | | | * | | | | make a sysctl MO button so i can quickly use the arrows | Pavlos Vinieratos | 2016-12-16 | 1 | -12/+12 |
| | | * | | | | | Adds a troubleshooting layout for resetting the EEPROM | Erez Zukerman | 2016-12-16 | 1 | -0/+140 |
| | | * | | | | | Removes alt/j dual function | Erez Zukerman | 2016-12-16 | 1 | -6/+6 |
| | | * | | | | | Merge pull request #952 from pvinis/master | Jack Humbert | 2016-12-15 | 1 | -63/+108 |
| | | |\| | | | | |||||
| | | | * | | | | tap dance for some layers. one tap sysctl, two taps mouse. | Pavlos Vinieratos | 2016-12-09 | 1 | -3/+29 |
| | | | * | | | | add light for some layers | Pavlos Vinieratos | 2016-12-09 | 1 | -0/+19 |
| | | | * | | | | separate sysctl and mouse layers | Pavlos Vinieratos | 2016-12-09 | 1 | -57/+57 |
| | | | * | | | | add alt key | Pavlos Vinieratos | 2016-12-09 | 1 | -2/+2 |
| | | | * | | | | media keys | Pavlos Vinieratos | 2016-12-09 | 1 | -11/+11 |
| | | | | |_|/ | | | | |/| | | |||||
| | | * | | | | Allow power consumption to be set per-keyboard. | Kyle Smith | 2016-12-14 | 1 | -0/+2 |
| | * | | | | | rgb clean-up, api clean-up | Jack Humbert | 2016-12-19 | 1 | -0/+1 |
| | |/ / / / | |||||
| * | | | | | Increased TAPPING_TERM to 200 | Joshua T | 2017-01-06 | 1 | -1/+3 |
| * | | | | | Fixed key not matching its diagram | Joshua T | 2017-01-06 | 1 | -1/+1 |
| * | | | | | Added a bit more detail to header | Joshua T | 2016-10-15 | 1 | -24/+27 |