summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Typo fixJason Milkins2017-01-15
* Merge pull request #1004 from jackhumbert/hf/scmdErez Zukerman2017-01-13
|\
| * Update quantum_keycodes.hJack Humbert2017-01-13
| * A shot at aliasingErez Zukerman2017-01-12
| * Adds SCMD and SCMD_TErez Zukerman2017-01-11
|/
* Merge pull request #994 from priyadi/unicode_mods_fixJack Humbert2017-01-08
|\
| * Unregister all mods before inputting Unicode, and reregister afterwardsPriyadi Iman Nurcahyo2017-01-09
* | Merge pull request #993 from priyadi/greek_layerJack Humbert2017-01-08
|\ \
| * | Greek alphabet layerPriyadi Iman Nurcahyo2017-01-09
| * | Merge branch 'promethium' of github.com:priyadi/qmk_firmware into promethiumPriyadi Iman Nurcahyo2017-01-09
| |\ \
| | * | om telolet omPriyadi Iman Nurcahyo2017-01-08
| * | | om telolet omPriyadi Iman Nurcahyo2017-01-08
| | |/ | |/|
* | | Merge pull request #990 from replicaJunction/masterJack Humbert2017-01-08
|\ \ \ | |/ / |/| |
| * | Removed build.batJoshua T2017-01-07
| * | Merged from upstreamJoshua T2017-01-07
| |\ \ | |/ / |/| |
* | | Merge pull request #989 from ishigoya/masterJack Humbert2017-01-06
|\ \ \
| * | | new file: keyboards/ergodox/keymaps/ishigoya-jp/img/keyboard-layout-enL.pngishigoya2017-01-06
| * | | new file: keyboards/ergodox/keymaps/ishigoya-jp/keymap.cishigoya2017-01-06
|/ / /
* | | Merge pull request #983 from common-nighthawk/masterJack Humbert2017-01-04
|\ \ \
| * | | reverts change outside of personal keymap.Daniel2017-01-01
| * | | adds dedicated double-quote key.Daniel2017-01-01
| * | | removes double-tab brackets and adds back quot to left cmd.Daniel2016-12-06
| * | | removes the double actions from the metakeys.Daniel2016-11-27
| * | | moves brackets to top row.Daniel2016-11-18
| * | | moves brackets from J/K to U/I to remove block of common vim sequence.Daniel2016-09-06
| * | | adds tap dance and macro to move underscore and l- and r- brackets to base la...Daniel2016-09-02
| * | | adds Hyper key. improves media layer. first attempt at tap dance.Daniel2016-09-01
| * | | Merge remote-tracking branch 'upstream/master'Daniel2016-08-31
| |\ \ \
| * | | | minor tweaks to numpad and media layerDaniel2016-08-14
| * | | | completes first-pass at media layerDaniel2016-08-12
| * | | | completes first-pass at symbol layerDaniel2016-08-12
| * | | | completes first-pass at base layerDaniel2016-08-10
* | | | | Merge pull request #984 from deadcyclo/masterJack Humbert2017-01-04
|\ \ \ \ \
| * | | | | fix version macro making layer 3 sticky on deadcyclo layoutBrendan Johan Lee2017-01-03
| * | | | | Added the deadcyclo layoutBrendan Johan Lee2017-01-02
* | | | | | Merge pull request #988 from jcowgar/masterJack Humbert2017-01-04
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Added Jeremy’s developers keymap for the PlanckJeremy Cowgar2017-01-04
|/ / / / /
* | | | | Update config.hJack Humbert2017-01-02
* | | | | Merge pull request #980 from TerryMathews/masterJack Humbert2016-12-31
|\ \ \ \ \
| * | | | | Establish support for AMJPADTerryMathews2016-12-31
|/ / / / /
* | | | | Merge pull request #975 from fredizzimo/remove_temp_filesJack Humbert2016-12-30
|\ \ \ \ \
| * | | | | Remove extra file that has been commited by mistakeFred Sundvik2016-12-29
* | | | | | Merge pull request #976 from fredizzimo/fix_makefile_on_cygwinJack Humbert2016-12-30
|\ \ \ \ \ \
| * | | | | | Clean up the SKIP_GIT codeFred Sundvik2016-12-29
| * | | | | | Remove extra parenthesis from MakefileFred Sundvik2016-12-29
| |/ / / / /
* | | | | | Merge pull request #973 from Wilba6582/keycode_refactorJack Humbert2016-12-30
|\ \ \ \ \ \
| * | | | | | Keycode refactorWilba65822016-12-29
* | | | | | | Merge pull request #971 from algernon/ergodox-ez/algernonJack Humbert2016-12-30
|\ \ \ \ \ \ \
| * | | | | | | ergodox: Update algernon's keymap to v1.10Gergely Nagy2016-12-28
| |/ / / / / /
* | | | | | | Merge pull request #974 from fredizzimo/remove_malloc_from_sysexJack Humbert2016-12-30
|\ \ \ \ \ \ \