Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | | * | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | Stephan Bösebeck | 2016-03-29 | 5 | -18/+55 | |
| | | |\ \ \ \ | | |_|/ / / / | |/| | | | | | ||||||
| * | | | | | | Merge pull request #219 from IBNobody/master | Jack Humbert | 2016-03-28 | 4 | -13/+48 | |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Master | |||||
| | * | | | | | | Minor Tweaks and Documentation | IBNobody | 2016-03-28 | 3 | -12/+44 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed compiler warning by including bootloader.h in keymap_common.c. Changed FORCE_NKRO to only be applied if NKRO_ENABLE is defined. Added extra documentation to the template config.h | |||||
| | * | | | | | | 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 | |||||
| | * | | | | | | 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 branch 'master' of https://github.com/jackhumbert/qmk_firmware | Stephan Bösebeck | 2016-03-28 | 37 | -1306/+4820 | |
| | | | |\ \ \ | | |_|_|/ / / | |/| | | | | | ||||||
| * | | | | | | Merge pull request #216 from msc654/master | Erez Zukerman | 2016-03-28 | 6 | -0/+1334 | |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Added msc keymap for ergodox_ez | |||||
| | * | | | | | | 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 per-event user hook function | |||||
| | * | | | | | | | 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 | |
| |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | | | Master | |||||
| | * | | | | | | | Magic Key Overrides / Keyboard Lock / Forced NKRO | IBNobody | 2016-03-28 | 7 | -132/+488 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added Magic Key Overrides / Magic Key Cleanup / Added Keyboard Lock option to template / Added forced NKRO option to template (disabled by default) | |||||
| | * | | | | | | | 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. | |||||
| | * | | | | | | | | Add avr-libc to the Debian build dependencies. | Andrew Pritchard | 2016-03-28 | 1 | -3/+3 | |
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | Without avr-libc the build fails trying to #include_next a header from the standard library, which of course doesn't exist. | |||||
| | | | | | * | | | minor changes | Stephan Bösebeck | 2016-03-24 | 2 | -1113/+1111 | |
| | | | | | | | | | ||||||
| | | | | | * | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | Stephan Bösebeck | 2016-03-24 | 98 | -41441/+33775 | |
| | | | | | |\ \ \ | | | | |_|_|/ / / | | | |/| | | | | | ||||||
| | | | | | * | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | Stephan Bösebeck | 2016-03-22 | 4 | -0/+1309 | |
| | | | | | |\ \ \ | ||||||
| | | | | | * | | | | fix number pad, add , | Stephan Bösebeck | 2016-03-20 | 1 | -1/+1 | |
| | | | | | | | | | | ||||||
| | | | | | * | | | | changing cursor keys, back to "default" cursor key layout, adding ISO-cursor ↵ | Stephan Bösebeck | 2016-03-20 | 1 | -4/+4 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | keys to Symb layer. Changed numbers back to symmetric layout again, keeping F-keys in symb though | |||||
| | | | | | * | | | | tweaking it a bit further, fixing things | Stephan Bösebeck | 2016-03-20 | 1 | -12/+12 | |
| | | | | | | | | | | ||||||
| | | | | | * | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | Stephan Bösebeck | 2016-03-20 | 11 | -2963/+3391 | |
| | | | | | |\ \ \ \ | ||||||
| | | | | | * \ \ \ \ | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | Stephan Bösebeck | 2016-03-08 | 17 | -9/+1877 | |
| | | | | | |\ \ \ \ \ | ||||||
| | | | | | * \ \ \ \ \ | Merge branch 'master' of https://github.com/sboesebeck/qmk_firmware | Stephan Bösebeck | 2016-03-03 | 2 | -1483/+1481 | |
| | | | | | |\ \ \ \ \ \ | ||||||
| | | | | | | * | | | | | | forgot F6 | Stephan Bösebeck | 2016-03-02 | 2 | -2/+2 | |
| | | | | | | | | | | | | | ||||||
| | | | | | | * | | | | | | updated version, changed F-Key-Layout, minor change in code layer | Stephan Bösebeck | 2016-03-02 | 2 | -1481/+1479 | |
| | | | | | | | | | | | | | ||||||
| | | | | | | * | | | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | Stephan Bösebeck | 2016-03-02 | 14 | -1527/+1761 | |
| | | | | | | |\ \ \ \ \ \ | ||||||
| | | | | | * | \ \ \ \ \ \ | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | Stephan Bösebeck | 2016-03-03 | 1 | -1/+1 | |
| | | | | | |\ \ \ \ \ \ \ \ | | | | | | | | |/ / / / / / | | | | | | | |/| | | | | | | ||||||
| | | | | | * | | | | | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | Stephan Bösebeck | 2016-02-24 | 13 | -1526/+1760 | |
| | | | | | |\ \ \ \ \ \ \ \ | | | | | | | |_|/ / / / / / | | | | | | |/| | | | | | | | ||||||
| | | | | | * | | | | | | | | testing moving the 6 to the left, having one key more on the right used for ↵ | Stephan Bösebeck | 2016-02-15 | 2 | -1519/+1561 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | hash now feels a bit more natural to me. Need to investigate further. | |||||
| | | | | | | | | | | | | * | Updated hex | Alex Johnstone | 2016-03-28 | 1 | -1139/+1138 | |
| | | | | | | | | | | | | | | ||||||
| | | | | | | | | | | | | * | ££££ | Alex Johnstone | 2016-03-28 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | ||||||
| | | | | | | | | | | | | * | Forgot to change ent/spc | Alex Johnstone | 2016-03-28 | 1 | -693/+697 | |
| | | | | | | | | | | | | | | ||||||
| | | | | | | | | | | | | * | Didn't | Alex Johnstone | 2016-03-28 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | ||||||
| | | | | | | | | | | | | * | Fixed issues, added unicode layer ⌬ ¯\_⩾ツ⩽_/¯ | Alex Johnstone | 2016-03-27 | 1 | -6/+45 | |
| | | | | | | | | | | | | | | ||||||
| | | | |