aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #705 from VoodaGod/bone2planckJack Humbert2016-08-303-22/+44
|\
| * Merge branch 'master'Jason Janse van Rensburg2016-08-30694-13851/+35464
| |\ | |/ |/|
* | Merge pull request #703 from jhenahan/feature/jhenahan-keymapJack Humbert2016-08-294-0/+389
|\ \
| * | Update READMEJack Henahan2016-08-291-3/+9
| * | jhenahan layoutJack Henahan2016-08-294-0/+383
* | | Merge pull request #700 from algernon/h/ucis/enable-fixJack Humbert2016-08-291-0/+5
|\ \ \ | |/ / |/| |
| * | build_keyboard.mk: Restore UCIS_ENABLE supportGergely Nagy2016-08-291-0/+5
|/ /
* | Merge pull request #697 from fredizzimo/fix_gh_token_problemJack Humbert2016-08-271-3/+3
|\ \
| * | Fix the .travis.yml so that GH_TOKEN works properlyFred Sundvik2016-08-281-3/+3
* | | Merge pull request #696 from fredizzimo/community_boardsJack Humbert2016-08-271-19/+28
|\ \ \ | |/ / |/| |
| * | Update list of community keyboardsFred Sundvik2016-08-281-19/+28
* | | Merge pull request #689 from jeebak/tv44-jeebakJack Humbert2016-08-274-0/+596
|\ \ \
| * | | [tv44] Port jeebak's planck keymap to tv44JeeBak Kim2016-08-263-69/+538
| * | | [tv44] Add "jeebak" keymap folder as a copy of the "default" folderJeeBak Kim2016-08-264-0/+127
* | | | Merge pull request #684 from tomb0y/kc60_workman_deadJack Humbert2016-08-272-4/+4
|\ \ \ \
| * | | | Correct typo in kc60 workman-dead keymapzs2016-08-262-4/+4
* | | | | Merge pull request #695 from fredizzimo/dfu-util_instructionsJack Humbert2016-08-271-5/+10
|\ \ \ \ \
| * | | | | Add dfu-util to the instructionsFred Sundvik2016-08-271-5/+10
| | |_|/ / | |/| | |
* | | | | Merge pull request #693 from fredizzimo/infinity60Jack Humbert2016-08-2716-9/+37
|\ \ \ \ \
| * | | | | Rename infinity_chibios to infinity60, and add readmeFred Sundvik2016-08-2716-9/+37
| |/ / / /
* | | | | Merge pull request #694 from fredizzimo/keyboard_templateJack Humbert2016-08-271-5/+5
|\ \ \ \ \
| * | | | | Fix the keyboard template with new make syntaxFred Sundvik2016-08-271-5/+5
| |/ / / /
* | | | | Merge pull request #690 from fredizzimo/unit_testJack Humbert2016-08-2726-724/+1007
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Add unit test documentationFred Sundvik2016-08-271-0/+51
| * | | | Another attempt to make keyboards and tests in parallelFred Sundvik2016-08-271-3/+8
| * | | | Make tests and keyboards in two different jobsFred Sundvik2016-08-271-1/+2
| * | | | Add -p parameter to mkdirFred Sundvik2016-08-271-2/+2
| * | | | Travis builds the default all targetFred Sundvik2016-08-271-1/+1
| * | | | The all target makes all keyboards and all testsFred Sundvik2016-08-272-4/+5
| * | | | Support for running and cleaning all testsFred Sundvik2016-08-271-11/+22
| * | | | Disable map file creation when building testsFred Sundvik2016-08-272-1/+6
| * | | | Detect failures when running multiple testsFred Sundvik2016-08-272-2/+12
| * | | | Convert tirple_buffered_object_tests to GTestFred Sundvik2016-08-273-32/+38
| * | | | Convert transport_tests to GTestFred Sundvik2016-08-275-172/+202
| * | | | Convert frame_validator_tests to GTestFred Sundvik2016-08-272-40/+58
| * | | | Convert frame_router_tests to GTestFred Sundvik2016-08-273-232/+236
| * | | | More common settings for unit tests and keyboardsFred Sundvik2016-08-274-54/+59
| * | | | Fix running multiple testsFred Sundvik2016-08-271-2/+4
| * | | | Running of unit testsFred Sundvik2016-08-271-3/+8
| * | | | Build actual tests, convert byte_stuffer_testsFred Sundvik2016-08-277-179/+179
| * | | | Rules for compiling and linking google testFred Sundvik2016-08-274-12/+81
| * | | | The makefile actually calls build_testFred Sundvik2016-08-275-18/+42
| * | | | Basic framework for parsing test targetsFred Sundvik2016-08-273-1/+34
| * | | | Add Google Test submoduleFred Sundvik2016-08-272-0/+3
|/ / / /
* | | | Merge pull request #691 from fredizzimo/fix_line_endingsJack Humbert2016-08-2740-6251/+6252
|\ \ \ \
| * \ \ \ Merge branch 'master' into fix_line_endingsFred Sundvik2016-08-27115-3306/+3664
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge pull request #666 from fredizzimo/makefile_overhaulJack Humbert2016-08-27115-3308/+3666
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Fix travis_compiled_pushFred Sundvik2016-08-271-2/+2
| * | | | Merge remote-tracking branch 'upstream/master' into makefile_overhaulFred Sundvik2016-08-262-25/+144
| |\ \ \ \ | |/ / / / |/| | | |
| * | | | Fix bad mergeFred Sundvik2016-08-262-4/+2