summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2017-05-28Merge pull request #1338 from qmk/hf/prevent_stuck_modsErez Zukerman
2017-05-28Adds prevent stuck modifiers to EZ defaultErez Zukerman
2017-05-28ignore docs, fix tag/hex pushingJack Humbert
2017-05-28Merge pull request #1336 from Dbroqua/patch-2Jack Humbert
2017-05-28Update Differences-from-TMK.mdDamien
2017-05-28Merge pull request #1334 from fredizzimo/fix_faq_lineendingJack Humbert
2017-05-28Fix line endings in FAQ.mdFred Sundvik
2017-05-27Updates book.jsonJack Humbert
2017-05-27Updates book.jsonJack Humbert
2017-05-27Updates book.jsonJack Humbert
2017-05-27move book for gitbookJack Humbert
2017-05-27Updates docs/book.jsonJack Humbert
2017-05-27move old doc to docsJack Humbert
2017-05-27subtree docsJack Humbert
2017-05-27Merge pull request #5 from Maartenwut/patch-1Jack Humbert
2017-05-27Updates book.jsonJack Humbert
2017-05-27Mention that TT needs 5 taps by default.Maarten Dekkers
2017-05-26Merge pull request #1319 from Johannes-Larsson/masterJack Humbert
2017-05-26Merge pull request #1327 from Dbroqua/masterJack Humbert
2017-05-26Merge pull request #1328 from yiancar/qmk_usb_startup_disableJack Humbert
2017-05-26Merge pull request #4 from Dbroqua/masterJack Humbert
2017-05-26Use variable to disable usb check at startupyiancar
2017-05-26Merge pull request #1 from Dbroqua/patch-1Damien
2017-05-26- Added schematic for Trackpoint demonstrationdbroqua
2017-05-26- Added integration of IBM Trackpointdbroqua
2017-05-26Update Modding-your-keyboard.mdDamien
2017-05-26Merge pull request #22 from qmk/masterDamien
2017-05-24Merge pull request #3 from fieldju/patch-1Jack Humbert
2017-05-24Fix typo in Macro.md in dynamic macro section.Justin Field
2017-05-24readme, media keys fixJohannes Larsson
2017-05-24revert changes to config.hJohannes Larsson
2017-05-24Merge pull request #1316 from nikchi/masterJack Humbert
2017-05-24media keys and stuffJohannes Larsson
2017-05-24moved unicodemap rules to localer makeNick Choi
2017-05-24Merge branch 'master' of https://github.com/qmk/qmk_firmwareJohannes Larsson
2017-05-24Merge pull request #1317 from qmk/hf/faster_mouseErez Zukerman
2017-05-24tweaks default mouse speed constantsErez Zukerman
2017-05-24more emoji function commentsNick Choi
2017-05-23Tap dancing emoji support 😩😩Nick Choi
2017-05-23then some code blocksErez Zukerman
2017-05-23pipes without backticsErez Zukerman
2017-05-23grrrErez Zukerman
2017-05-23surrounds stuff with backticksErez Zukerman
2017-05-23quick table tweakErez Zukerman
2017-05-23removed sNick Choi
2017-05-23Merge branch 'master' of https://github.com/nikchi/qmk_firmwareNick Choi
2017-05-23preonic mapNick Choi
2017-05-23Merge pull request #1 from qmk/masterNick Choi
2017-05-22mergeJohannes Larsson
2017-05-22matrix layoutJohannes Larsson