Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #1368 from shieldsd/master | Jack Humbert | 2017-06-06 | 2 | -12/+63 |
|\ | | | | | Additional tap dance keys/functions for planck/keymap/dshields | ||||
| * | Additional tap dance keys/functions for planck/keymap/dshields | Daniel Shields | 2017-06-06 | 2 | -12/+63 |
|/ | |||||
* | update docs link | Jack Humbert | 2017-06-05 | 1 | -1/+1 |
| | |||||
* | Merge pull request #1357 from shieldsd/gherkin | Jack Humbert | 2017-06-02 | 7 | -0/+319 |
|\ | | | | | Initial commit for gherkin keyboard support. Compiles but untested. | ||||
| * | Initial commit for gherkin keyboard support. Compiles but untested. | Daniel Shields | 2017-06-02 | 7 | -0/+319 |
| | | |||||
* | | Update Keycodes.md | Jack Humbert | 2017-06-02 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #1356 from fabienheureux/patch-1 | Jack Humbert | 2017-06-02 | 1 | -1/+1 |
|\ \ | |/ |/| | Broken Keymap docs link | ||||
| * | Update Keycodes.md | Jack Humbert | 2017-06-02 | 1 | -1/+1 |
| | | |||||
| * | Broken Keymap docs link | fabienheureux | 2017-06-02 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #1347 from nooges/nyquist | Jack Humbert | 2017-06-01 | 32 | -0/+2750 |
|\ | | | | | Add Nyquist keyboard support | ||||
| * | Update keymap layout comments | Danny Nguyen | 2017-06-01 | 7 | -13/+35 |
| | | |||||
| * | Remove OLED code and set I2C rate back to 100kHz | Danny Nguyen | 2017-06-01 | 5 | -766/+2 |
| | | |||||
| * | Update copyright info | Danny Nguyen | 2017-05-30 | 6 | -6/+6 |
| | | |||||
| * | Remove Let’s Split plate files | Danny Nguyen | 2017-05-30 | 5 | -22008/+0 |
| | | |||||
| * | Update readme | Danny Nguyen | 2017-05-30 | 5 | -61/+93 |
| | | |||||
| * | Modify pinout and layouts for Nyquist | Danny Nguyen | 2017-05-29 | 20 | -259/+104 |
| | | |||||
| * | Fork Let’s Split files | Danny Nguyen | 2017-05-29 | 44 | -0/+25623 |
| | | |||||
* | | Merge pull request #1294 from shieldsd/master | Jack Humbert | 2017-06-01 | 1 | -0/+4 |
|\ \ | | | | | | | Prevent the recording of looping dynamic macros. | ||||
| * | | Prevent the recording of looping dynamic macros. | Daniel Shields | 2017-06-01 | 1 | -0/+4 |
|/ / | | | | | | | | | | | | | If a macro play key is inadvertently recorded in a dynamic macro a loop is created and the macro will not terminate when played. This should be prevented. | ||||
* | | Merge pull request #1350 from originerd/add-originerd-planck-keymap | Jack Humbert | 2017-06-01 | 3 | -0/+256 |
|\ \ | | | | | | | Add originerd planck keymap | ||||
| * | | Add originerd planck keymap | Jitae Kim | 2017-05-31 | 3 | -0/+256 |
| | | | |||||
* | | | Merge pull request #1351 from Alfrheim/fixing_dvorak_layout | Jack Humbert | 2017-06-01 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | replacing one R for a T | ||||
| * | | | replacing one R for a T | Alfrheim | 2017-05-31 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge pull request #1353 from 333fred/333fred-layout | Jack Humbert | 2017-06-01 | 4 | -0/+528 |
|\ \ \ \ | | | | | | | | | | | ergodox/333fred layout | ||||
| * | | | | Update licensing on visualizer.c | Fredric Silberberg | 2017-05-31 | 1 | -14/+1 |
| | | | | | |||||
| * | | | | Updated readme | Fredric Silberberg | 2017-05-31 | 2 | -7/+13 |
| | | | | | |||||
| * | | | | Added several new macros | Fredric Silberberg | 2017-05-31 | 1 | -19/+63 |
| | | | | | |||||
| * | | | | Fixed numpad 0 layout | Fredric Silberberg | 2017-05-31 | 2 | -3/+3 |
| | | | | | |||||
| * | | | | Use code blocks for keyboard layouts | Fredric Silberberg | 2017-05-30 | 1 | -3/+13 |
| | | | | | |||||
| * | | | | Completed iteration 1 of my layout | Fredric Silberberg | 2017-05-30 | 4 | -98/+306 |
| | | | | | |||||
| * | | | | Added initial keymap files | Fredric Silberberg | 2017-05-30 | 3 | -0/+273 |
| | | | | | |||||
* | | | | | Merge pull request #1354 from shieldsd/tweaks | Jack Humbert | 2017-06-01 | 2 | -8/+10 |
|\ \ \ \ \ | |_|/ / / |/| | | | | Tweak reported power consumption to work with iOS | ||||
| * | | | | Tweak reported power consumption to work with iOS | Daniel Shields | 2017-06-01 | 2 | -8/+10 |
|/ / / / | |||||
* | | | | Merge pull request #1348 from Dbroqua/master | Jack Humbert | 2017-05-30 | 7 | -0/+242 |
|\ \ \ \ | |/ / / |/| | | | Added DK60 keyboard | ||||
| * | | | Merge remote-tracking branch 'origin/feature/DK60' | dbroqua | 2017-05-30 | 2 | -3/+1 |
| |\ \ \ | |||||
| | * | | | - Updated copyright | dbroqua | 2017-05-30 | 2 | -3/+1 |
| | | | | | |||||
| * | | | | Merge remote-tracking branch 'origin/feature/DK60' | Damien Broqua | 2017-05-30 | 1 | -1/+3 |
| |\| | | | |||||
| | * | | | - Updated readme | Damien Broqua | 2017-05-30 | 1 | -1/+3 |
| | | | | | |||||
| * | | | | Merge remote-tracking branch 'origin/feature/DK60' | Damien Broqua | 2017-05-30 | 7 | -0/+242 |
| |\| | | | |||||
| | * | | | - Added Capslock/Esc led | Damien Broqua | 2017-05-30 | 3 | -35/+97 |
| | | | | | |||||
| | * | | | - Some changes on DK60 | Damien Broqua | 2017-05-30 | 5 | -41/+37 |
| | | | | | |||||
| | * | | | - Initial commit for branch DK60 | dbroqua | 2017-05-07 | 7 | -0/+184 |
| | | | | | |||||
* | | | | | Merge pull request #1323 from nikchi/master | Jack Humbert | 2017-05-30 | 5 | -22/+62 |
|\ \ \ \ \ | | | | | | | | | | | | | Variable tapping terms | ||||
| * | | | | | hmm? | Nick Choi | 2017-05-30 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Merge pull request #2 from qmk/master | Nick Choi | 2017-05-30 | 92 | -34/+5520 |
| |\ \ \ \ \ | |/ / / / / |/| | | | | | pull in new qmk changes | ||||
* | | | | | | Merge branch 'master' of https://github.com/qmk/qmk_firmware | Jack Humbert | 2017-05-30 | 3 | -3/+21 |
|\ \ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge pull request #1342 from priyadi/adafruit-mouse-buttons | Jack Humbert | 2017-05-30 | 3 | -3/+21 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Adafruit Feather BLE / BLE Friend mouse buttons support | ||||
| | * | | | | | | Adafruit Feather BLE / BLE Friend mouse buttons support | Priyadi Iman Nurcahyo | 2017-05-29 | 3 | -3/+21 |
| | | | | | | | | |||||
* | | | | | | | | make qmk bot do the hard work | Jack Humbert | 2017-05-30 | 1 | -2/+2 |
|/ / / / / / / | |||||
* | | | | | | | Merge branch 'master' of https://github.com/qmk/qmk_firmware | Jack Humbert | 2017-05-30 | 1 | -4/+6 |
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | |