Commit Graph
100 Commits
Author SHA1 Message Date
Jack Humbert 328bde1624 Merge pull request #1323 from nikchi/master
Variable tapping terms
2017-05-30 15:38:22 -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
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
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
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
Jack Humbert 71feac5717 ignore docs, fix tag/hex pushing 2017-05-28 16:16:56 -04: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
Jack Humbert d0d81eecef Merge pull request #1334 from fredizzimo/fix_faq_lineending
Fix line endings in FAQ.md
2017-05-28 12:12:47 -04:00
Jack Humbert b8c1f25072 Updates book.json
Auto commit by GitBook Editor
2017-05-27 22:24:53 +00:00
Jack Humbert 931ad66ffa Updates book.json
Auto commit by GitBook Editor
2017-05-27 22:23:09 +00:00
Jack Humbert 2003cee609 Updates book.json
Auto commit by GitBook Editor
2017-05-27 22:21:58 +00:00
Jack Humbert c3bdddb637 move book for gitbook 2017-05-27 18:20:46 -04:00
Jack Humbert c95f08c439 Updates docs/book.json
Auto commit by GitBook Editor
2017-05-27 22:19:38 +00:00
Jack Humbert 7e84b0e3b3 move old doc to docs 2017-05-27 18:14:21 -04:00
Jack Humbert 704794bae3 subtree docs 2017-05-27 18:09:52 -04:00
Jack Humbert 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
Jack Humbert bb2a8c3611 Updates book.json
Auto commit by GitBook Editor
2017-05-27 14:56:13 +00:00
Jack Humbert d24da945d1 Merge pull request #1319 from Johannes-Larsson/master
Add planck/johannes layout
2017-05-26 18:33:25 -04:00
Jack Humbert 453877422b Merge pull request #1327 from Dbroqua/master
Added Integration of IBM Trackpoint
2017-05-26 18:32:43 -04:00
Jack Humbert 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
Jack Humbert 492115a611 Merge pull request #4 from Dbroqua/master
Update Modding-your-keyboard.md
2017-05-26 18:30:41 -04:00
Jack Humbert b003669934 Merge pull request #3 from fieldju/patch-1
Fix typo in Macro.md in dynamic macro section.
2017-05-24 23:43:34 -04:00
Jack Humbert 7a4ec3bd92 Merge pull request #1316 from nikchi/master
FrostyFlake Keymap
2017-05-24 13:59:30 -04:00
Jack Humbert f9a301761f Merge pull request #2 from Vifon/master
Update the dynamic macro docs according to the recent changes
2017-05-21 11:27:41 -04:00
Jack Humbert d2ad5afaa6 Merge pull request #1 from Xyverz/master
Adding punctuation for clarity.
2017-05-20 21:44:00 -04:00
Jack Humbert 68b8f37853 favicon 2017-05-20 13:30:27 -04:00
Jack Humbert 33f886ad74 favicon 2017-05-20 13:26:08 -04:00
Jack Humbert 0cd8eb02c7 favicon 2017-05-20 13:20:10 -04:00
Jack Humbert c7e9e643fa Update readme.md 2017-05-20 12:38:30 -04:00
Jack Humbert d380ed1f75 Update readme.md 2017-05-20 12:37:31 -04:00
Jack Humbert 684a02ae3f Update SUMMARY.md 2017-05-20 12:30:24 -04:00
Jack Humbert b3bff6404c Update SUMMARY.md 2017-05-20 12:29:45 -04:00
Jack Humbert 046c5d332f Update SUMMARY.md 2017-05-20 12:27:07 -04:00
Jack Humbert 5e28f88707 Update book.json 2017-05-20 12:07:31 -04:00
Jack Humbert d678899c83 Update book.json 2017-05-20 12:04:03 -04:00
Jack Humbert 2df879cbe3 Update book.json 2017-05-20 12:02:55 -04:00
Jack Humbert 85df687348 m10a lowercase 2017-05-18 18:55:07 -04:00
Jack Humbert 8da442f411 update travis script 2017-05-17 20:27:07 -04:00
Jack Humbert e5ed23c0b3 summary test 2017-05-15 22:45:20 -04:00
Jack Humbert 2513912975 Updates book.json
Auto commit by GitBook Editor
2017-05-16 02:39:49 +00:00
Jack Humbert 52562eaaea Updates book.json
Auto commit by GitBook Editor
2017-05-16 02:38:44 +00:00
Jack Humbert 3a7e0dd2f6 Updates book.json
Auto commit by GitBook Editor
2017-05-16 02:36:31 +00:00
Jack Humbert e0689c000b Updates book.json
Auto commit by GitBook Editor
2017-05-16 02:35:00 +00:00
Jack Humbert 997a847f8c update links 2017-05-15 22:29:17 -04:00
Jack Humbert 60daffbe5d Update SUMMARY.md 2017-05-15 22:00:22 -04:00
Jack Humbert e5b0095e6c Update SUMMARY.md 2017-05-15 22:00:14 -04:00
Jack Humbert 819f0998bd Updates SUMMARY.md
Auto commit by GitBook Editor
2017-05-16 01:50:44 +00:00
Jack Humbert 7cbbf62f5f Merge pull request #1298 from barrar/master
Anti-ghost improvement for older keyboards with empty spots in matrix
2017-05-15 12:20:17 -04:00
Jack Humbert 95ac79cb67 Updates SUMMARY.md
Auto commit by GitBook Editor
2017-05-13 20:17:26 +00:00
Jack Humbert 694db4130e Updates SUMMARY.md
Auto commit by GitBook Editor
2017-05-13 20:17:21 +00:00
Jack Humbert 7f4cf32af9 Updates book.json
Auto commit by GitBook Editor
2017-05-13 20:10:38 +00:00
Jack Humbert e7da52c7de Updates book.json
Auto commit by GitBook Editor
2017-05-13 20:09:06 +00:00
Jack Humbert 43d1e05b31 Updates Home.md
Auto commit by GitBook Editor
2017-05-13 20:04:39 +00:00
Jack Humbert 05a6449d2d Updates readme.md
Auto commit by GitBook Editor
2017-05-13 18:25:08 +00:00
Jack Humbert 04069c94cc Merge pull request #1297 from khogeland/satan-colemak
Colemak layout for GH60 Satan
2017-05-12 16:24:51 -04:00
Jack Humbert a82e752f64 Merge pull request #1291 from adzenith/persistent
Fix spelling of "persistent"
2017-05-12 16:24:29 -04:00
Jack Humbert b412bb8d8c Merge pull request #1283 from TerryMathews/master
Establish support for Bathroom Epiphanies Tiger Lily controller
2017-05-11 14:34:02 -04:00
Jack Humbert d6ce42b01c Merge pull request #1288 from Nephiel/led-set-on-layer-change
Call led_set for layer action events to update LEDs on layer changes
2017-05-11 14:32:56 -04:00
Jack Humbert de2c51b7ca Merge pull request #1290 from shieldsd/master
Add new features to dshields keymap.
2017-05-11 14:31:11 -04:00
Jack Humbert d9b70cc1c9 Merge pull request #1275 from Vifon/dynamic_macro/trailing_keypresses
dynamic macros: Trim the trailing modifiers; further cleanup
2017-05-07 20:20:55 -04:00
Jack Humbert b11a5be62c Merge pull request #1278 from shieldsd/master
Add new keymap for dshields.
2017-05-07 20:18:23 -04:00
Jack Humbert 0b050f6c33 Merge pull request #1280 from tobsn/patch-1
lowercase .jpg
2017-05-07 20:17:47 -04:00
Jack Humbert 05b356dea7 Merge pull request #1282 from coderkun/coderkun_neo2
Merge changes for coderkun’s Neo2 layout
2017-05-07 20:16:30 -04:00
Jack Humbert 7a7b57ffb1 Merge pull request #1284 from bigtunaIO/master
[Bigtuna.IO] Updating Miuni32 Layouts
2017-05-07 20:16:03 -04:00
Jack Humbert 2704c163da Merge pull request #1272 from Thor77/ps2avrGB-keymap-kc-prefix
[ps2avrGB] Add KEYMAP without KC-prefix
2017-05-04 15:07:57 -04:00
Jack Humbert 3af95509b5 Merge pull request #1273 from Vifon/pr_1267_fix
Add DYN_REC_STOP to the dynamic macros, cleanup PR #1267
2017-05-04 15:07:04 -04:00
Jack Humbert c5cef025ec Merge pull request #1269 from ryanmaclean/patch-6
Cleaning Up Dockerfile Layers Per Official Docs
2017-05-01 12:15:27 -04:00
Jack Humbert 26b51383b2 Merge pull request #1266 from ryanmaclean/patch-5
Adding AMJ60 ANSI Maximized Layout
2017-04-30 16:57:14 -04:00
Jack Humbert 29026ec023 Merge pull request #1268 from priyadi/promethium
Promethium keymap update
2017-04-30 11:18:54 -04:00
Jack Humbert 2d732f484c Merge pull request #1264 from fredizzimo/wsl_support
Add possibility to override the command to execute when flashing
2017-04-30 11:17:47 -04:00
Jack Humbert d1d2b87f97 fixes s60_x keyboard 2017-04-30 10:48:17 -04:00
Jack Humbert 43aa59c703 Merge pull request #1263 from Dbroqua/master
Fixed bugs for S60-X RGB version
2017-04-30 10:27:40 -04:00
Jack Humbert 26bbfd7812 Merge pull request #1259 from laelath/master
Added a proper README to the lae3 keymap
2017-04-26 19:22:36 -04:00
Jack Humbert 5a809ac178 Merge pull request #1258 from smt/smt/hhkb
Add smt keymap for HHKB
2017-04-26 15:30:36 -04:00
Jack Humbert 7bd4559b4b Merge pull request #1231 from Dbroqua/master
S60-X RGB support
2017-04-25 14:09:41 -04:00
Jack Humbert 9fa7a788d3 Merge pull request #1253 from laelath/master
Added lae3 keymap
2017-04-25 14:08:52 -04:00
Jack Humbert 627dd8a73c Merge pull request #1255 from ryanmaclean/patch-4
Initial Ortholinear Commit for AMJPad
2017-04-25 14:08:16 -04:00
Jack Humbert 46826adba8 Merge pull request #1257 from MachineIndustries/keyboards/M10A
Add RAMA x Machine Industries M10A to the keyboards directory
2017-04-25 14:07:41 -04:00
Jack Humbert 460b5f8751 Merge pull request #1246 from reversebias/master
Initial support for the Mitosis Keyboard
2017-04-19 08:43:28 -04:00
Jack Humbert 95242fe0f1 Merge pull request #1245 from fredizzimo/fix_lcd_pin_configuration
Fix LCD SS pin configuration
2017-04-19 07:50:03 -04:00
Jack Humbert 4760b26bec Merge pull request #1244 from ryanmaclean/patch-3
Adding Maximized Keymap
2017-04-19 07:49:46 -04:00
Jack Humbert ff4ad46dca Merge pull request #1243 from Xyverz/master
Removed LT macros
2017-04-19 07:47:56 -04:00
Jack Humbert be0afd24bf Merge pull request #1239 from priyadi/promethium
Keymap updates
2017-04-18 16:17:27 -04:00
Jack Humbert d926ba22a2 Merge pull request #1238 from priyadi/fauxclicky_fix
Faux clicky bug fixes
2017-04-18 16:16:35 -04:00
Jack Humbert 7a16a30e6a Merge pull request #1236 from Xyverz/master
Revamp TV44 keymap.
2017-04-18 16:08:16 -04:00
Jack Humbert a25d4a90c3 Merge pull request #1235 from siroken3/siroken3
Siroken3
2017-04-18 16:06:27 -04:00
Jack Humbert ae8ac581c0 Merge pull request #1234 from whitef0x0/patch-1
Fixed dvorak layout for Atreus50
2017-04-17 19:02:24 -04:00