summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master'Stick2017-06-0812-3/+361
|\
| * Merge pull request #1372 from chilifries/masterJack Humbert2017-06-073-0/+51
| |\
| | * Added support for Mechmini v1chilifries2017-06-073-0/+51
| |/
| * Merge pull request #1359 from agbell/PRJack Humbert2017-06-079-3/+310
| |\
| | * remove build stuffAdam Bell2017-06-032-25/+0
| | * Adding permissive_holdAdam Bell2017-06-032-1/+2
| | * adding lets split keymapAdam Bell2017-06-036-2/+141
| | * Ergodox Adam keymapAdam Bell2017-06-035-1/+186
| | * Adding docker composeAdam Bell2017-06-031-0/+7
* | | Merge remote-tracking branch 'upstream/master'Stick2017-06-0711-28/+279
|\| |
| * | Add new keyboard layout for the ClueBoard (#1371)Martin Gondermann2017-06-074-0/+186
| * | Merge pull request #1366 from abperiasamy/refine-layoutJack Humbert2017-06-064-15/+29
| |\ \
| | * | Replace enter with quote and few reorgsAnand Babu (AB) Periasamy2017-03-084-15/+29
| * | | Merge pull request #1368 from shieldsd/masterJack Humbert2017-06-062-12/+63
| |\ \ \
| | * | | Additional tap dance keys/functions for planck/keymap/dshieldsDaniel Shields2017-06-062-12/+63
| |/ / /
| * | / update docs linkJack Humbert2017-06-051-1/+1
| | |/ | |/|
* | | ugly workaround for ErgoDoxEZ LED bugs: turn 'em all offStick2017-06-023-45/+44
* | | moved alt out from under spaceStick2017-06-021-7/+7
* | | Merge remote-tracking branch 'upstream/master'Stick2017-06-02376-684/+16127
|\| |
| * | Merge pull request #1357 from shieldsd/gherkinJack Humbert2017-06-027-0/+319
| |\ \
| | * | Initial commit for gherkin keyboard support. Compiles but untested.Daniel Shields2017-06-027-0/+319
| * | | Update Keycodes.mdJack Humbert2017-06-021-1/+1
| * | | Merge pull request #1356 from fabienheureux/patch-1Jack Humbert2017-06-021-1/+1
| |\ \ \ | | |/ / | |/| |
| | * | Update Keycodes.mdJack Humbert2017-06-021-1/+1
| | * | Broken Keymap docs linkfabienheureux2017-06-021-1/+1
| |/ /
| * | Merge pull request #1347 from nooges/nyquistJack Humbert2017-06-0132-0/+2750
| |\ \
| | * | Update keymap layout commentsDanny Nguyen2017-06-017-13/+35
| | * | Remove OLED code and set I2C rate back to 100kHzDanny Nguyen2017-06-015-766/+2
| | * | Update copyright infoDanny Nguyen2017-05-306-6/+6
| | * | Remove Let’s Split plate filesDanny Nguyen2017-05-305-22008/+0
| | * | Update readmeDanny Nguyen2017-05-305-61/+93
| | * | Modify pinout and layouts for NyquistDanny Nguyen2017-05-2920-259/+104
| | * | Fork Let’s Split filesDanny Nguyen2017-05-2944-0/+25623
| * | | Merge pull request #1294 from shieldsd/masterJack Humbert2017-06-011-0/+4
| |\ \ \
| | * | | Prevent the recording of looping dynamic macros.Daniel Shields2017-06-011-0/+4
| |/ / /
| * | | Merge pull request #1350 from originerd/add-originerd-planck-keymapJack Humbert2017-06-013-0/+256
| |\ \ \
| | * | | Add originerd planck keymapJitae Kim2017-05-313-0/+256
| * | | | Merge pull request #1351 from Alfrheim/fixing_dvorak_layoutJack Humbert2017-06-011-1/+1
| |\ \ \ \
| | * | | | replacing one R for a TAlfrheim2017-05-311-1/+1
| * | | | | Merge pull request #1353 from 333fred/333fred-layoutJack Humbert2017-06-014-0/+528
| |\ \ \ \ \
| | * | | | | Update licensing on visualizer.cFredric Silberberg2017-05-311-14/+1
| | * | | | | Updated readmeFredric Silberberg2017-05-312-7/+13
| | * | | | | Added several new macrosFredric Silberberg2017-05-311-19/+63
| | * | | | | Fixed numpad 0 layoutFredric Silberberg2017-05-312-3/+3
| | * | | | | Use code blocks for keyboard layoutsFredric Silberberg2017-05-301-3/+13
| | * | | | | Completed iteration 1 of my layoutFredric Silberberg2017-05-304-98/+306
| | * | | | | Added initial keymap filesFredric Silberberg2017-05-303-0/+273
| * | | | | | Merge pull request #1354 from shieldsd/tweaksJack Humbert2017-06-012-8/+10
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | Tweak reported power consumption to work with iOSDaniel Shields2017-06-012-8/+10
| |/ / / / /
| * | | | | Merge pull request #1348 from Dbroqua/masterJack Humbert2017-05-307-0/+242
| |\ \ \ \ \ | | |/ / / / | |/| | | |