summaryrefslogtreecommitdiffstats
path: root/quantum
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1057 from priyadi/selectable_outputJack Humbert2017-02-073-1/+43
|\
| * Restrict outputselect to LUFA only for nowPriyadi Iman Nurcahyo2017-02-011-2/+2
| * Limit outputselect to AVR only for nowPriyadi Iman Nurcahyo2017-02-012-1/+4
| * Add layer switcher keycodes: OUT_AUTO, OUT_USB, OUT_BT, OUT_BLEPriyadi Iman Nurcahyo2017-02-012-0/+39
* | Merge pull request #1059 from qmk/hf/algr_tJack Humbert2017-02-061-0/+1
|\ \
| * | Introduces ALGR_T for dual-function AltGrErez Zukerman2017-01-311-0/+1
| |/
* | Merge pull request #960 from ofples/feature/combosJack Humbert2017-02-064-0/+189
|\ \
| * | Moved combo processing lower down in process logicOfer Plesser2016-12-161-3/+3
| * | Merge branch 'master' into feature/combosOfer Plesser2016-12-163-4/+26
| |\ \
| * | | Refactored as well as added support for action keys in combosOfer Plesser2016-12-162-68/+89
| * | | Added support for timing out combos if a key as been pressed for longer than ...Ofer Plesser2016-12-103-31/+101
| * | | Implemented basic key combination featureOfer Plesser2016-12-104-0/+98
* | | | Merge pull request #981 from jonasoberschweiber/osx-surrogate-pairsJack Humbert2017-02-061-1/+10
|\ \ \ \
| * | | | Add support for supplementary planes for OS XJonas Oberschweiber2016-12-311-1/+10
* | | | | Merge pull request #1030 from SjB/refactor_register_code16Jack Humbert2017-02-061-2/+30
|\ \ \ \ \
| * | | | | registering a weak_mods when using register_code16SjB2017-01-291-4/+24
| * | | | | speeding up (un)register_code16SjB2017-01-231-2/+10
* | | | | | race condition between oneshot_mods and tap_danceSjB2017-01-292-1/+7
| |_|_|_|/ |/| | | |
* | | | | Clarify license on abnt2 keymap (#1038)Potiguar Faga2017-01-271-0/+16
* | | | | Merge pull request #1014 from SjB/lcd_mods_statusJack Humbert2017-01-242-2/+65
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | added mods status bit to visualizer.SjB2017-01-172-2/+65
* | | | | turn off rgb_midi in ezJack Humbert2017-01-231-0/+1
|/ / / /
* | | | Update quantum_keycodes.hJack Humbert2017-01-131-2/+2
* | | | A shot at aliasingErez Zukerman2017-01-121-0/+2
* | | | Adds SCMD and SCMD_TErez Zukerman2017-01-111-0/+2
* | | | Unregister all mods before inputting Unicode, and reregister afterwardsPriyadi Iman Nurcahyo2017-01-091-8/+33
|/ / /
* | | Merge pull request #973 from Wilba6582/keycode_refactorJack Humbert2016-12-303-313/+330
|\ \ \
| * | | Keycode refactorWilba65822016-12-293-313/+330
* | | | Merge pull request #974 from fredizzimo/remove_malloc_from_sysexJack Humbert2016-12-302-16/+46
|\ \ \ \
| * | | | API Sysex fixesFred Sundvik2016-12-292-16/+46
* | | | | Merge pull request #972 from mechkeys/rgb_compatJack Humbert2016-12-292-0/+3
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Removed errant +Scott Wilson2016-12-291-1/+1
| * | | | Add extern for 'led' global, set 'weak' attribute for rgblight_set()Scott Wilson2016-12-282-0/+3
| |/ / /
* | | | Merge pull request #968 from ofples/bugfix/right-modifiersJack Humbert2016-12-282-0/+3
|\ \ \ \ | |/ / / |/| | |
| * | | Added check that makes sure a code is a right modifier before considering it ...Ofer Plesser2016-12-232-0/+3
* | | | add different scales for music modeJack Humbert2016-12-231-0/+9
|/ / /
* | | Christmas RGB light modeJack Humbert2016-12-232-1/+23
* | | initial subatomic keymap (text)Jack Humbert2016-12-211-2/+0
* | | limit voices by default, add some drumsJack Humbert2016-12-202-25/+82
* | | rgb clean-up, api clean-upJack Humbert2016-12-195-35/+76
| |/ |/|
* | specialise music variablesJack Humbert2016-12-121-3/+3
* | re-enable audio and extrakeysJack Humbert2016-12-122-1/+23
|/
* Merge pull request #914 from wez/ble_2Jack Humbert2016-12-021-0/+37
|\
| * Add arduino-alike GPIO pin control helpersWez Furlong2016-11-271-0/+37
* | Annotates nordicErez Zukerman2016-12-021-1/+1
* | Test layout for ErgoDox EZ manufacturing robotErez Zukerman2016-11-292-0/+8
* | Merge branch 'master' of github.com:jackhumbert/qmk_firmware into wu5y7Jack Humbert2016-11-283-47/+64
|\|
| * fix strict-prototypes warningPriyadi Iman Nurcahyo2016-11-261-0/+1
| * remove define checks. didn't work because of include ordering.Priyadi Iman Nurcahyo2016-11-261-118/+0
| * add macro error when a required define is missingPriyadi Iman Nurcahyo2016-11-261-0/+118