Commit Graph

4198 Commits (b5159c964a6cd2997bf49951e0e99ed4d3d38f1e)
 

Author SHA1 Message Date
Jack Humbert b5159c964a Merge pull request #1036 from nicinabox/lets-split-improvements
8 years ago
Jack Humbert 4348fb54d6 Merge pull request #960 from ofples/feature/combos
8 years ago
Jack Humbert b6ffda4849 Merge pull request #1010 from SjB/oneshot_timeout_fix
8 years ago
Jack Humbert 449ab9109a Merge branch 'master' of github.com:jackhumbert/qmk_firmware
8 years ago
Jack Humbert 35edb382ee [skip build] testing travis script
8 years ago
Jack Humbert 0a3c5c06fe Merge pull request #981 from jonasoberschweiber/osx-surrogate-pairs
8 years ago
Jack Humbert 5c8cdfd2b5 [skip build] testing travis script
8 years ago
Jack Humbert 246d2583ff Merge pull request #1030 from SjB/refactor_register_code16
8 years ago
Jack Humbert ee386a29d1 [skip build] testing travis script
8 years ago
Jack Humbert cf8dac3538 [skip build] testing travis script
8 years ago
Jack Humbert 98adda34c9 [skip build] testing travis script
8 years ago
Jack Humbert 470c8436c2 [skip build] testing travis script
8 years ago
Jack Humbert 3a76f24cbd [skip build] testing travis script
8 years ago
Jack Humbert 835cacb031 fixes qmk.fm linking, tests out auto version incrementing
8 years ago
Erez Zukerman f0633f2540 Merge pull request #1063 from osamuaoki/master
8 years ago
Erez Zukerman 404f79ef14 Merge pull request #1058 from edasque/master
8 years ago
Osamu Aoki f787f4291a Typo fixes
8 years ago
Erez Zukerman 45e5b32781 Merge pull request #1049 from SjB/tap_dance_save_oneshot_mods
8 years ago
Erez Zukerman a5d10e8c2e Merge pull request #1054 from deadcyclo/master
8 years ago
Brendan Johan Lee 02a95ee08c Merge remote-tracking branch 'upstream/master'
8 years ago
Erik Dasque 407f949e4b Reverted Dockerfile to put the CMD back
8 years ago
Erez Zukerman 748316fc43 Merge pull request #1039 from zabereer/albert_ergodox_keymap
8 years ago
Erez Zukerman 0081101c30 Merge pull request #1055 from matzebond/master
8 years ago
Matthias Schmitt 4c3630dc17 update my neo2 keymap
8 years ago
Brendan Johan Lee f70758622b [deadcyclo layout] Refactoring. Use custom functions and macros
8 years ago
Brendan Johan Lee f400ac1d7d [deadcyclo layout] fixed failing tests
8 years ago
Brendan Johan Lee d43f4a5f57 Merge remote-tracking branch 'upstream/master'
8 years ago
SjB 5a860b71a1 race condition between oneshot_mods and tap_dance
8 years ago
SjB 45e0d09414 moved oneshot cancellation code outside of process_record.
8 years ago
SjB f644b9a07a registering a weak_mods when using register_code16
8 years ago
skullydazed ec05f65421 Merge pull request #1043 from potz/patch-1
8 years ago
Potiguar Faga 2fe18a50ec Clarify license on abnt2 keymap (#1038)
8 years ago
Jack Humbert a28f689387 Merge pull request #869 from dylanjgscott/master
8 years ago
Brendan Johan Lee d7aa4724fb Merge remote-tracking branch 'upstream/master'
8 years ago
Brendan Johan Lee 13fa63b192 [deadcyclo layout] Added more unicode keys and ibus unicode compose trigger keys
8 years ago
Jack Humbert 712f3de16f Merge pull request #1035 from qmk/qmk_org_changes
8 years ago
Albert Pretorius fffe76a7b7 albert ergodox keymap
8 years ago
Nic Aitch 890ecf6a2a Update readme
8 years ago
Nic Aitch 3131d65563 Add avrdude target
8 years ago
Brendan Johan Lee 8a645aa9ad Merge remote-tracking branch 'upstream/master'
8 years ago
Jack Humbert c9ca368008 replace jackhumbert with qmk
8 years ago
Jack Humbert aac7c0aa4d Merge pull request #1029 from SjB/qmk_infinity60
8 years ago
Jack Humbert 0212a30aa6 Merge pull request #1033 from smt/smt/preonic
8 years ago
Jack Humbert 1b20243092 Add gitter image, start update to qmk org
8 years ago
Stephen Tudor 6546dddddb Remove COLEMAK from preonic_keycodes enum
8 years ago
Jack Humbert 7e3962f36a Merge branch 'master' of github.com:jackhumbert/qmk_firmware
8 years ago
Jack Humbert 938422ce99 layer defines to enum
8 years ago
Brendan Johan Lee 8af48194f2 [deadcyclo layout] Added lotsof new emojis and some new unicode keys
8 years ago
Stephen Tudor 51fe4f0d34 Update readme for smt Preonic keymap
8 years ago
Stephen Tudor b3cf96ec2e Add smt keymap for Preonic
8 years ago