aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2016-07-15Added default layer switch QWERTY to ColemakGravatar Joshua T
2016-07-15Fixed a merge conflictGravatar Joshua T
2016-07-16add an `anyway` and a `reset` callbackGravatar Pavlos Vinieratos
when using tap dance, we have the `regular` callback that is called on the last tap. this commit adds an `anyway` callback that is called on every tap, and a `reset` callback that is called on reset of the tap dance taps.
2016-07-16in case its NULLGravatar Pavlos Vinieratos
2016-07-15Further simplyfying the docker usageGravatar Erik Dasque
We'll be able to change the image user name if we set up the initial repo to trigger Docker images rebuilds on hub.docker.com
2016-07-15Adding Docker build system & documentationGravatar Erik Dasque
2016-07-15Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareGravatar Christopher Browne
2016-07-15Fix OS X Recognizing keyboard as Mouse/TabletGravatar Travis La Marr
Modified the LUFA USB HID Descriptor to change the logical/usage minimums for System Control from 0x01 (Mouse) to 0x81 (System Power Down), this fixes OS X recognizing the Planck as having a mouse and tablet, even with mousekeys off.
2016-07-15Make DFU wait for bootloaderGravatar Travis La Marr
Added a loop for waiting for the keyboard to be put in bootloader mode, rather than failing out. Makes building keymaps easier.
2016-07-15Merge remote-tracking branch 'upstream/master'Gravatar Joshua T
2016-07-14keymap_dvorak.h: add missing shifted keys, fix whitespaceGravatar Jonathan A. Kollasch
2016-07-14extra_keymaps: use RALT() instead of 0x1400 for AltGrGravatar Jonathan A. Kollasch
2016-07-14keymap_extras: add newline at end of filesGravatar Jonathan A. Kollasch
2016-07-14Merge pull request #489 from Skrymir/masterGravatar Jack Humbert
New ergodox-ez layout
2016-07-14Merge pull request #515 from pvinis/reset-functionGravatar Jack Humbert
extract reset keyboard into a function
2016-07-14Replaced ordinary-media.{png|json} with new media layoutGravatar Will Wolff-Myren
2016-07-14Replaced ordinary-symbol.{png|json} with new base layout.Gravatar Will Wolff-Myren
2016-07-14Replaced ordinary-base.{png|json} with new base layout.Gravatar Will Wolff-Myren
2016-07-14Replaced readme.md with stubGravatar Will Wolff-Myren
(incl. reference to original layout)
2016-07-13Corrected merge conflictGravatar Joshua T
2016-07-13Created replicaJunction keymaps.Gravatar Joshua T
2016-07-13Created "teckinesis" keymap folderGravatar Will Wolff-Myren
(Based on "ordinary" keymap by Nicholas Keene)
2016-07-13extract reset keyboard into a functionGravatar Pavlos Vinieratos
that makes it easy to call reset_keyboard() from a function in a keymap
2016-07-12Added open resource macroGravatar Josh Colbeck
tap to type, hold for resource
2016-07-12Merge pull request #2 from jackhumbert/masterGravatar Joshua Colbeck
Pull from upstream
2016-07-12Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareGravatar Christopher Browne
2016-07-12I did not like Space Cadet paren; it jumps in in way too many extra casesGravatar Christopher Browne
2016-07-11Created replicaJunction keymaps.Gravatar Joshua T
2016-07-11Merge pull request #477 from Smilliam/masterGravatar Jack Humbert
Canceling Space Cadet state with opposite shift key
2016-07-11Merge pull request #506 from stanleylai/masterGravatar Jack Humbert
Added my custom keymap for Satan
2016-07-11Merge pull request #507 from ruiqimao/masterGravatar skullydazed
fixed clueboard LED pin assignments and matrix documentation
2016-07-11fixed clueboard LED pin assignments and matrix documentationGravatar Ruiqi Mao
2016-07-10amended extraneous file editsGravatar Smilliam
2016-07-10Made rollover behavior for space cadet optionalGravatar Smilliam
2016-07-10Added my custom keymap for SatanGravatar Stanley Lai
2016-07-10Merge pull request #505 from fredizzimo/documentation_fixGravatar Jack Humbert
Remove out of place documentation, caused by ChibiOS merge
2016-07-10Remove out of place documentation, caused by ChibiOS mergeGravatar Fred Sundvik
2016-07-09Merge pull request #502 from robotmaxtron/masterGravatar Jack Humbert
Adding robotmaxtron's GH60 Keymap
2016-07-09Update keymap.cGravatar Max Whittingham
2016-07-09Merge pull request #500 from TerryMathews/masterGravatar Jack Humbert
Establish Poker clone keymap for Satan
2016-07-09Merge pull request #1 from jackhumbert/masterGravatar TerryMathews
Catch up with jack's master
2016-07-09Establish Poker clone keymap for SatanGravatar TerryMathews
Maps all of the side-print legends on the stock Poker II keycaps that are feasible (doesn't support repeat rate toggling, Pmode recording).
2016-07-09Cleaning up repoGravatar Max Whittingham
2016-07-08Documents tap danceGravatar Erez Zukerman
2016-07-08Merge pull request #498 from fredizzimo/fix_make_dependenciesGravatar Jack Humbert
Fix make dependencies
2016-07-08Use order only prerequisites to avoid re-linkingGravatar Fred Sundvik
The prerequisites at the start of the build process are order-only so that the trget don't link again. Also added as a dependency to the compilation to force the messages to be printed at the start
2016-07-08Fix name of makefile dep filesGravatar Fred Sundvik
The files can't start with a .dot, as the wildcard function wont find them. So this is fixed by removing the BUILD_DIR from the name.
2016-07-08Merge pull request #496 from fredizzimo/makefile_optimizationGravatar Jack Humbert
Makefile optimization
2016-07-08Fix the link targetGravatar Fred Sundvik
2016-07-08Don't run git describe for ever file that is builtGravatar Fred Sundvik