Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | | Merge pull request #1323 from nikchi/master | Jack Humbert | 2017-05-30 | 5 | -22/+62 | |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Variable tapping terms | |||||
| * | | | | | | | | | | hmm? | Nick Choi | 2017-05-30 | 1 | -1/+1 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | Merge pull request #2 from qmk/master | Nick Choi | 2017-05-30 | 92 | -34/+5520 | |
| |\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | pull in new qmk changes | |||||
* | | | | | | | | | | | Merge branch 'master' of https://github.com/qmk/qmk_firmware | Jack Humbert | 2017-05-30 | 3 | -3/+21 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ | Merge pull request #1342 from priyadi/adafruit-mouse-buttons | Jack Humbert | 2017-05-30 | 3 | -3/+21 | |
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Adafruit Feather BLE / BLE Friend mouse buttons support | |||||
| | * | | | | | | | | | | | Adafruit Feather BLE / BLE Friend mouse buttons support | Priyadi Iman Nurcahyo | 2017-05-29 | 3 | -3/+21 | |
| | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | make qmk bot do the hard work | Jack Humbert | 2017-05-30 | 1 | -2/+2 | |
|/ / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | Merge branch 'master' of https://github.com/qmk/qmk_firmware | Jack Humbert | 2017-05-30 | 1 | -4/+6 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / | |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | | Merge pull request #1344 from qmk/jackhumbert-patch-1 | Jack Humbert | 2017-05-29 | 1 | -4/+6 | |
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Re-enable mouse buttons from #1327 | |||||
| | * | | | | | | | | | | | Re-enable mouse buttons | Jack Humbert | 2017-05-29 | 1 | -4/+6 | |
| |/ / / / / / / / / / / | ||||||
* / / / / / / / / / / / | exclude PRs | Jack Humbert | 2017-05-30 | 2 | -5/+6 | |
|/ / / / / / / / / / / | ||||||
* | | | | | | | | | | | no master needed on push maybe | Jack Humbert | 2017-05-29 | 1 | -1/+1 | |
| | | | | | | | | | | | ||||||
* | | | | | | | | | | | Merge branch 'master' of https://github.com/qmk/qmk_firmware | Jack Humbert | 2017-05-29 | 8 | -15/+360 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Jokrik's Clueboard layout (#1340) | Priyadi Iman Nurcahyo | 2017-05-29 | 2 | -0/+97 | |
| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Merge pull request #1343 from Maartenwut/patch-1 | Jack Humbert | 2017-05-29 | 1 | -0/+18 | |
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Added SEND_STRING(); to the documentation. | |||||
| | * | | | | | | | | | | | Added SEND_STRING(); to the documentation. | Maarten Dekkers | 2017-05-29 | 1 | -0/+18 | |
| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Merge pull request #1337 from fredizzimo/wsl_setup | Jack Humbert | 2017-05-29 | 5 | -15/+245 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | | | Add script for setting up Windows Subsystem for Linux | |||||
| | * | | | | | | | | | | | Update windows 10 instructions | Fred Sundvik | 2017-05-28 | 1 | -15/+22 | |
| | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | Create a symlink to qmk if requested | Fred Sundvik | 2017-05-28 | 1 | -0/+13 | |
| | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | Add activate_wsl to .bashrc | Fred Sundvik | 2017-05-28 | 2 | -6/+31 | |
| | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | Fix symlink creation | Fred Sundvik | 2017-05-28 | 1 | -1/+1 | |
| | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | Use unzip instead of 7zip | Fred Sundvik | 2017-05-28 | 1 | -5/+5 | |
| | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | Actually install flip instead of just extracting | Fred Sundvik | 2017-05-28 | 2 | -3/+19 | |
| | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | Make symlink to utils and export programmer variables | Fred Sundvik | 2017-05-28 | 2 | -1/+18 | |
| | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | Add install dependencies | Fred Sundvik | 2017-05-28 | 1 | -4/+18 | |
| | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | Add prompt for re-downloading the utils | Fred Sundvik | 2017-05-28 | 1 | -1/+13 | |
| | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | Add driver installation | Fred Sundvik | 2017-05-28 | 2 | -2/+69 | |
| | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | Add checks for cloning to the right dir | Fred Sundvik | 2017-05-28 | 1 | -23/+48 | |
| | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | Download windows flashing utils and driver_installer | Fred Sundvik | 2017-05-28 | 2 | -0/+34 | |
| | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | push to git url | Jack Humbert | 2017-05-29 | 1 | -2/+2 | |
|/ / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | Merge branch 'master' of https://github.com/qmk/qmk_firmware | Jack Humbert | 2017-05-29 | 1 | -1/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #1341 from Dbroqua/patch-3 | Jack Humbert | 2017-05-29 | 1 | -1/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update Differences-from-TMK.md | |||||
| | * | | | | | | | | | | | | Update Differences-from-TMK.md | Damien | 2017-05-29 | 1 | -1/+0 | |
| | | |/ / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed fn_actions. According this [comment](https://github.com/qmk/qmk_firmware/pull/1336#issuecomment-304634633) | |||||
* | / | | | | | | | | | | | get rid of folders in tar | Jack Humbert | 2017-05-29 | 1 | -0/+0 | |
|/ / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | Merge branch 'master' of https://github.com/qmk/qmk_firmware | Jack Humbert | 2017-05-29 | 2 | -1/+3 | |
|\| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Merge pull request #1338 from qmk/hf/prevent_stuck_mods | Erez Zukerman | 2017-05-28 | 2 | -1/+3 | |
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds prevent stuck modifiers to EZ default | |||||
| | * | | | | | | | | | | | Adds prevent stuck modifiers to EZ default | Erez Zukerman | 2017-05-28 | 2 | -1/+3 | |
| |/ / / / / / / / / / / | ||||||
* / / / / / / / / / / / | more than one en-file, and actually ignore docs | Jack Humbert | 2017-05-29 | 6 | -5/+5 | |
|/ / / / / / / / / / / | ||||||
* | | | | | | | | | | | ignore docs, fix tag/hex pushing | Jack Humbert | 2017-05-28 | 3 | -3/+11 | |
| | | | | | | | | | | | ||||||
* | | | | | | | | | | | Merge pull request #1336 from Dbroqua/patch-2 | Jack Humbert | 2017-05-28 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | Update Differences-from-TMK.md | |||||
| * | | | | | | | | | | Update Differences-from-TMK.md | Damien | 2017-05-28 | 1 | -1/+1 | |
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hello, I'm not sure but it seems to be uint |