summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2017-05-29more than one en-file, and actually ignore docsJack Humbert6-5/+5
2017-05-28ignore docs, fix tag/hex pushingJack Humbert3-3/+11
2017-05-28Merge pull request #1336 from Dbroqua/patch-2Jack Humbert1-1/+1
Update Differences-from-TMK.md
2017-05-28Update Differences-from-TMK.mdDamien1-1/+1
Hello, I'm not sure but it seems to be uint8_t for TMK/fn_actions (cf. https://github.com/tmk/tmk_keyboard/blob/master/README.md ). Regards, Damien
2017-05-28Merge pull request #1334 from fredizzimo/fix_faq_lineendingJack Humbert1-237/+237
Fix line endings in FAQ.md
2017-05-28Fix line endings in FAQ.mdFred Sundvik1-237/+237
2017-05-28Updates book.jsonJack Humbert1-1/+1
Auto commit by GitBook Editor
2017-05-28Updates book.jsonJack Humbert1-1/+1
Auto commit by GitBook Editor
2017-05-28Updates book.jsonJack Humbert1-1/+1
Auto commit by GitBook Editor
2017-05-28move book for gitbookJack Humbert1-0/+0
2017-05-28Updates docs/book.jsonJack Humbert1-0/+1
Auto commit by GitBook Editor
2017-05-28move old doc to docsJack Humbert16-0/+0
2017-05-28subtree docsJack Humbert47-0/+4807
2017-05-27Merge pull request #5 from Maartenwut/patch-1Jack Humbert1-2/+2
Mention that TT needs 5 taps by default.
2017-05-27Updates book.jsonJack Humbert1-1/+1
Auto commit by GitBook Editor
2017-05-27Mention that TT needs 5 taps by default.Maarten Dekkers1-2/+2
Also gave an example of defining the amount of taps needed.
2017-05-27Merge pull request #1319 from Johannes-Larsson/masterJack Humbert4-0/+130
Add planck/johannes layout
2017-05-27Merge pull request #1327 from Dbroqua/masterJack Humbert10-18/+183
Added Integration of IBM Trackpoint
2017-05-27Merge pull request #1328 from yiancar/qmk_usb_startup_disableJack Humbert2-7/+15
Use variable to disable usb check at startup
2017-05-27Merge pull request #4 from Dbroqua/masterJack Humbert1-2/+0
Update Modding-your-keyboard.md
2017-05-26Use variable to disable usb check at startupyiancar2-7/+15
Adds a define variable which when defined disables the usb startup check. Modified the makefile to separate above define from bluetooth dependancy
2017-05-26Merge pull request #1 from Dbroqua/patch-1Damien1-2/+0
Update Modding-your-keyboard.md
2017-05-26- Added schematic for Trackpoint demonstrationdbroqua2-0/+3
2017-05-26- Added integration of IBM Trackpointdbroqua9-18/+180
2017-05-26Update Modding-your-keyboard.mdDamien1-2/+0
Updated `USART version` chapter. I think there were 2 `#endif` too .
2017-05-26Merge pull request #22 from qmk/masterDamien199-511/+3567
Merge from QMK
2017-05-25Merge pull request #3 from fieldju/patch-1Jack Humbert1-1/+1
Fix typo in Macro.md in dynamic macro section.
2017-05-25Fix typo in Macro.md in dynamic macro section.Justin Field1-1/+1
2017-05-24readme, media keys fixJohannes Larsson3-25/+21
2017-05-24revert changes to config.hJohannes Larsson1-2/+2
2017-05-24Merge pull request #1316 from nikchi/masterJack Humbert10-3/+552
FrostyFlake Keymap
2017-05-24media keys and stuffJohannes Larsson2-58/+15
2017-05-24moved unicodemap rules to localer makeNick Choi1-1/+0
2017-05-24Merge branch 'master' of https://github.com/qmk/qmk_firmwareJohannes Larsson1-2/+2
2017-05-24Merge pull request #1317 from qmk/hf/faster_mouseErez Zukerman1-2/+2
tweaks default mouse speed constants
2017-05-24tweaks default mouse speed constantsErez Zukerman1-2/+2
2017-05-24more emoji function commentsNick Choi2-13/+38
2017-05-24Tap dancing emoji support 😩😩Nick Choi1-11/+64
2017-05-24then some code blocksErez Zukerman1-3/+3
2017-05-24pipes without backticsErez Zukerman1-2/+2
2017-05-24grrrErez Zukerman1-3/+3
2017-05-24surrounds stuff with backticksErez Zukerman1-18/+18
2017-05-24quick table tweakErez Zukerman1-3/+3
2017-05-24removed sNick Choi1-2/+1
2017-05-23Merge branch 'master' of https://github.com/nikchi/qmk_firmwareNick Choi18-64/+436
2017-05-23preonic mapNick Choi5-2/+255
2017-05-23Merge pull request #1 from qmk/masterNick Choi18-64/+436
pull new to mine
2017-05-22mergeJohannes Larsson3-0/+177
2017-05-22matrix layoutJohannes Larsson1-2/+2
2017-05-21Merge pull request #2 from Vifon/masterJack Humbert1-13/+19
Update the dynamic macro docs according to the recent changes