summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | | * | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-03-295-18/+55
| | | |\ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | Merge pull request #219 from IBNobody/masterJack Humbert2016-03-284-13/+48
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Master
| | * | | | | | Minor Tweaks and DocumentationIBNobody2016-03-283-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 sleepingIBNobody2016-03-281-1/+4
| | | | | | | |
| * | | | | | | Merge pull request #220 from NoahAndrews/improve-buildguideJack Humbert2016-03-281-5/+7
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | Added clarifying steps to Windows section of build guide
| | * | | | | | Added clarifying steps to Windows section of build guideNoah Andrews2016-03-281-5/+7
| | | | | | | |
| | * | | | | | Merge remote-tracking branch 'jackhumbert/master' into improve-buildguideNoah Andrews2016-03-28144-40683/+40157
| | |\ \ \ \ \ \ | | |/ / / / / / | |/| | / / / / | | | |/ / / / | | |/| | | |
| | | | * | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-03-2837-1306/+4820
| | | | |\ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | Merge pull request #216 from msc654/masterErez Zukerman2016-03-286-0/+1334
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Added msc keymap for ergodox_ez
| | * | | | | | Corrected duplicate image issueMatthew Carroll2016-03-281-0/+0
| | | | | | | |
| | * | | | | | Added msc keymap for ergodox_ezMatthew Carroll2016-03-276-0/+1334
| | | | | | | |
| * | | | | | | Merge pull request #214 from cdlm/action-hookJack Humbert2016-03-286-21/+45
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Add per-event user hook function
| | * | | | | | | Add action-preprocessing kb/user hooks in planckDamien Pollet2016-03-282-15/+18
| | | | | | | | |
| | * | | | | | | Add action-preprocessing hook to keyboard templateDamien Pollet2016-03-282-6/+19
| | | | | | | | |
| | * | | | | | | Rename function to be keyboard-specificDamien Pollet2016-03-282-4/+4
| | | | | | | | |
| | * | | | | | | Add per-event user hook function to QMKDamien Pollet2016-03-282-0/+8
| | | | | | | | |
| * | | | | | | | Merge pull request #217 from IBNobody/masterJack Humbert2016-03-287-132/+488
| |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | | Master
| | * | | | | | | Magic Key Overrides / Keyboard Lock / Forced NKROIBNobody2016-03-287-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'IBNobody2016-03-2718-1150/+2950
| | |\| | | | | |
| | * | | | | | | Merge remote-tracking branch 'refs/remotes/jackhumbert/master'IBNobody2016-03-257-5/+393
| | |\ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ Merge pull request #218 from awpr/patch-1Jack Humbert2016-03-281-3/+3
| |\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | | Add avr-libc to the Debian build dependencies.
| | * | | | | | | | Add avr-libc to the Debian build dependencies.Andrew Pritchard2016-03-281-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 changesStephan Bösebeck2016-03-242-1113/+1111
| | | | | | | | |
| | | | | | * | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-03-2498-41441/+33775
| | | | | | |\ \ \ | | | | |_|_|/ / / | | | |/| | | | |
| | | | | | * | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-03-224-0/+1309
| | | | | | |\ \ \
| | | | | | * | | | fix number pad, add ,Stephan Bösebeck2016-03-201-1/+1
| | | | | | | | | |
| | | | | | * | | | changing cursor keys, back to "default" cursor key layout, adding ISO-cursor ↵Stephan Bösebeck2016-03-201-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 thingsStephan Bösebeck2016-03-201-12/+12
| | | | | | | | | |
| | | | | | * | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-03-2011-2963/+3391
| | | | | | |\ \ \ \
| | | | | | * \ \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-03-0817-9/+1877
| | | | | | |\ \ \ \ \
| | | | | | * \ \ \ \ \ Merge branch 'master' of https://github.com/sboesebeck/qmk_firmwareStephan Bösebeck2016-03-032-1483/+1481
| | | | | | |\ \ \ \ \ \
| | | | | | | * | | | | | forgot F6Stephan Bösebeck2016-03-022-2/+2
| | | | | | | | | | | | |
| | | | | | | * | | | | | updated version, changed F-Key-Layout, minor change in code layerStephan Bösebeck2016-03-022-1481/+1479
| | | | | | | | | | | | |
| | | | | | | * | | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-03-0214-1527/+1761
| | | | | | | |\ \ \ \ \ \
| | | | | | * | \ \ \ \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-03-031-1/+1
| | | | | | |\ \ \ \ \ \ \ \ | | | | | | | | |/ / / / / / | | | | | | | |/| | | | | |
| | | | | | * | | | | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-02-2413-1526/+1760
| | | | | | |\ \ \ \ \ \ \ \ | | | | | | | |_|/ / / / / / | | | | | | |/| | | | | | |
| | | | | | * | | | | | | | testing moving the 6 to the left, having one key more on the right used for ↵Stephan Bösebeck2016-02-152-1519/+1561
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | hash now feels a bit more natural to me. Need to investigate further.
| | | | | | | | | | | | | * Updated hexAlex Johnstone2016-03-281-1139/+1138
| | | | | | | | | | | | | |
| | | | | | | | | | | | | * ££££Alex Johnstone2016-03-281-1/+1
| | | | | | | | | | | | | |
| | | | | | | | | | | | | * Forgot to change ent/spcAlex Johnstone2016-03-281-693/+697
| | | | | | | | | | | | | |
| | | | | | | | | | | | | * Didn'tAlex Johnstone2016-03-281-2/+2
| | | | | | | | | | | | | |
| | | | | | | | | | | | | * Fixed issues, added unicode layer ⌬ ¯\_⩾ツ⩽_/¯Alex Johnstone2016-03-271-6/+45
| | | | | | | | | | | | | |
| | | |