summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master'Stick2017-06-2318-259/+738
|\
| * Merge pull request #1421 from 333fred/update-layoutJack Humbert2017-06-234-61/+106
| |\
| | * Doc updatesFredric Silberberg2017-06-232-18/+22
| | * Copy/paste additions.Fredric Silberberg2017-06-232-15/+17
| | * Added backlight control keysFredric Silberberg2017-06-232-5/+4
| | * Added a few more VS macros and another ctrlFredric Silberberg2017-06-231-11/+30
| | * Small keymap layout updatesFredric Silberberg2017-06-233-18/+39
| * | Merge pull request #1419 from Wraul/phantom-improvementsJack Humbert2017-06-2314-198/+632
| |\ \ | | |/ | |/|
| | * Update Phantom readmeMathias Andersson2017-06-232-3/+46
| | * Adjust Phantom for standard PCBMathias Andersson2017-06-2310-121/+405
| | * Update Phantom config to better match templateMathias Andersson2017-06-232-22/+122
| | * Move Phantom LED handling to phantom.cMathias Andersson2017-06-233-53/+60
| |/
* | added media keys; many bug fixesStick2017-06-232-27/+26
* | added tapdance lockingStick2017-06-222-44/+66
* | Merge remote-tracking branch 'upstream/master'Stick2017-06-22485-25863/+9757
|\|
| * Update _summary.mdJack Humbert2017-06-221-1/+2
| * Create adding_a_keyboard_to_qmk.mdJack Humbert2017-06-221-0/+35
| * Update porting_your_keyboard_to_qmk.mdJack Humbert2017-06-221-1/+5
| * Merge pull request #1416 from geofflane/feature/s65_x_std_grv_escJack Humbert2017-06-223-200/+6
| |\
| | * Use the new Quantum KC_GESC instead of custom codeGeoff Lane2017-06-213-200/+6
| * | Merge pull request #1331 from ariasuni/masterErez Zukerman2017-06-224-8/+62
| |\ \
| | * | Fix undefined reference errors with avr-gcc 7.1ariasuni2017-05-274-8/+62
| * | | add group edge via travis updatesJack Humbert2017-06-211-0/+1
| | |/ | |/|
| * | Merge pull request #1405 from cquiroz/oneshot-mods-timeoutJack Humbert2017-06-201-1/+3
| |\ \
| | * | Remove noisy debug lineCarlos Quiroz2017-06-181-1/+0
| | * | Deactivate oneshot mods once timedoutCarlos Quiroz2017-06-181-0/+3
| * | | Merge pull request #1414 from dvdizon/kbd75Jack Humbert2017-06-207-0/+361
| |\ \ \
| | * | | KBD75 - Initial KBD75 port from qmkeyboard.cn source filesDavid Dizon2017-06-197-0/+361
| * | | | Merge pull request #1413 from lasko/masterJack Humbert2017-06-203-143/+499
| |\ \ \ \
| | * | | | This is a complete redo of my keymap. It includes severalBrandon Height2017-06-193-143/+499
| | |/ / /
| * | | | Merge pull request #1412 from nall/masterJack Humbert2017-06-202-0/+168
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Added custom keymap and enabled Space CadetJon Nall2017-06-191-0/+167
| | * | | Fixed offset for knight rgb modeJon Nall2017-06-191-0/+1
| |/ / /
| * | | Merge pull request #1410 from belak/tv44-coreJack Humbert2017-06-193-0/+55
| |\ \ \
| | * | | tv44: Add core layout based on the Core 47Kaleb Elwert2017-06-183-0/+55
| * | | | Merge pull request #1409 from fredizzimo/full_unit_testJack Humbert2017-06-1930-351/+1095
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Fix serial_link vpath problemFred Sundvik2017-06-192-2/+2
| | * | | Add todo to timer.cFred Sundvik2017-06-191-0/+3
| | * | | Add a couple of todos to keyboard_report_util.cppFred Sundvik2017-06-191-0/+3
| | * | | More natural interface for setting keyboard ledsFred Sundvik2017-06-194-8/+4
| | * | | Add a test fixtureFred Sundvik2017-06-186-15/+80
| | * | | Test two keys pressed at onceFred Sundvik2017-06-183-3/+45
| | * | | Fix problems with undefined inlines in debug modeFred Sundvik2017-06-181-0/+4
| | * | | Actually test for correct key pressesFred Sundvik2017-06-186-8/+100
| | * | | Move functions for adding keys from to reports to report.hFred Sundvik2017-06-184-35/+45
| | * | | Move functionality from action_util to reportFred Sundvik2017-06-185-173/+193
| | * | | Fix the order of init and driver creationFred Sundvik2017-06-181-2/+4
| | * | | Add a couple of basic tests and implement driver mockFred Sundvik2017-06-186-9/+185
| | * | | Add keymapFred Sundvik2017-06-182-1/+8
| | * | | Empty bootloader_jumpFred Sundvik2017-06-181-0/+2