Commit Graph

5622 Commits (cc52856bacb7c75ab86873ba997d354f24047df4)

Author SHA1 Message Date
Jack Humbert cc52856bac Merge pull request #1354 from shieldsd/tweaks
Tweak reported power consumption to work with iOS
2017-06-01 11:18:28 -04:00
Daniel Shields db0ac3bcb3 Tweak reported power consumption to work with iOS 2017-06-01 09:18:33 +01:00
Jack Humbert 57cfb5f1ae Merge pull request #1348 from Dbroqua/master
Added DK60 keyboard
2017-05-30 23:12:11 -04:00
dbroqua c5d3faace5 Merge remote-tracking branch 'origin/feature/DK60' 2017-05-30 23:10:14 +02:00
dbroqua a381eb01f5 - Updated copyright 2017-05-30 23:09:39 +02:00
Damien Broqua 061bb4a0b8 Merge remote-tracking branch 'origin/feature/DK60' 2017-05-30 22:17:20 +02:00
Damien Broqua 05f5243426 - Updated readme 2017-05-30 22:17:03 +02:00
Damien Broqua 55d6750254 Merge remote-tracking branch 'origin/feature/DK60' 2017-05-30 22:15:07 +02:00
Damien Broqua e280f7aad7 - Added Capslock/Esc led 2017-05-30 22:13:34 +02:00
Jack Humbert 328bde1624 Merge pull request #1323 from nikchi/master
Variable tapping terms
2017-05-30 15:38:22 -04:00
Nick Choi 3c4022c41b hmm? 2017-05-30 14:19:57 -04:00
Nick Choi 2c9f846608 Merge pull request #2 from qmk/master
pull in new qmk changes
2017-05-30 14:17:48 -04:00
Jack Humbert cb791cf6cd Merge branch 'master' of https://github.com/qmk/qmk_firmware 2017-05-30 12:49:38 -04:00
Jack Humbert 9ecfc23292 make qmk bot do the hard work 2017-05-30 12:49:26 -04:00
Jack Humbert 4549b0417e Merge pull request #1342 from priyadi/adafruit-mouse-buttons
Adafruit Feather BLE / BLE Friend mouse buttons support
2017-05-30 12:10:45 -04:00
Jack Humbert 3a1a7d6472 Merge branch 'master' of https://github.com/qmk/qmk_firmware 2017-05-30 11:46:34 -04:00
Jack Humbert 7eccbfe737 exclude PRs 2017-05-30 11:46:25 -04:00
Damien Broqua f06f883589 - Some changes on DK60 2017-05-30 16:59:56 +02:00
Nick Choi 5393bc6f4e switched to uint8 and 16 2017-05-29 21:25:50 -04:00
Jack Humbert 732a115b32 Merge pull request #1344 from qmk/jackhumbert-patch-1
Re-enable mouse buttons from #1327
2017-05-29 15:17:38 -04:00
Jack Humbert b6c60333e4 Re-enable mouse buttons 2017-05-29 13:21:38 -04:00
Jack Humbert 0c351fa98b no master needed on push maybe 2017-05-29 12:49:25 -04:00
Jack Humbert bd39e91f78 Merge branch 'master' of https://github.com/qmk/qmk_firmware 2017-05-29 12:15:03 -04:00
Jack Humbert 44832127d7 push to git url 2017-05-29 12:14:49 -04:00
Priyadi Iman Nurcahyo 7eebdd4760 Jokrik's Clueboard layout (#1340) 2017-05-29 09:10:34 -07:00
Jack Humbert 1d6a18db99 Merge pull request #1343 from Maartenwut/patch-1
Added SEND_STRING(); to the documentation.
2017-05-29 11:58:08 -04:00
Jack Humbert cecf783e14 Merge pull request #1337 from fredizzimo/wsl_setup
Add script for setting up Windows Subsystem for Linux
2017-05-29 11:56:53 -04:00
Maarten Dekkers 91c6113cba Added SEND_STRING(); to the documentation. 2017-05-29 17:53:39 +02:00
Jack Humbert 988941cc0a Merge branch 'master' of https://github.com/qmk/qmk_firmware 2017-05-29 11:37:33 -04:00
Jack Humbert ee0135fb81 get rid of folders in tar 2017-05-29 11:37:20 -04:00
Jack Humbert e179dbd9e6 Merge pull request #1341 from Dbroqua/patch-3
Update Differences-from-TMK.md
2017-05-29 10:55:32 -04:00
Jack Humbert 7041055ace Merge branch 'master' of https://github.com/qmk/qmk_firmware 2017-05-29 10:54:56 -04:00
Jack Humbert ae6b803ad6 more than one en-file, and actually ignore docs 2017-05-29 10:54:46 -04:00
Damien 51e44fd6c5 Update Differences-from-TMK.md
Removed fn_actions.

According this [comment](https://github.com/qmk/qmk_firmware/pull/1336#issuecomment-304634633)
2017-05-29 13:17:23 +02:00
Priyadi Iman Nurcahyo f0fc2db4e2 Adafruit Feather BLE / BLE Friend mouse buttons support 2017-05-29 18:17:21 +07:00
Erez Zukerman 80707d529c Merge pull request #1338 from qmk/hf/prevent_stuck_mods
Adds prevent stuck modifiers to EZ default
2017-05-28 20:14:36 -04:00
Erez Zukerman 41fa638aa8 Adds prevent stuck modifiers to EZ default 2017-05-28 20:05:37 -04:00
Jack Humbert 71feac5717 ignore docs, fix tag/hex pushing 2017-05-28 16:16:56 -04:00
Fred Sundvik 78aebe0631 Update windows 10 instructions 2017-05-28 22:35:45 +03:00
Jack Humbert de0a058da7 Merge pull request #1336 from Dbroqua/patch-2
Update Differences-from-TMK.md
2017-05-28 14:47:57 -04:00
Fred Sundvik 999b35c7f8 Create a symlink to qmk if requested 2017-05-28 21:38:14 +03:00
Fred Sundvik ec720ac1ea Add activate_wsl to .bashrc 2017-05-28 21:30:55 +03:00
Fred Sundvik fa4a492677 Fix symlink creation 2017-05-28 21:30:55 +03:00
Fred Sundvik 3e4f2f5590 Use unzip instead of 7zip 2017-05-28 21:30:55 +03:00
Fred Sundvik 3d3999d863 Actually install flip instead of just extracting 2017-05-28 21:30:55 +03:00
Fred Sundvik b8899b48b4 Make symlink to utils and export programmer variables 2017-05-28 21:30:55 +03:00
Fred Sundvik 9c582fc797 Add install dependencies 2017-05-28 21:30:55 +03:00
Fred Sundvik 477bd4b948 Add prompt for re-downloading the utils 2017-05-28 21:30:55 +03:00
Fred Sundvik c2096bb515 Add driver installation 2017-05-28 21:30:55 +03:00
Fred Sundvik aa26464480 Add checks for cloning to the right dir 2017-05-28 21:30:55 +03:00