summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #716 from MajorKoos/masterJack Humbert2016-09-057-0/+474
|\
| * Add rules.mk fileMajor Koos2016-09-021-0/+69
| * Add support for JD40 MKII PCBMajor Koos2016-09-026-0/+405
* | Merge pull request #711 from hot-leaf-juice/masterJack Humbert2016-09-052-19/+27
|\ \
| * | fixed incorrect key combination for locking screen on macOSCallum Oakley2016-09-022-5/+5
| * | changed some of the wording in the readmeCallum Oakley2016-09-011-4/+4
| * | changed order of modifiers after experimentation, updated readmeCallum Oakley2016-09-012-12/+7
| * | Merge remote-tracking branch 'upstream/master'Callum Oakley2016-09-01441-13735/+31253
| |\|
| * | added a lock screen keyCallum Oakley2016-08-121-3/+16
| * | Merge remote-tracking branch 'upstream/master'Callum Oakley2016-08-09274-2508/+5133
| |\ \
| * | | updated readme.md to reflect keymap changesCallum Oakley2016-08-091-2/+2
| * | | changed order of bottom row of symbol layer to ease acess to bracketsCallum Oakley2016-08-091-2/+2
* | | | Merge pull request #710 from algernon/h/tap-dance/keyup-seq-start-fixJack Humbert2016-09-051-2/+3
|\ \ \ \ | |_|_|/ |/| | |
| * | | tap-dance: Do not start a sequence on keyupGergely Nagy2016-09-011-2/+3
|/ / /
* | | Merge pull request #707 from algernon/f/unicode/get-modeJack Humbert2016-08-312-0/+5
|\ \ \
| * | | process_unicode: Add get_unicode_input_mode()Gergely Nagy2016-08-312-0/+5
|/ / /
* | | 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