| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | | * | | | | | | | | 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 | |
| | | | | | | | | | | | | | | | | ||||||
| | | | | | | | | | | | | | * | | Merge pull request #4 from jackhumbert/master | Alex Johnstone | 2016-03-27 | 17 | -1149/+2945 | |
| | | | | | | | | | | | | | |\ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | upstream | |||||
| | * | | | | | | | | | | | | | | 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 | |||||
| | | * | | | | | | | | | | | | | Fix #156: clear weak mods on every key press | Didier Loiseau | 2016-03-08 | 4 | -2/+23 | |
| | | | |_|_|_|_|_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - new macro_mods bit field for mods applied by macros - weak_mods now only used for ACT_{L,R}MODS (i.e. LSFT, RSFT, LCTL etc.) - clear the _weak_ mods on every key *pressed* such that LSFT etc. can no more interfere with the next key | |||||
| | * | | | | | | | | | | | | | Merge pull request #211 from nrrkeene/master | Erez Zukerman | 2016-03-27 | 10 | -1147/+1232 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Ordinary Layout is unremarkably mundane and remarkably useful | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ | 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 Ergodox EZ layout | |||||
| | | * | | | | | | | | | | | | Adds naps62's layout | Miguel Palhas | 2016-03-15 | 3 | -0/+1690 | |
| | | | | | | | | | | | | | | | ||||||
| | | | | | | | | | | | | * | | Fixed issues, added unicode layer ⌬ ¯\_⩾ツ⩽_/¯ | Alex Johnstone | 2016-03-27 | 2 | -1140/+1198 | |
| | | | | | | | | | | | | | | | ||||||
| | | | | | | | | | | | | * | | Merge pull request #3 from jackhumbert/master | Alex Johnstone | 2016-03-25 | 99 | -41470/+33848 | |
| | | | | | | | | | | | | |\ \ | | |_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | Pull upstream | |||||
| | * | | | | | | | | | | | | | Merge pull request #207 from romanzolotarev/master | Erez Zukerman | 2016-03-25 | 1 | -1/+5 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | Add important note about brightness on OS X | |||||
| | | * | | | | | | | | | | | | 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 Bantam44 to work with jackhumbert/qmk_firmware pull #190 | |||||
| | | * | | | | | | | | | | | | | Edited to work with jackhumbert/qmk_firmware pull #190 | Norberto Monarrez | 2016-03-23 | 2 | -16/+12 | |
| | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Basically changes "* matrix_scan_user(void)" to "matrix_scan_user(void)" | |||||
| | * | | | | | | | | | | | | | Merge pull request #209 from n0bs/master | Jack Humbert | 2016-03-23 | 6 | -0/+332 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added project folder for Bantam-44 | |||||
| | | * | | | | | | | | | | | | | 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 | |||||
| | | * | | | | | | | | | | | | | Added layout diagrams to the default planck keymap | Alex Ives | 2016-03-16 | 1 | -5/+65 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Alex Ives <alex@ives.mn> | |||||
| | * | | | | | | | | | | | | | | Merge pull request #199 from IBNobody/master | Jack Humbert | 2016-03-22 | 11 | -6/+420 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / / / | | |/| | | | | | | | | | | | | Added LED Indicator Support to QMK Template | |||||
| | | * | | | | | | | | | | | | | Fixed extra semicolons. | IBNobody | 2016-03-22 | 2 | -9/+6 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed extra semicolons. | |||||
| | | * | | | | | | | | | | | | | Fixed LED Function Calls | IBNobody | 2016-03-22 | 4 | -34/+22 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed LED indicator function calls to match how the matrix init function calls are formatted. | |||||
| | | * | | | | | | | | | | | | | Merge remote-tracking branch 'refs/remotes/jackhumbert/master' | IBNobody | 2016-03-22 | 88 | -41597/+34428 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # quantum/template/template.c # quantum/template/template.h | |||||
| | * | | | | | | | | | | | | | | Merge pull request #190 from yoyoerx/function_pointers | Erez Zukerman | 2016-03-22 | 82 | -41462/+33034 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | Addressing void* return warning & coding style | |||||
| | | * | | | | | | | | | | | | | Pull request 190 resolution with 'qmk/master' for merge | yoyoerx | 2016-03-21 | 15 | -2579/+4317 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | ||||||
 |
index : avr/qmk/firmware | |
| [no description] |
| aboutsummaryrefslogtreecommitdiffstats |