Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge https://github.com/IBNobody/qmk_firmware into pc_planck | IBNobody | 2016-04-13 | 0 | -0/+0 |
|\ | |||||
| * | Merge remote-tracking branch 'refs/remotes/origin/pc_planck' | IBNobody | 2016-04-13 | 8 | -87/+479 |
| |\ | |||||
* | | | Merge remote-tracking branch 'refs/remotes/origin/master' into pc_planck | IBNobody | 2016-04-13 | 0 | -0/+0 |
|\| | | |||||
| * | | Merge remote-tracking branch 'refs/remotes/jackhumbert/master' | IBNobody | 2016-04-13 | 47 | -2736/+11041 |
| |\ \ | |||||
* | | | | Compiler Warnings / Atomic TLC | IBNobody | 2016-04-13 | 11 | -35/+113 |
| |_|/ |/| | | | | | | | | | | | Corrected compiler warnings for a number of issues. Gave Atomic some TLC. | ||||
* | | | Merge remote-tracking branch 'refs/remotes/jackhumbert/master' into pc_planck | IBNobody | 2016-04-13 | 47 | -2736/+11041 |
|\ \ \ | | |/ | |/| | |||||
| * | | Merge pull request #249 from nrrkeene/master | Erez Zukerman | 2016-04-12 | 9 | -1325/+1685 |
| |\ \ | | | | | | | | | Version 3, Ordinary Perfected | ||||
| | * | | The Ordinary Layout is the layout you are looking for. Come and see. | Nicholas Keene | 2016-04-11 | 1 | -8/+8 |
| | | | | |||||
| | * | | The Ordinary Layout is the layout you are looking for. Come and see. | Nicholas Keene | 2016-04-11 | 3 | -1129/+1180 |
| | | | | |||||
| | * | | The Ordinary Layout is the layout you are looking for. Come and see. | Nicholas Keene | 2016-04-11 | 9 | -1324/+1633 |
| | | | | |||||
| * | | | Merge pull request #248 from J3RN/master | Erez Zukerman | 2016-04-12 | 2 | -18/+20 |
| |\ \ \ | | | | | | | | | | | Vim-style navigation for j3rn layout | ||||
| | * | | | Merge pull request #1 from J3RN/vim-navigation | Jonathan Arnett | 2016-04-11 | 2 | -18/+20 |
| |/| | | | | | | | | | | | | | Added Vim-style navigation | ||||
| | * | | | Added README note about Vim-style navigation | Jonathan Arnett | 2016-04-11 | 1 | -3/+4 |
| | | | | | |||||
| | * | | | Stylistic changes | Jonathan Arnett | 2016-04-11 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Make a also toggle Media layer | Jonathan Arnett | 2016-04-11 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Building a row of level switch buttons | Jonathan Arnett | 2016-03-24 | 1 | -3/+3 |
| | | | | | |||||
| | * | | | A to toggle L2, hjkl to move mouse | Jonathan Arnett | 2016-03-24 | 1 | -13/+14 |
| | | | | | |||||
| * | | | | Merge pull request #246 from romanzolotarev/master | Erez Zukerman | 2016-04-11 | 5 | -5/+1331 |
| |\ \ \ \ | | | | | | | | | | | | | Add a new layout with arrows in the home row | ||||
| | * | | | | Add HJKL layout | Roman Zolotarev | 2016-04-11 | 5 | -5/+1331 |
| | | | | | | |||||
| * | | | | | Merge pull request #244 from nicosuave/add_nico_planck_keymap | Jack Humbert | 2016-04-11 | 1 | -0/+69 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Add nico keymap | ||||
| | * | | | | | Add my keymap | Nico Ritschel | 2016-04-09 | 1 | -0/+69 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #236 from tak3over/master | Jack Humbert | 2016-04-11 | 2 | -49/+43 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Minor Doc Changes. | ||||
| | * | | | | | | another modification of layers, restored arrow keys and added cut/paste | tak3over | 2016-04-07 | 1 | -13/+31 |
| | | | | | | | | |||||
| | * | | | | | | switched raise and lower layers | tak3over | 2016-04-06 | 1 | -16/+13 |
| | | | | | | | | |||||
| | * | | | | | | updated my keymap | tak3over | 2016-04-05 | 1 | -3/+1 |
| | | | | | | | | |||||
| | * | | | | | | Modified keymap | tak3over | 2016-04-05 | 1 | -29/+10 |
| | | | | | | | | |||||
| | * | | | | | | Update tak3over.c | tak3over | 2016-04-04 | 1 | -27/+27 |
| | | | | | | | | |||||
| | * | | | | | | Merge pull request #2 from jackhumbert/master | tak3over | 2016-04-04 | 15 | -1346/+6131 |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Update from source | ||||
| | * \ \ \ \ \ \ | Merge pull request #1 from tak3over/tak3over-patch-1 | tak3over | 2016-04-04 | 1 | -5/+5 |
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Minor documentation error. Raise and Lower. | ||||
| | | * | | | | | | | Minor documentation error. Raise and Lower. | tak3over | 2016-04-04 | 1 | -5/+5 |
| | |/ / / / / / / | | | | | | | | | | | | | | | | | | | The Raise and Lower keys were transposed in the comment key map for all layers. Assuming _RS and _LW should be mapped to Raise and Lower respectively. Probably is the same in the other custom keymaps that copied from this default. | ||||
| * | | | | | | | | Merge pull request #247 from NoahAndrews/fix-path-script | Jack Humbert | 2016-04-11 | 1 | -2/+8 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Fix important bugs in the path script for Windows | ||||
| | * | | | | | | | | Added admin privilege check | NoahAndrews | 2016-04-11 | 1 | -0/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Running this as a non-administrator appears to work at first, but the changes wouldn't stick on my Win 8.1 system. It's weird, but this script needs to run as admin. | ||||
| | * | | | | | | | | Updated comment | NoahAndrews | 2016-04-11 | 1 | -1/+1 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Remove failing check | NoahAndrews | 2016-04-11 | 1 | -1/+0 |
| | | |_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NEWPATH1 (C:\MinGW\msys\bin) won't actually be created until the second script is run | ||||
| * | | | | | | | | Merge pull request #232 from IBNobody/master | Jack Humbert | 2016-04-11 | 1 | -29/+51 |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | Added Error Checking to 2nd Setup Script | ||||
| * | | | | | | | | Links to build guide | Erez Zukerman | 2016-04-03 | 1 | -1/+1 |
| | |_|_|/ / / / | |/| | | | | | | |||||
| * | | | | | | | Merge pull request #182 from Vifon/modifier-release-fix | Erez Zukerman | 2016-04-06 | 5 | -7/+124 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Fix the layer-dependent modifiers handling | ||||
| | * | | | | | | | Refactor the source layer cache encoding | Wojciech Siewierski | 2016-04-05 | 3 | -41/+71 |
| | | | | | | | | | |||||
| | * | | | | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware into ↵ | Wojciech Siewierski | 2016-04-03 | 220 | -42725/+47824 |
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | modifier-release-fix | ||||
| | * | | | | | | | | Update PREVENT_STUCK_MODIFIERS documentation in README | Wojciech Siewierski | 2016-04-02 | 1 | -2/+3 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Cleanup after merge | Wojciech Siewierski | 2016-04-02 | 1 | -7/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - remove a superfluous parenthesis - wrap lines longer than 80 characters - add const specifiers where appropriate - remove unnecessary casts | ||||
| | * | | | | | | | | Merge branch 'modifier-release-fix' of ↵ | Wojciech Siewierski | 2016-04-02 | 2 | -5/+16 |
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/eltang/qmk_firmware into modifier-release-fix | ||||
| | | * | | | | | | | | Update action.c | eltang | 2016-04-02 | 1 | -1/+1 |
| | | | | | | | | | | | |||||
| | | * | | | | | | | | Update action.c | eltang | 2016-04-02 | 1 | -1/+1 |
| | | | | | | | | | | | |||||
| | | * | | | | | | | | Update action.c | eltang | 2016-04-02 | 1 | -1/+1 |
| | | | | | | | | | | | |||||
| | | * | | | | | | | | Update action.c | eltang | 2016-04-02 | 1 | -1/+1 |
| | | | | | | | | | | | |||||
| | | * | | | | | | | | Update action.c | eltang | 2016-04-02 | 1 | -1/+1 |
| | | | | | | | | | | | |||||
| | | * | | | | | | | | Update action.c | eltang | 2016-04-02 | 1 | -1/+2 |
| | | | | | | | | | | | |||||
| | | * | | | | | | | | Update action.c | Eric-L-T | 2016-04-01 | 1 | -1/+1 |
| | | | | | | | | | | | |||||
| | | * | | | | | | | | Update action.c | Eric-L-T | 2016-04-01 | 1 | -8/+8 |
| | | | | | | | | | | |