Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #716 from MajorKoos/master | Jack Humbert | 2016-09-05 | 7 | -0/+474 |
|\ | | | | | Add support for JD40 MKII PCB | ||||
| * | Add rules.mk file | Major Koos | 2016-09-02 | 1 | -0/+69 |
| | | |||||
| * | Add support for JD40 MKII PCB | Major Koos | 2016-09-02 | 6 | -0/+405 |
| | | | | | | | | RGB Included. | ||||
* | | Merge pull request #711 from hot-leaf-juice/master | Jack Humbert | 2016-09-05 | 2 | -19/+27 |
|\ \ | | | | | | | Updated callum's keymap | ||||
| * | | fixed incorrect key combination for locking screen on macOS | Callum Oakley | 2016-09-02 | 2 | -5/+5 |
| | | | |||||
| * | | changed some of the wording in the readme | Callum Oakley | 2016-09-01 | 1 | -4/+4 |
| | | | |||||
| * | | changed order of modifiers after experimentation, updated readme | Callum Oakley | 2016-09-01 | 2 | -12/+7 |
| | | | |||||
| * | | Merge remote-tracking branch 'upstream/master' | Callum Oakley | 2016-09-01 | 441 | -13735/+31253 |
| |\| | |||||
| * | | added a lock screen key | Callum Oakley | 2016-08-12 | 1 | -3/+16 |
| | | | |||||
| * | | Merge remote-tracking branch 'upstream/master' | Callum Oakley | 2016-08-09 | 274 | -2508/+5133 |
| |\ \ | |||||
| * | | | updated readme.md to reflect keymap changes | Callum Oakley | 2016-08-09 | 1 | -2/+2 |
| | | | | |||||
| * | | | changed order of bottom row of symbol layer to ease acess to brackets | Callum Oakley | 2016-08-09 | 1 | -2/+2 |
| | | | | |||||
* | | | | Merge pull request #710 from algernon/h/tap-dance/keyup-seq-start-fix | Jack Humbert | 2016-09-05 | 1 | -2/+3 |
|\ \ \ \ | |_|_|/ |/| | | | tap-dance: Do not start a sequence on keyup | ||||
| * | | | tap-dance: Do not start a sequence on keyup | Gergely Nagy | 2016-09-01 | 1 | -2/+3 |
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There was an odd case, which confused the hell out of tap-dance: suppose you had a number of tap-dance keys, on a layer, and as part of the tap-dance, you turned that layer off - or had it on one-shot to begin with. In this case, the keydown event would trigger the tap-dance key, but the keyup would not. This had two funky consequences: - tap-dance did not correctly register that the dance has ended. - pressing any other tap-dance key would interrupt the previous tap-dance, and potentially input unwanted characters. To fix this, we simply do not start a tap-dance sequence on keyup, only when it is pressed. This way the previous sequence has enough time to time-out and finish properly, and we don't get confused. This fixes algernon/ergodox-layout#107. Signed-off-by: Gergely Nagy <algernon@madhouse-project.org> | ||||
* | | | Merge pull request #707 from algernon/f/unicode/get-mode | Jack Humbert | 2016-08-31 | 2 | -0/+5 |
|\ \ \ | | | | | | | | | process_unicode: Add get_unicode_input_mode() | ||||
| * | | | process_unicode: Add get_unicode_input_mode() | Gergely Nagy | 2016-08-31 | 2 | -0/+5 |
|/ / / | | | | | | | | | | | | | | | | | | | | | | There may be cases where one would like to know the current Unicode input mode, without having to keep track of it themselves. Add a function that does just this. Signed-off-by: Gergely Nagy <algernon@madhouse-project.org> | ||||
* | | | Merge pull request #705 from VoodaGod/bone2planck | Jack Humbert | 2016-08-30 | 3 | -22/+44 |
|\ \ \ | | | | | | | | | Bone2planck update | ||||
| * \ \ | Merge branch 'master' | Jason Janse van Rensburg | 2016-08-30 | 694 | -13851/+35464 |
| |\ \ \ | |/ / / |/| | | | | | | | | | | | Conflicts: keyboards/planck/keymaps/bone2planck/keymap.c | ||||
* | | | | Merge pull request #703 from jhenahan/feature/jhenahan-keymap | Jack Humbert | 2016-08-29 | 4 | -0/+389 |
|\ \ \ \ | | | | | | | | | | | jhenahan Planck layout | ||||
| * | | | | Update README | Jack Henahan | 2016-08-29 | 1 | -3/+9 |
| | | | | | |||||
| * | | | | jhenahan layout | Jack Henahan | 2016-08-29 | 4 | -0/+383 |
| | | | | | |||||
* | | | | | Merge pull request #700 from algernon/h/ucis/enable-fix | Jack Humbert | 2016-08-29 | 1 | -0/+5 |
|\ \ \ \ \ | |/ / / / |/| | | | | build_keyboard.mk: Restore UCIS_ENABLE support | ||||
| * | | | | build_keyboard.mk: Restore UCIS_ENABLE support | Gergely Nagy | 2016-08-29 | 1 | -0/+5 |
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | During the build system refactor, support for enabling UCIS seems to have been lost. This little patch adds that back, so that keymaps using UCIS can be compiled again. Signed-off-by: Gergely Nagy <algernon@madhouse-project.org> | ||||
* | | | | Merge pull request #697 from fredizzimo/fix_gh_token_problem | Jack Humbert | 2016-08-27 | 1 | -3/+3 |
|\ \ \ \ | | | | | | | | | | | Fix the .travis.yml so that GH_TOKEN works properly | ||||
| * | | | | Fix the .travis.yml so that GH_TOKEN works properly | Fred Sundvik | 2016-08-28 | 1 | -3/+3 |
| | | | | | |||||
* | | | | | Merge pull request #696 from fredizzimo/community_boards | Jack Humbert | 2016-08-27 | 1 | -19/+28 |
|\ \ \ \ \ | |/ / / / |/| | | | | Update list of community keyboards | ||||
| * | | | | Update list of community keyboards | Fred Sundvik | 2016-08-28 | 1 | -19/+28 |
| | | | | | |||||
* | | | | | Merge pull request #689 from jeebak/tv44-jeebak | Jack Humbert | 2016-08-27 | 4 | -0/+596 |
|\ \ \ \ \ | | | | | | | | | | | | | Port jeebak's Planck/JD45 keymap to TV44 | ||||
| * | | | | | [tv44] Port jeebak's planck keymap to tv44 | JeeBak Kim | 2016-08-26 | 3 | -69/+538 |
| | | | | | | |||||
| * | | | | | [tv44] Add "jeebak" keymap folder as a copy of the "default" folder | JeeBak Kim | 2016-08-26 | 4 | -0/+127 |
| | | | | | | |||||
* | | | | | | Merge pull request #684 from tomb0y/kc60_workman_dead | Jack Humbert | 2016-08-27 | 2 | -4/+4 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Correct typo in kc60 workman-dead keymap | ||||
| * | | | | | | Correct typo in kc60 workman-dead keymap | zs | 2016-08-26 | 2 | -4/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | and rename README.md to readme.md | ||||
* | | | | | | | Merge pull request #695 from fredizzimo/dfu-util_instructions | Jack Humbert | 2016-08-27 | 1 | -5/+10 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Add dfu-util to the instructions | ||||
| * | | | | | | | Add dfu-util to the instructions | Fred Sundvik | 2016-08-27 | 1 | -5/+10 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | Merge pull request #693 from fredizzimo/infinity60 | Jack Humbert | 2016-08-27 | 16 | -9/+37 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Rename infinity_chibios to infinity60, and add readme | ||||
| * | | | | | | | Rename infinity_chibios to infinity60, and add readme | Fred Sundvik | 2016-08-27 | 16 | -9/+37 |
| |/ / / / / / | |||||
* | | | | | | | Merge pull request #694 from fredizzimo/keyboard_template | Jack Humbert | 2016-08-27 | 1 | -5/+5 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Fix the keyboard template with new make syntax | ||||
| * | | | | | | | Fix the keyboard template with new make syntax | Fred Sundvik | 2016-08-27 | 1 | -5/+5 |
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | Also add proper link to the parent | ||||
* | | | | | | | Merge pull request #690 from fredizzimo/unit_test | Jack Humbert | 2016-08-27 | 26 | -724/+1007 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | Add Unit Testing support | ||||
| * | | | | | | Add unit test documentation | Fred Sundvik | 2016-08-27 | 1 | -0/+51 |
| | | | | | | | |||||
| * | | | | | | Another attempt to make keyboards and tests in parallel | Fred Sundvik | 2016-08-27 | 1 | -3/+8 |
| | | | | | | | |||||
| * | | | | | | Make tests and keyboards in two different jobs | Fred Sundvik | 2016-08-27 | 1 | -1/+2 |
| | | | | | | | |||||
| * | | | | | | Add -p parameter to mkdir | Fred Sundvik | 2016-08-27 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | So that it's created even when there's a deeper structure | ||||
| * | | | | | | Travis builds the default all target | Fred Sundvik | 2016-08-27 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | The all target makes all keyboards and all tests | Fred Sundvik | 2016-08-27 | 2 | -4/+5 |
| | | | | | | | |||||
| * | | | | | | Support for running and cleaning all tests | Fred Sundvik | 2016-08-27 | 1 | -11/+22 |
| | | | | | | | |||||
| * | | | | | | Disable map file creation when building tests | Fred Sundvik | 2016-08-27 | 2 | -1/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | It causes strange linker warnings on cygwin. | ||||
| * | | | | | | Detect failures when running multiple tests | Fred Sundvik | 2016-08-27 | 2 | -2/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also add better output. | ||||
| * | | | | | | Convert tirple_buffered_object_tests to GTest | Fred Sundvik | 2016-08-27 | 3 | -32/+38 |
| | | | | | | | |||||
| * | | | | | | Convert transport_tests to GTest | Fred Sundvik | 2016-08-27 | 5 | -172/+202 |
| | | | | | | |