Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #227 from NoahAndrews/patch-4 | Jack Humbert | 2016-03-30 | 1 | -2/+2 |
|\ | |||||
| * | Fixed minor issues with Preonic readme | Noah Andrews | 2016-03-30 | 1 | -2/+2 |
* | | Merge pull request #228 from mrfoto/fix-planck-diagram | Jack Humbert | 2016-03-30 | 1 | -2/+2 |
|\ \ | |/ |/| | |||||
| * | Tiny fix of Planck diagrams | Miha Rekar | 2016-03-30 | 1 | -2/+2 |
|/ | |||||
* | preonic readme | Jack Humbert | 2016-03-30 | 1 | -9/+3 |
* | Merge branch 'master' of https://github.com/jackhumbert/tmk_keyboard | Jack Humbert | 2016-03-30 | 179 | -41877/+39434 |
|\ | |||||
| * | Merge pull request #224 from NoahAndrews/make-keymap-names-consistent | Jack Humbert | 2016-03-29 | 41 | -42/+45 |
| |\ | |||||
| | * | Updated several keyboard folders to use new keymap naming scheme | Noah Andrews | 2016-03-29 | 41 | -42/+45 |
| | * | Merge remote-tracking branch 'jackhumbert/master' into make-keymap-names-cons... | Noah Andrews | 2016-03-29 | 147 | -40692/+40208 |
| | |\ | | |/ | |/| | |||||
| * | | Merge pull request #223 from NoahAndrews/patch-3 | Jack Humbert | 2016-03-29 | 1 | -4/+9 |
| |\ \ | |||||
| | * | | Fix #198 | Noah Andrews | 2016-03-29 | 1 | -4/+9 |
| |/ / | |||||
| * | | Merge pull request #222 from NoahAndrews/patch-2 | Jack Humbert | 2016-03-29 | 1 | -1/+1 |
| |\ \ | |||||
| | * | | Fix error in Planck makefile comment | Noah Andrews | 2016-03-29 | 1 | -1/+1 |
| |/ / | |||||
| * | | Merge pull request #219 from IBNobody/master | Jack Humbert | 2016-03-28 | 4 | -13/+48 |
| |\ \ | |||||
| | * | | Minor Tweaks and Documentation | IBNobody | 2016-03-28 | 3 | -12/+44 |
| | * | | Added command to turn LED indicators off while sleeping | IBNobody | 2016-03-28 | 1 | -1/+4 |
| * | | | Merge pull request #220 from NoahAndrews/improve-buildguide | Jack Humbert | 2016-03-28 | 1 | -5/+7 |
| |\ \ \ | |||||
| | * | | | Added clarifying steps to Windows section of build guide | Noah Andrews | 2016-03-28 | 1 | -5/+7 |
| | * | | | Merge remote-tracking branch 'jackhumbert/master' into improve-buildguide | Noah Andrews | 2016-03-28 | 144 | -40683/+40157 |
| | |\ \ \ | | |/ / / | |/| | / | | | |/ | | |/| | |||||
| * | | | Merge pull request #216 from msc654/master | Erez Zukerman | 2016-03-28 | 6 | -0/+1334 |
| |\ \ \ | |||||
| | * | | | Corrected duplicate image issue | Matthew Carroll | 2016-03-28 | 1 | -0/+0 |
| | * | | | Added msc keymap for ergodox_ez | Matthew Carroll | 2016-03-27 | 6 | -0/+1334 |
| * | | | | Merge pull request #214 from cdlm/action-hook | Jack Humbert | 2016-03-28 | 6 | -21/+45 |
| |\ \ \ \ | |||||
| | * | | | | Add action-preprocessing kb/user hooks in planck | Damien Pollet | 2016-03-28 | 2 | -15/+18 |
| | * | | | | Add action-preprocessing hook to keyboard template | Damien Pollet | 2016-03-28 | 2 | -6/+19 |
| | * | | | | Rename function to be keyboard-specific | Damien Pollet | 2016-03-28 | 2 | -4/+4 |
| | * | | | | Add per-event user hook function to QMK | Damien Pollet | 2016-03-28 | 2 | -0/+8 |
| * | | | | | Merge pull request #217 from IBNobody/master | Jack Humbert | 2016-03-28 | 7 | -132/+488 |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | |||||
| | * | | | | Magic Key Overrides / Keyboard Lock / Forced NKRO | IBNobody | 2016-03-28 | 7 | -132/+488 |
| | * | | | | Merge remote-tracking branch 'refs/remotes/jackhumbert/master' | IBNobody | 2016-03-27 | 18 | -1150/+2950 |
| | |\| | | | |||||
| | * | | | | Merge remote-tracking branch 'refs/remotes/jackhumbert/master' | IBNobody | 2016-03-25 | 7 | -5/+393 |
| | |\ \ \ \ | |||||
| * | \ \ \ \ | Merge pull request #218 from awpr/patch-1 | Jack Humbert | 2016-03-28 | 1 | -3/+3 |
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | |||||
| | * | | | | | Add avr-libc to the Debian build dependencies. | Andrew Pritchard | 2016-03-28 | 1 | -3/+3 |
| |/ / / / / | |||||
| * | | | | | Merge pull request #188 from DidierLoiseau/issue-156 | Erez Zukerman | 2016-03-27 | 4 | -2/+23 |
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | |||||
| | * | | | | Fix #156: clear weak mods on every key press | Didier Loiseau | 2016-03-08 | 4 | -2/+23 |
| * | | | | | Merge pull request #211 from nrrkeene/master | Erez Zukerman | 2016-03-27 | 10 | -1147/+1232 |
| |\ \ \ \ \ | |||||
| | * \ \ \ \ | Merge https://github.com/jackhumbert/qmk_firmware | Nicholas Keene | 2016-03-26 | 1 | -1/+5 |
| | |\ \ \ \ \ | |||||
| | * | | | | | | The Ordinary Layout is unremarkably mundane and remarkably useful | Nicholas Keene | 2016-03-26 | 10 | -1109/+1192 |
| | * | | | | | | The Ordinary Layout is familiar to users of common keyboards | Nicholas Keene | 2016-03-24 | 1 | -58/+60 |
| | | |_|_|/ / | | |/| | | | | |||||
| * | | | | | | Merge pull request #196 from naps62/naps62 | Erez Zukerman | 2016-03-27 | 3 | -0/+1690 |
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | |||||
| | * | | | | | Adds naps62's layout | Miguel Palhas | 2016-03-15 | 3 | -0/+1690 |
| * | | | | | | Merge pull request #207 from romanzolotarev/master | Erez Zukerman | 2016-03-25 | 1 | -1/+5 |
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | |||||
| | * | | | | | Add important note about brightness on OS X | Roman Zolotarev | 2016-03-22 | 1 | -1/+5 |
| * | | | | | | Merge pull request #210 from n0bs/master | Jack Humbert | 2016-03-23 | 2 | -16/+12 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Edited to work with jackhumbert/qmk_firmware pull #190 | Norberto Monarrez | 2016-03-23 | 2 | -16/+12 |
| |/ / / / / / | |||||
| * | | | | | | Merge pull request #209 from n0bs/master | Jack Humbert | 2016-03-23 | 6 | -0/+332 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Added files for Bantam-44 | Norberto Monarrez | 2016-03-23 | 6 | -0/+332 |
| * | | | | | | | Merge pull request #200 from alexives/add_diagram_to_planck_layout | Jack Humbert | 2016-03-23 | 1 | -5/+65 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | |||||
| | * | | | | | | Added layout diagrams to the default planck keymap | Alex Ives | 2016-03-16 | 1 | -5/+65 |
| * | | | | | | | Merge pull request #199 from IBNobody/master | Jack Humbert | 2016-03-22 | 11 | -6/+420 |
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | | |