aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2016-04-01Merge remote-tracking branch 'refs/remotes/jackhumbert/master'Gravatar IBNobody
2016-04-01Added Error Checking to Setup.bat #2Gravatar IBNobody
Added check for the MinGW directory. Fixed a bug with script exiting out of a CMD window. Fixed a bug with script dropping user into MinGW directory. Fixed a bug with RD not deleting temp. Fixed a bug with PNPUtil.exe not being present in the path.
2016-03-31Merge pull request #230 from IBNobody/masterGravatar Jack Humbert
Fixed Setup Script
2016-03-30Drastically rewrote the path script to handle Explorer's stubborn grasp of ↵Gravatar IBNobody
EnvVars. Tested on Win7.
2016-03-30Merge pull request #229 from NoahAndrews/patch-5Gravatar Jack Humbert
The readme was also wrong about the conflict between audio and RGB
2016-03-30Update README.mdGravatar Noah Andrews
2016-03-30Merge pull request #227 from NoahAndrews/patch-4Gravatar Jack Humbert
Fixed minor issues with Preonic readme
2016-03-30Merge pull request #228 from mrfoto/fix-planck-diagramGravatar Jack Humbert
Tiny fix of Planck diagrams
2016-03-30Tiny fix of Planck diagramsGravatar Miha Rekar
2016-03-30Fixed minor issues with Preonic readmeGravatar Noah Andrews
2016-03-30preonic readmeGravatar Jack Humbert
2016-03-30Merge branch 'master' of https://github.com/jackhumbert/tmk_keyboardGravatar Jack Humbert
2016-03-30.hex filesGravatar Jack Humbert
2016-03-30preonic updateGravatar Jack Humbert
2016-03-29Merge pull request #224 from NoahAndrews/make-keymap-names-consistentGravatar Jack Humbert
Make keymap names more consistent
2016-03-29Updated several keyboard folders to use new keymap naming schemeGravatar Noah Andrews
2016-03-29Merge remote-tracking branch 'jackhumbert/master' into ↵Gravatar Noah Andrews
make-keymap-names-consistent
2016-03-29Merge pull request #223 from NoahAndrews/patch-3Gravatar Jack Humbert
Fix #198
2016-03-29Fix #198Gravatar Noah Andrews
2016-03-29Merge pull request #222 from NoahAndrews/patch-2Gravatar Jack Humbert
Fix error in Planck makefile comment
2016-03-29Fix error in Planck makefile commentGravatar Noah Andrews
[This comment](https://www.reddit.com/r/olkb/comments/428umx/rgb_underglow/czaivbc) states that because both audio output and RGB support require the user of timer 3, they can't be enabled at the same time. That makes sense, I can see where audio.c uses timer 3. But this comment in the code states that the incompatibility is with MIDI support, which doesn't make sense based on what I see in the code. Please enlighten me if I'm mistaken.
2016-03-28Merge pull request #219 from IBNobody/masterGravatar Jack Humbert
Master
2016-03-28Merge pull request #220 from NoahAndrews/improve-buildguideGravatar Jack Humbert
Added clarifying steps to Windows section of build guide
2016-03-28Added clarifying steps to Windows section of build guideGravatar Noah Andrews
2016-03-28Minor Tweaks and DocumentationGravatar IBNobody
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
2016-03-28Merge remote-tracking branch 'jackhumbert/master' into improve-buildguideGravatar Noah Andrews
2016-03-28Added command to turn LED indicators off while sleepingGravatar IBNobody
2016-03-28Merge pull request #216 from msc654/masterGravatar Erez Zukerman
Added msc keymap for ergodox_ez
2016-03-28Merge pull request #214 from cdlm/action-hookGravatar Jack Humbert
Add per-event user hook function
2016-03-28Merge pull request #217 from IBNobody/masterGravatar Jack Humbert
Master
2016-03-28Merge pull request #218 from awpr/patch-1Gravatar Jack Humbert
Add avr-libc to the Debian build dependencies.
2016-03-28Add avr-libc to the Debian build dependencies.Gravatar Andrew Pritchard
Without avr-libc the build fails trying to #include_next a header from the standard library, which of course doesn't exist.
2016-03-28Add action-preprocessing kb/user hooks in planckGravatar Damien Pollet
2016-03-28Add action-preprocessing hook to keyboard templateGravatar Damien Pollet
2016-03-28Rename function to be keyboard-specificGravatar Damien Pollet
2016-03-28Add per-event user hook function to QMKGravatar Damien Pollet
2016-03-28Corrected duplicate image issueGravatar Matthew Carroll
2016-03-28Magic Key Overrides / Keyboard Lock / Forced NKROGravatar IBNobody
Added Magic Key Overrides / Magic Key Cleanup / Added Keyboard Lock option to template / Added forced NKRO option to template (disabled by default)
2016-03-27Added msc keymap for ergodox_ezGravatar Matthew Carroll
2016-03-27Merge remote-tracking branch 'refs/remotes/jackhumbert/master'Gravatar IBNobody
2016-03-27Merge pull request #188 from DidierLoiseau/issue-156Gravatar Erez Zukerman
Fix #156: clear weak mods on every key press
2016-03-27Merge pull request #211 from nrrkeene/masterGravatar Erez Zukerman
The Ordinary Layout is unremarkably mundane and remarkably useful
2016-03-27Merge pull request #196 from naps62/naps62Gravatar Erez Zukerman
Adds naps62's Ergodox EZ layout
2016-03-26Merge https://github.com/jackhumbert/qmk_firmwareGravatar Nicholas Keene
2016-03-26The Ordinary Layout is unremarkably mundane and remarkably usefulGravatar Nicholas Keene
2016-03-25Merge pull request #207 from romanzolotarev/masterGravatar Erez Zukerman
Add important note about brightness on OS X
2016-03-25Merge remote-tracking branch 'refs/remotes/jackhumbert/master'Gravatar IBNobody
2016-03-24The Ordinary Layout is familiar to users of common keyboardsGravatar Nicholas Keene
2016-03-23Merge pull request #210 from n0bs/masterGravatar Jack Humbert
Edited Bantam44 to work with jackhumbert/qmk_firmware pull #190
2016-03-23Edited to work with jackhumbert/qmk_firmware pull #190Gravatar Norberto Monarrez
Basically changes "* matrix_scan_user(void)" to "matrix_scan_user(void)"