5592 Commits

Author SHA1 Message Date
7eccbfe737 exclude PRs 2017-05-30 11:46:25 -04:00
0c351fa98b no master needed on push maybe 0.5.47 2017-05-29 12:49:25 -04:00
bd39e91f78 Merge branch 'master' of https://github.com/qmk/qmk_firmware 0.5.46 2017-05-29 12:15:03 -04:00
44832127d7 push to git url 2017-05-29 12:14:49 -04:00
7eebdd4760 Jokrik's Clueboard layout (#1340) 2017-05-29 09:10:34 -07:00
1d6a18db99 Merge pull request #1343 from Maartenwut/patch-1
Added SEND_STRING(); to the documentation.
2017-05-29 11:58:08 -04:00
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
91c6113cba Added SEND_STRING(); to the documentation. 2017-05-29 17:53:39 +02:00
988941cc0a Merge branch 'master' of https://github.com/qmk/qmk_firmware 2017-05-29 11:37:33 -04:00
ee0135fb81 get rid of folders in tar 2017-05-29 11:37:20 -04:00
e179dbd9e6 Merge pull request #1341 from Dbroqua/patch-3
Update Differences-from-TMK.md
2017-05-29 10:55:32 -04:00
7041055ace Merge branch 'master' of https://github.com/qmk/qmk_firmware 2017-05-29 10:54:56 -04:00
ae6b803ad6 more than one en-file, and actually ignore docs 2017-05-29 10:54:46 -04:00
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
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
41fa638aa8 Adds prevent stuck modifiers to EZ default 2017-05-28 20:05:37 -04:00
71feac5717 ignore docs, fix tag/hex pushing 2017-05-28 16:16:56 -04:00
78aebe0631 Update windows 10 instructions 2017-05-28 22:35:45 +03:00
de0a058da7 Merge pull request #1336 from Dbroqua/patch-2
Update Differences-from-TMK.md
2017-05-28 14:47:57 -04:00
999b35c7f8 Create a symlink to qmk if requested 2017-05-28 21:38:14 +03:00
ec720ac1ea Add activate_wsl to .bashrc 2017-05-28 21:30:55 +03:00
fa4a492677 Fix symlink creation 2017-05-28 21:30:55 +03:00
3e4f2f5590 Use unzip instead of 7zip 2017-05-28 21:30:55 +03:00
3d3999d863 Actually install flip instead of just extracting 2017-05-28 21:30:55 +03:00
b8899b48b4 Make symlink to utils and export programmer variables 2017-05-28 21:30:55 +03:00
9c582fc797 Add install dependencies 2017-05-28 21:30:55 +03:00
477bd4b948 Add prompt for re-downloading the utils 2017-05-28 21:30:55 +03:00
c2096bb515 Add driver installation 2017-05-28 21:30:55 +03:00
aa26464480 Add checks for cloning to the right dir 2017-05-28 21:30:55 +03:00
28a4e90565 Download windows flashing utils and driver_installer 2017-05-28 21:30:55 +03:00
b2010cd478 Update Differences-from-TMK.md
Hello,

I'm not sure but it seems to be uint8_t for TMK/fn_actions (cf. https://github.com/tmk/tmk_keyboard/blob/master/README.md ).

Regards,
Damien
2017-05-28 19:17:22 +02:00
d0d81eecef Merge pull request #1334 from fredizzimo/fix_faq_lineending
Fix line endings in FAQ.md
2017-05-28 12:12:47 -04:00
623b1cd866 Fix line endings in FAQ.md 2017-05-28 12:28:02 +03:00
b8c1f25072 Updates book.json
Auto commit by GitBook Editor
2017-05-27 22:24:53 +00:00
931ad66ffa Updates book.json
Auto commit by GitBook Editor
2017-05-27 22:23:09 +00:00
2003cee609 Updates book.json
Auto commit by GitBook Editor
2017-05-27 22:21:58 +00:00
c3bdddb637 move book for gitbook 2017-05-27 18:20:46 -04:00
c95f08c439 Updates docs/book.json
Auto commit by GitBook Editor
2017-05-27 22:19:38 +00:00
7e84b0e3b3 move old doc to docs 2017-05-27 18:14:21 -04:00
704794bae3 subtree docs 2017-05-27 18:09:52 -04:00
e229dcadb5 Merge pull request #5 from Maartenwut/patch-1
Mention that TT needs 5 taps by default.
2017-05-27 11:03:34 -04:00
bb2a8c3611 Updates book.json
Auto commit by GitBook Editor
2017-05-27 14:56:13 +00:00
e7fccabb1c Mention that TT needs 5 taps by default.
Also gave an example of defining the amount of taps needed.
2017-05-27 12:34:16 +02:00
d24da945d1 Merge pull request #1319 from Johannes-Larsson/master
Add planck/johannes layout
2017-05-26 18:33:25 -04:00
453877422b Merge pull request #1327 from Dbroqua/master
Added Integration of IBM Trackpoint
2017-05-26 18:32:43 -04:00
9851e6f3b1 Merge pull request #1328 from yiancar/qmk_usb_startup_disable
Use variable to disable usb check at startup
2017-05-26 18:31:23 -04:00
492115a611 Merge pull request #4 from Dbroqua/master
Update Modding-your-keyboard.md
2017-05-26 18:30:41 -04:00
fa1b92fbb1 Use variable to disable usb check at startup
Adds a define variable which when defined disables the usb startup
check. Modified the makefile to separate above define from bluetooth
dependancy
2017-05-26 21:58:43 +01:00
6d12588cdf Merge pull request #1 from Dbroqua/patch-1
Update Modding-your-keyboard.md
2017-05-26 22:16:09 +02:00
6b994ecd82 - Added schematic for Trackpoint demonstration 2017-05-26 21:27:11 +02:00