Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | milestogo | 2017-02-04 |
|\ | |||
| * | Merge pull request #1063 from osamuaoki/master | Erez Zukerman | 2017-02-02 |
| |\ | | | | | | | Typo fixes | ||
| | * | Typo fixes | Osamu Aoki | 2017-02-02 |
| | | | |||
| * | | Merge pull request #1058 from edasque/master | Erez Zukerman | 2017-02-02 |
| |\ \ | | |/ | |/| | Reverted Dockerfile to put the CMD back | ||
| | * | Reverted Dockerfile to put the CMD back | Erik Dasque | 2017-01-31 |
| | | | |||
| * | | Merge pull request #1049 from SjB/tap_dance_save_oneshot_mods | Erez Zukerman | 2017-02-01 |
| |\ \ | | | | | | | | | race condition between oneshot_mods and tap_dance | ||
| | * | | race condition between oneshot_mods and tap_dance | SjB | 2017-01-29 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | since the keycode for a tap dance process gets process only after the TAPPING_TERM timeout, you really only have ONESHOT_TIMEOUT - TAPPING_TERM time to tap or double tap on the key. This fix save the oneshot_mods into the action.state structure and applies the mods with the keycode when it's registered. It also unregisters the mod when the the tap dance process gets reset. | ||
| * | | | Merge pull request #1054 from deadcyclo/master | Erez Zukerman | 2017-02-01 |
| |\ \ \ | | |_|/ | |/| | | Adds support for ergodox shine and unicode and emoji support to the deadcyclo layout | ||
| | * | | Merge remote-tracking branch 'upstream/master' | Brendan Johan Lee | 2017-02-01 |
| | |\ \ | | |/ / | |/| | | |||
| * | | | Merge pull request #1039 from zabereer/albert_ergodox_keymap | Erez Zukerman | 2017-01-31 |
| |\ \ \ | | | | | | | | | | | albert ergodox keymap | ||
| | * | | | albert ergodox keymap | Albert Pretorius | 2017-01-26 |
| | | | | | |||
| * | | | | Merge pull request #1055 from matzebond/master | Erez Zukerman | 2017-01-31 |
| |\ \ \ \ | | |_|_|/ | |/| | | | update my neo2 keymap | ||
| | * | | | update my neo2 keymap | Matthias Schmitt | 2017-01-30 |
| |/ / / | |||
| | | * | [deadcyclo layout] Refactoring. Use custom functions and macros | Brendan Johan Lee | 2017-01-30 |
| | | | | |||
| | | * | [deadcyclo layout] fixed failing tests | Brendan Johan Lee | 2017-01-30 |
| | | | | |||
| | | * | Merge remote-tracking branch 'upstream/master' | Brendan Johan Lee | 2017-01-30 |
| | | |\ | | |_|/ | |/| | | |||
| * | | | Merge pull request #1043 from potz/patch-1 | skullydazed | 2017-01-27 |
| |\ \ \ | | | | | | | | | | | Clarify license on abnt2 keymap (#1038) | ||
| | * | | | Clarify license on abnt2 keymap (#1038) | Potiguar Faga | 2017-01-27 |
| |/ / / | |||
| * | | | Merge pull request #869 from dylanjgscott/master | Jack Humbert | 2017-01-27 |
| |\ \ \ | | | | | | | | | | | Use `type cmp` to test for cmp in Makefile | ||
| | * | | | Compare Makefile with itself instead of using `--help` | Dylan Scott | 2017-01-24 |
| | | | | | |||
| | | | * | Merge remote-tracking branch 'upstream/master' | Brendan Johan Lee | 2017-01-27 |
| | | | |\ | | |_|_|/ | |/| | | | |||
| * | | | | Merge pull request #1035 from qmk/qmk_org_changes | Jack Humbert | 2017-01-27 |
| |\ \ \ \ | | |_|/ / | |/| | | | Updated urls due to transfer to qmk org | ||
| | * | | | replace jackhumbert with qmk | Jack Humbert | 2017-01-26 |
| |/ / / | |||
| | | * | [deadcyclo layout] Added more unicode keys and ibus unicode compose trigger keys | Brendan Johan Lee | 2017-01-27 |
| | | | | |||
| | | * | Merge remote-tracking branch 'upstream/master' | Brendan Johan Lee | 2017-01-26 |
| | | |\ | | |_|/ | |/| | | |||
| * | | | Merge pull request #1029 from SjB/qmk_infinity60 | Jack Humbert | 2017-01-26 |
| |\ \ \ | | | | | | | | | | | fix: infinity60 keyboard was not using quantum features. | ||
| | * | | | updated all the other keymaps to support the new changes. | SjB | 2017-01-24 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qmk firmware requires the matrix_init_user and matrix_scan_user function to be implementated. Added these function to all the existing keymaps. | ||
| | * | | | fix: infinity60 keyboard was not using quantum features. | SjB | 2017-01-23 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the quantum matrix codes where not being initialized or/and called so no feature of the quantum firmware could be used. These codes have been added and now we can enjoy the quantum firmware goodness. | ||
| * | | | | Merge pull request #1033 from smt/smt/preonic | Jack Humbert | 2017-01-26 |
| |\ \ \ \ | | | | | | | | | | | | | Add smt's keymap for Preonic | ||
| | * | | | | Remove COLEMAK from preonic_keycodes enum | Stephen Tudor | 2017-01-25 |
| | | | | | | |||
| | * | | | | Update readme for smt Preonic keymap | Stephen Tudor | 2017-01-25 |
| | | | | | | |||
| | * | | | | Add smt keymap for Preonic | Stephen Tudor | 2017-01-25 |
| | | | | | | |||
| * | | | | | Add gitter image, start update to qmk org | Jack Humbert | 2017-01-26 |
| | | | | | | |||
| * | | | | | Merge branch 'master' of github.com:jackhumbert/qmk_firmware | Jack Humbert | 2017-01-25 |
| |\| | | | | |||
| * | | | | | layer defines to enum | Jack Humbert | 2017-01-25 |
| | |/ / / | |/| | | | |||
| | | | * | [deadcyclo layout] Added lotsof new emojis and some new unicode keys | Brendan Johan Lee | 2017-01-25 |
| | | | | | |||
| | | | * | Merge remote-tracking branch 'upstream/master' | Brendan Johan Lee | 2017-01-24 |
| | | | |\ | | | |_|/ | | |/| | | |||
| | * | | | Merge pull request #1014 from SjB/lcd_mods_status | Jack Humbert | 2017-01-24 |
| |/| | | | | | | | | | | | | | added mods status bit to visualizer. | ||
| | * | | | added mods status bit to visualizer. | SjB | 2017-01-17 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since we can't read the real_mods and oneshot_mods static variable directly within the update_user_visualizer_state function (Threading and serial link). We are know storing the mods states in the visualizer_keyboard_status_t structure. We can now display the status of the modifier keys on the LCD display. | ||
| * | | | | turn off rgb_midi in ez | Jack Humbert | 2017-01-23 |
| | | | | | |||
| | | | * | [deadcyclo layout] Added unicode layer | Brendan Johan Lee | 2017-01-24 |
| | | | | | |||
| | | | * | [deadcyclo layout] Added support for ergodox ez shine | Brendan Johan Lee | 2017-01-24 |
| | |_|/ | |/| | | |||
| * | | | Merge pull request #1026 from TerryMathews/master | Jack Humbert | 2017-01-23 |
| |\ \ \ | | | | | | | | | | | Let's Split: More code cleanup | ||
| | * | | | More code cleanup | TerryMathews | 2017-01-22 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Missed a few commented out vestigal defines in revx/config.h that had been moved to keymap/serial and i2c. | ||
| * | | | | Merge pull request #1018 from hot-leaf-juice/master | Jack Humbert | 2017-01-22 |
| |\ \ \ \ | | | | | | | | | | | | | simplified my keymap | ||
| | * | | | | simplify | Callum Oakley | 2017-01-20 |
| | | | | | | |||
| * | | | | | More keyboard map tweaking (#1019) | Christopher Browne | 2017-01-22 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add HOME/END keys as upper/lower on arrow-up/down * Reduce .hex file size by turning off unneeded options * Put digit keypad onto left hand upon RAISE; this will sometimes be preferable to double-hits of right hand | ||
| * | | | | | Merge pull request #1020 from remigius42/master | Jack Humbert | 2017-01-22 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Swiss German layout for Ergodox EZ & Infinity | ||
| | * | | | | | SG Ergodox layout: Updated layout documentation | Andreas Schmidt | 2017-01-22 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Swiss German Ergodox layout: Updated layout documentation based on previous layout changes. | ||
| | * | | | | | SG Ergodox layout: Fixed ENTER key mapping | Andreas Schmidt | 2017-01-22 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Swiss German Ergodox layout: Additional ENTER key was mapped to wrong layer and keyboard half. |