Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #736 from tong92/master | Jack Humbert | 2016-09-08 | 3 | -0/+274 |
|\ | |||||
| * | add tong92 keymap | tong92 | 2016-09-08 | 3 | -0/+274 |
* | | Merge pull request #733 from cbbrowne/master | Jack Humbert | 2016-09-08 | 3 | -15/+38 |
|\ \ | |||||
| * | | Borrowed joint Shift/Enter idea from sgoodwin mapping | cbbrowne | 2016-09-07 | 2 | -1/+2 |
| * | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | cbbrowne | 2016-09-07 | 14 | -240/+966 |
| |\| | |||||
| * | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | cbbrowne | 2016-08-29 | 7 | -79/+85 |
| |\ \ | |||||
| * \ \ | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | cbbrowne | 2016-08-26 | 4 | -149/+83 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | cbbrowne | 2016-08-24 | 3 | -4/+15 |
| |\ \ \ \ | |||||
| * | | | | | More notes | cbbrowne | 2016-08-24 | 1 | -3/+4 |
| * | | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | cbbrowne | 2016-08-22 | 11 | -58/+998 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | cbbrowne | 2016-08-10 | 4 | -4/+343 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | cbbrowne | 2016-08-08 | 2 | -72/+187 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | cbbrowne | 2016-08-04 | 8 | -0/+709 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | Christopher Browne | 2016-07-28 | 1 | -10/+8 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | Christopher Browne | 2016-07-26 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | Christopher Browne | 2016-07-25 | 2 | -75/+121 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Notes about changes | Christopher Browne | 2016-07-18 | 1 | -8/+8 |
| * | | | | | | | | | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | Christopher Browne | 2016-07-12 | 6 | -74/+89 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | I did not like Space Cadet paren; it jumps in in way too many extra cases | Christopher Browne | 2016-07-12 | 1 | -1/+1 |
| * | | | | | | | | | | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | Christopher Browne | 2016-07-07 | 1 | -8/+8 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | Christopher Browne | 2016-07-04 | 1 | -0/+66 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | Christopher Browne | 2016-06-30 | 14 | -24/+100 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | Christopher Browne | 2016-06-28 | 4 | -116/+208 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | Christopher Browne | 2016-06-24 | 44 | -40231/+163 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | Christopher Browne | 2016-06-23 | 7 | -0/+1443 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | Use Space Cadet parens on LSFT | Christopher Browne | 2016-06-22 | 1 | -1/+1 |
| * | | | | | | | | | | | | | | | | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | Christopher Browne | 2016-06-22 | 3 | -7/+28 |
* | | | | | | | | | | | | | | | | | | | | Added User Print - A "light" console out option (#8) | IBNobody | 2016-09-07 | 2 | -3/+11 |
* | | | | | | | | | | | | | | | | | | | | Use keyboard config for nkro (#7) | IBNobody | 2016-09-06 | 2 | -4/+5 |
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | Merge pull request #724 from sgoodwin/master | Jack Humbert | 2016-09-05 | 3 | -0/+268 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | Add my keymap. | Samuel Ryan Goodwin | 2016-09-05 | 3 | -0/+268 |
* | | | | | | | | | | | | | | | | | | | | Merge pull request #719 from IBNobody/master | Jack Humbert | 2016-09-05 | 2 | -199/+238 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | Added diagonal mice macros, breathing ala Atomic | IBNobody | 2016-09-04 | 2 | -199/+238 |
| |/ / / / / / / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | | | | | | | fixed incorrect key combination for locking screen on macOS | Callum Oakley | 2016-09-02 | 2 | -5/+5 |
* | | | | | | | | | | | | | | | | | | | | changed some of the wording in the readme | Callum Oakley | 2016-09-01 | 1 | -4/+4 |
* | | | | | | | | | | | | | | | | | | | | changed order of modifiers after experimentation, updated readme | Callum Oakley | 2016-09-01 | 2 | -12/+7 |
* | | | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/master' | Callum Oakley | 2016-09-01 | 31 | -115/+1756 |
|\| | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | Merge branch 'master' | Jason Janse van Rensburg | 2016-08-30 | 37 | -97/+2539 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | | | | | Update README | Jack Henahan | 2016-08-29 | 1 | -3/+9 |
| | * | | | | | | | | | | | | | | | | | | | jhenahan layout | Jack Henahan | 2016-08-29 | 4 | -0/+383 |
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | | Merge branch 'master' into makefile_overhaul | Fred Sundvik | 2016-08-25 | 4 | -149/+83 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | | | | | | Merge pull request #659 from Dbroqua/master | Jack Humbert | 2016-08-25 | 3 | -139/+73 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | | | | | | | | | | | - Updated readme by adding link on kle for each layer | dbroqua | 2016-08-24 | 1 | -0/+3 |
| | | | * | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/master' | dbroqua | 2016-08-23 | 3 | -4/+15 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | | | | |/| | | | | | | | | | | | | | | | |||||
| | | | * | | | | | | | | | | | | | | | | | - Added PrintScreen key on multimedia layer | dbroqua | 2016-08-22 | 2 | -2/+2 |
| | | | * | | | | | | | | | | | | | | | | | - Inverted key Tab and Esc | dbroqua | 2016-08-21 | 2 | -12/+12 |
| | | | * | | | | | | | | | | | | | | | | | - Moved Insert/Del in Esc layer | dbroqua | 2016-08-19 | 3 | -7/+7 |
| | | | * | | | | | | | | | | | | | | | | | - Updated lower and raise layer | dbroqua | 2016-08-19 | 2 | -126/+46 |
| | | | * | | | | | | | | | | | | | | | | | - Added readme file and layout preview | dbroqua | 2016-08-19 | 2 | -0/+11 |
| | | | * | | | | | | | | | | | | | | | | | - Moved Home/End/PgUp/PgDn on arrow keys | dbroqua | 2016-08-19 | 1 | -9/+9 |