Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #996 from milestogo/master | Jack Humbert | 2017-01-15 | 37 | -303/+765 |
|\ | |||||
| * | removing old programmer layout, in favor of milestogo | milestogo | 2017-01-08 | 4 | -276/+0 |
| * | trying to clean up duplicate docs | milestogo | 2017-01-08 | 8 | -1001/+0 |
| * | kinesis remap | milestogo | 2017-01-08 | 45 | -266/+2005 |
* | | Merge pull request #999 from deadcyclo/master | Jack Humbert | 2017-01-15 | 5 | -0/+26 |
|\ \ | |||||
| * | | Fixed incorrect layer image in deadcyclo readme | Brendan Johan Lee | 2017-01-10 | 1 | -1/+1 |
| * | | Merge remote-tracking branch 'upstream/master' | Brendan Johan Lee | 2017-01-10 | 24 | -35/+2265 |
| |\| | |||||
| * | | Added layer images to deadcyclo layout readme | Brendan Johan Lee | 2017-01-10 | 5 | -0/+26 |
* | | | Merge pull request #1003 from mneme/master | Jack Humbert | 2017-01-15 | 8 | -0/+519 |
|\ \ \ | |||||
| * | | | Update makefile. | David Olsson | 2017-01-12 | 2 | -5/+4 |
| * | | | - Change docs to match keymap. | David Olsson | 2017-01-12 | 3 | -21/+50 |
| * | | | Remove comments and change to correct KN_PLUS instead of KC_PLUS. | David Olsson | 2017-01-12 | 1 | -4/+4 |
| * | | | Link fix in readme. | David Olsson | 2017-01-11 | 1 | -2/+2 |
| * | | | Readme + minor change to make it match reality. | David Olsson | 2017-01-11 | 5 | -14/+60 |
| * | | | Atreus62 first semi-final draft | David Olsson | 2017-01-11 | 5 | -0/+445 |
| | |/ | |/| | |||||
* | | | Merge pull request #1005 from kd0kkv/patch-1 | Jack Humbert | 2017-01-15 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | Update keymap.c | kd0kkv | 2017-01-13 | 1 | -1/+1 |
| |/ / | |||||
* | | | Merge pull request #1006 from Vifon/master | Jack Humbert | 2017-01-15 | 3 | -6/+8 |
|\ \ \ | |||||
| * | | | Update the vifon keymap | Wojciech Siewierski | 2017-01-13 | 3 | -6/+8 |
| |/ / | |||||
* | | | Merge pull request #1007 from bryan4887/bryan | Jack Humbert | 2017-01-15 | 1 | -0/+226 |
|\ \ \ | |||||
| * | | | Added Bryan's keymap | Bryan Hernandez | 2017-01-13 | 1 | -0/+226 |
* | | | | Merge pull request #1009 from getclacking/master | Jack Humbert | 2017-01-15 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | Typo fix | Jason Milkins | 2017-01-15 | 1 | -1/+1 |
|/ / / / | |||||
* | | | | Merge pull request #1004 from jackhumbert/hf/scmd | Erez Zukerman | 2017-01-13 | 1 | -0/+4 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | Update quantum_keycodes.h | Jack Humbert | 2017-01-13 | 1 | -2/+2 |
| * | | | A shot at aliasing | Erez Zukerman | 2017-01-12 | 1 | -0/+2 |
| * | | | Adds SCMD and SCMD_T | Erez Zukerman | 2017-01-11 | 1 | -0/+2 |
|/ / / | |||||
* | | | 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 |
| |\ \ \ \ \ |