summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-06-01Prevent the recording of looping dynamic macros.Daniel Shields
If a macro play key is inadvertently recorded in a dynamic macro a loop is created and the macro will not terminate when played. This should be prevented.
2017-06-01Merge pull request #1350 from originerd/add-originerd-planck-keymapJack Humbert
Add originerd planck keymap
2017-06-01Merge pull request #1351 from Alfrheim/fixing_dvorak_layoutJack Humbert
replacing one R for a T
2017-06-01Merge pull request #1353 from 333fred/333fred-layoutJack Humbert
ergodox/333fred layout
2017-06-01Merge pull request #1354 from shieldsd/tweaksJack Humbert
Tweak reported power consumption to work with iOS
2017-06-01Tweak reported power consumption to work with iOSDaniel Shields
2017-05-31Update licensing on visualizer.cFredric Silberberg
2017-05-31Updated readmeFredric Silberberg
2017-05-31Added several new macrosFredric Silberberg
2017-05-31Fixed numpad 0 layoutFredric Silberberg
2017-05-31replacing one R for a TAlfrheim
2017-05-31Add originerd planck keymapJitae Kim
2017-05-30Use code blocks for keyboard layoutsFredric Silberberg
2017-05-30Completed iteration 1 of my layoutFredric Silberberg
2017-05-30Merge pull request #1348 from Dbroqua/masterJack Humbert
Added DK60 keyboard
2017-05-30Added initial keymap filesFredric Silberberg
2017-05-30Merge remote-tracking branch 'origin/feature/DK60'dbroqua
2017-05-30- Updated copyrightdbroqua
2017-05-30Merge remote-tracking branch 'origin/feature/DK60'Damien Broqua
2017-05-30- Updated readmeDamien Broqua
2017-05-30Merge remote-tracking branch 'origin/feature/DK60'Damien Broqua
2017-05-30- Added Capslock/Esc ledDamien Broqua
2017-05-30Merge pull request #1323 from nikchi/masterJack Humbert
Variable tapping terms
2017-05-30hmm?Nick Choi
2017-05-30Merge pull request #2 from qmk/masterNick Choi
pull in new qmk changes
2017-05-30Merge branch 'master' of https://github.com/qmk/qmk_firmwareJack Humbert
2017-05-30make qmk bot do the hard workJack Humbert
2017-05-30Merge pull request #1342 from priyadi/adafruit-mouse-buttonsJack Humbert
Adafruit Feather BLE / BLE Friend mouse buttons support
2017-05-30Merge branch 'master' of https://github.com/qmk/qmk_firmwareJack Humbert
2017-05-30exclude PRsJack Humbert
2017-05-30- Some changes on DK60Damien Broqua
2017-05-29switched to uint8 and 16Nick Choi
2017-05-29Merge pull request #1344 from qmk/jackhumbert-patch-1Jack Humbert
Re-enable mouse buttons from #1327
2017-05-29Re-enable mouse buttonsJack Humbert
2017-05-29no master needed on push maybeJack Humbert
2017-05-29Merge branch 'master' of https://github.com/qmk/qmk_firmwareJack Humbert
2017-05-29push to git urlJack Humbert
2017-05-29Jokrik's Clueboard layout (#1340)Priyadi Iman Nurcahyo
2017-05-29Merge pull request #1343 from Maartenwut/patch-1Jack Humbert
Added SEND_STRING(); to the documentation.
2017-05-29Merge pull request #1337 from fredizzimo/wsl_setupJack Humbert
Add script for setting up Windows Subsystem for Linux
2017-05-29Added SEND_STRING(); to the documentation.Maarten Dekkers
2017-05-29Merge branch 'master' of https://github.com/qmk/qmk_firmwareJack Humbert
2017-05-29get rid of folders in tarJack Humbert
2017-05-29Merge pull request #1341 from Dbroqua/patch-3Jack Humbert
Update Differences-from-TMK.md
2017-05-29Merge branch 'master' of https://github.com/qmk/qmk_firmwareJack Humbert
2017-05-29more than one en-file, and actually ignore docsJack Humbert
2017-05-29Update Differences-from-TMK.mdDamien
Removed fn_actions. According this [comment](https://github.com/qmk/qmk_firmware/pull/1336#issuecomment-304634633)
2017-05-29Adafruit Feather BLE / BLE Friend mouse buttons supportPriyadi Iman Nurcahyo
2017-05-28Merge pull request #1338 from qmk/hf/prevent_stuck_modsErez Zukerman
Adds prevent stuck modifiers to EZ default
2017-05-28Adds prevent stuck modifiers to EZ defaultErez Zukerman