Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | Merge remote-tracking branch 'upstream/master' | xyverz | 2017-01-08 | 116 | -2714/+24308 | |
|\| | | | | ||||||
| * | | | | Merge pull request #994 from priyadi/unicode_mods_fix | Jack Humbert | 2017-01-08 | 1 | -8/+33 | |
| |\ \ \ \ | ||||||
| | * | | | | Unregister all mods before inputting Unicode, and reregister afterwards | Priyadi Iman Nurcahyo | 2017-01-09 | 1 | -8/+33 | |
| * | | | | | Merge pull request #993 from priyadi/greek_layer | Jack Humbert | 2017-01-08 | 2 | -5/+193 | |
| |\ \ \ \ \ | ||||||
| | * | | | | | Greek alphabet layer | Priyadi Iman Nurcahyo | 2017-01-09 | 1 | -4/+183 | |
| | * | | | | | Merge branch 'promethium' of github.com:priyadi/qmk_firmware into promethium | Priyadi Iman Nurcahyo | 2017-01-09 | 0 | -0/+0 | |
| | |\ \ \ \ \ | ||||||
| | | * | | | | | om telolet om | Priyadi Iman Nurcahyo | 2017-01-08 | 2 | -1/+10 | |
| | * | | | | | | om telolet om | Priyadi Iman Nurcahyo | 2017-01-08 | 2 | -1/+10 | |
| | | |/ / / / | | |/| | | | | ||||||
| * | | | | | | Merge pull request #990 from replicaJunction/master | Jack Humbert | 2017-01-08 | 12 | -22/+536 | |
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | ||||||
| | * | | | | | Removed build.bat | Joshua T | 2017-01-07 | 1 | -51/+0 | |
| | * | | | | | Merged from upstream | Joshua T | 2017-01-07 | 336 | -3127/+39980 | |
| | |\ \ \ \ \ | | |/ / / / / | |/| | | | | | ||||||
| * | | | | | | Merge pull request #989 from ishigoya/master | Jack Humbert | 2017-01-06 | 5 | -0/+1016 | |
| |\ \ \ \ \ \ | ||||||
| | * | | | | | | new file: keyboards/ergodox/keymaps/ishigoya-jp/img/keyboard-layout-enL.png | ishigoya | 2017-01-06 | 5 | -3/+57 | |
| | * | | | | | | new file: keyboards/ergodox/keymaps/ishigoya-jp/keymap.c | ishigoya | 2017-01-06 | 1 | -0/+962 | |
| |/ / / / / / | ||||||
| * | | | | | | Merge pull request #983 from common-nighthawk/master | Jack Humbert | 2017-01-04 | 2 | -0/+222 | |
| |\ \ \ \ \ \ | ||||||
| | * | | | | | | reverts change outside of personal keymap. | Daniel | 2017-01-01 | 1 | -2/+1 | |
| | * | | | | | | adds dedicated double-quote key. | Daniel | 2017-01-01 | 1 | -5/+9 | |
| | * | | | | | | removes double-tab brackets and adds back quot to left cmd. | Daniel | 2016-12-06 | 1 | -10/+10 | |
| | * | | | | | | removes the double actions from the metakeys. | Daniel | 2016-11-27 | 1 | -17/+15 | |
| | * | | | | | | moves brackets to top row. | Daniel | 2016-11-18 | 1 | -9/+9 | |
| | * | | | | | | moves brackets from J/K to U/I to remove block of common vim sequence. | Daniel | 2016-09-06 | 1 | -8/+8 | |
| | * | | | | | | adds tap dance and macro to move underscore and l- and r- brackets to base la... | Daniel | 2016-09-02 | 2 | -25/+57 | |
| | * | | | | | | adds Hyper key. improves media layer. first attempt at tap dance. | Daniel | 2016-09-01 | 2 | -35/+43 | |
| | * | | | | | | Merge remote-tracking branch 'upstream/master' | Daniel | 2016-08-31 | 439 | -13797/+30544 | |
| | |\ \ \ \ \ \ | ||||||
| | * | | | | | | | minor tweaks to numpad and media layer | Daniel | 2016-08-14 | 1 | -26/+24 | |
| | * | | | | | | | completes first-pass at media layer | Daniel | 2016-08-12 | 1 | -15/+15 | |
| | * | | | | | | | completes first-pass at symbol layer | Daniel | 2016-08-12 | 1 | -36/+36 | |
| | * | | | | | | | completes first-pass at base layer | Daniel | 2016-08-10 | 1 | -0/+183 | |
| * | | | | | | | | Merge pull request #984 from deadcyclo/master | Jack Humbert | 2017-01-04 | 2 | -0/+283 | |
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | | | ||||||
| | * | | | | | | | fix version macro making layer 3 sticky on deadcyclo layout | Brendan Johan Lee | 2017-01-03 | 1 | -2/+2 | |
| | * | | | | | | | Added the deadcyclo layout | Brendan Johan Lee | 2017-01-02 | 2 | -0/+283 | |
| * | | | | | | | | Merge pull request #988 from jcowgar/master | Jack Humbert | 2017-01-04 | 2 | -0/+265 | |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | ||||||
| | * | | | | | | | Added Jeremy’s developers keymap for the Planck | Jeremy Cowgar | 2017-01-04 | 2 | -0/+265 | |
| |/ / / / / / / | ||||||
| * | | | | | / | Update config.h | Jack Humbert | 2017-01-02 | 1 | -1/+1 | |
| | |_|_|_|_|/ | |/| | | | | | ||||||
| * | | | | | | Merge pull request #980 from TerryMathews/master | Jack Humbert | 2016-12-31 | 6 | -0/+340 | |
| |\ \ \ \ \ \ | ||||||
| | * | | | | | | Establish support for AMJPAD | TerryMathews | 2016-12-31 | 6 | -0/+340 | |
| |/ / / / / / | ||||||
| * | | | | | | Merge pull request #975 from fredizzimo/remove_temp_files | Jack Humbert | 2016-12-30 | 1 | -66/+0 | |
| |\ \ \ \ \ \ | ||||||
| | * | | | | | | Remove extra file that has been commited by mistake | Fred Sundvik | 2016-12-29 | 1 | -66/+0 | |
| * | | | | | | | Merge pull request #976 from fredizzimo/fix_makefile_on_cygwin | Jack Humbert | 2016-12-30 | 1 | -18/+3 | |
| |\ \ \ \ \ \ \ | ||||||
| | * | | | | | | | Clean up the SKIP_GIT code | Fred Sundvik | 2016-12-29 | 1 | -17/+2 | |
| | * | | | | | | | Remove extra parenthesis from Makefile | Fred Sundvik | 2016-12-29 | 1 | -1/+1 | |
| | |/ / / / / / | ||||||
| * | | | | | | | Merge pull request #973 from Wilba6582/keycode_refactor | Jack Humbert | 2016-12-30 | 4 | -314/+331 | |
| |\ \ \ \ \ \ \ | ||||||
| | * | | | | | | | Keycode refactor | Wilba6582 | 2016-12-29 | 4 | -314/+331 | |
| * | | | | | | | | Merge pull request #971 from algernon/ergodox-ez/algernon | Jack Humbert | 2016-12-30 | 3 | -6/+21 | |
| |\ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | ergodox: Update algernon's keymap to v1.10 | Gergely Nagy | 2016-12-28 | 3 | -6/+21 | |
| | |/ / / / / / / | ||||||
| * | | | | | | | | Merge pull request #974 from fredizzimo/remove_malloc_from_sysex | Jack Humbert | 2016-12-30 | 4 | -27/+71 | |
| |\ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | API Sysex fixes | Fred Sundvik | 2016-12-29 | 4 | -27/+71 | |
| | | |/ / / / / / | | |/| | | | | | | ||||||
| * | | | | | | | | Merge pull request #972 from mechkeys/rgb_compat | Jack Humbert | 2016-12-29 | 2 | -0/+3 | |
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | | ||||||
| | * | | | | | | | Removed errant + | Scott Wilson | 2016-12-29 | 1 | -1/+1 | |
| | * | | | | | | | Add extern for 'led' global, set 'weak' attribute for rgblight_set() | Scott Wilson | 2016-12-28 | 2 | -0/+3 | |
| | |/ / / / / / |