Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | cbbrowne | 2016-09-07 | 14 | -240/+966 |
|\ | |||||
| * | Merge pull request #724 from sgoodwin/master | Jack Humbert | 2016-09-05 | 3 | -0/+268 |
| |\ | | | | | | | Add my keymap. | ||||
| | * | 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 |
| |\ \ | | | | | | | | | Updated docs to show more info on backlight breathing. | ||||
| | * | | 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 |
| | |\ | | | | | | | | | | | | | | | | | Conflicts: keyboards/planck/keymaps/bone2planck/keymap.c | ||||
| | | * | Update README | Jack Henahan | 2016-08-29 | 1 | -3/+9 |
| | | | | |||||
| | | * | jhenahan layout | Jack Henahan | 2016-08-29 | 4 | -0/+383 |
| | | | | |||||
| | * | | include base config.h instead of copying it | Jason Janse van Rensburg | 2016-07-26 | 1 | -88/+5 |
| | | | | |||||
| | * | | added config.h, and missing Ins of filpped navigation layer | Jason Janse van Rensburg | 2016-07-26 | 2 | -3/+93 |
| | | | | |||||
| | * | | Merged branch master into bone2planck | Jason Janse van Rensburg | 2016-07-25 | 1 | -1/+1 |
| | |\ \ | |||||
| | * | | | added missing F keys in flipped layer | Jason Janse van Rensburg | 2016-07-25 | 1 | -6/+6 |
| | | | | | |||||
| | * | | | added readme | Jason Janse van Rensburg | 2016-07-24 | 1 | -0/+8 |
| | | | | | |||||
| | * | | | moved insert | Jason Janse van Rensburg | 2016-07-24 | 1 | -5/+5 |
| | | | | | |||||
| | * | | | moved ctrl | Jason Janse van Rensburg | 2016-07-24 | 1 | -11/+12 |
| | | | | | |||||
| | * | | | fixed stupid errors | Jason Janse van Rensburg | 2016-07-24 | 1 | -12/+17 |
| | | | | | |||||
| * | | | | added a lock screen key | Callum Oakley | 2016-08-12 | 1 | -3/+16 |
| | | | | | |||||
| * | | | | Merge remote-tracking branch 'upstream/master' | Callum Oakley | 2016-08-09 | 5 | -0/+613 |
| |\ \ \ \ | |||||
| * | | | | | updated readme.md to reflect keymap changes | Callum Oakley | 2016-08-09 | 1 | -2/+2 |
| | | | | | | |||||
| * | | | | | changed order of bottom row of symbol layer to ease acess to brackets | Callum Oakley | 2016-08-09 | 1 | -2/+2 |
| | | | | | | |||||
* | | | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | cbbrowne | 2016-08-29 | 7 | -79/+85 |
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | |||||
| * | | | | | Merge branch 'master' into makefile_overhaul | Fred Sundvik | 2016-08-25 | 4 | -149/+83 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'master' into makefile_overhaul | Fred Sundvik | 2016-08-23 | 3 | -4/+15 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | Update keyboard readme files with new makefile instructions | Fred Sundvik | 2016-08-20 | 1 | -3/+5 |
| | | | | | | | | |||||
| * | | | | | | | Split subproject make files into Makefile and rules.mk | Fred Sundvik | 2016-08-20 | 4 | -6/+12 |
| | | | | | | | | |||||
| * | | | | | | | Split keyboard makefiles into rules and Makefile | Fred Sundvik | 2016-08-20 | 2 | -70/+68 |
| | | | | | | | | |||||
* | | | | | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | cbbrowne | 2016-08-26 | 4 | -149/+83 |
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | |||||
| * | | | | | | | Merge pull request #659 from Dbroqua/master | Jack Humbert | 2016-08-25 | 3 | -139/+73 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | - Updated dbroqua layout for planck keyboard | ||||
| | * | | | | | | | - 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 |
| | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # keyboards/planck/keymaps/dbroqua/keymap.c | ||||
| | * | | | | | | | - 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 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Reorganised bottom row | ||||
| | * | | | | | | | - 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 |
| | | | | | | | | | |||||
| | * | | | | | | | - Moved Brite function on esc to avoid conflict with ctrl key. | dbroqua | 2016-08-19 | 1 | -4/+4 |
| | | | | | | | | | |||||
| | * | | | | | | | - Updated dbroqua layout for planck keyboard | dbroqua | 2016-08-19 | 1 | -0/+314 |
| | | | | | | | | | |||||
| * | | | | | | | | Nightly | IBNobody | 2016-08-23 | 1 | -10/+10 |
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | Prep for Vision build | ||||
* | | | | | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | cbbrowne | 2016-08-24 | 3 | -4/+15 |
|\| | | | | | | | |||||
| * | | | | | | | Add one-hand key to planck/experimental keymap. | Joe Wasson | 2016-08-20 | 2 | -4/+5 |
| | | | | | | | | |||||
| * | | | | | | | Add default swap configs for a couple of boards. | Joe Wasson | 2016-08-20 | 1 | -0/+10 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | 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 |
|\| | | | | | | |||||
| * | | | | | | Added dbroqua layout for planck keyboard | Damien | 2016-08-18 | 1 | -0/+314 |
| |/ / / / / | |||||
| * | | | | | Merge pull request #650 from Xyverz/master | Jack Humbert | 2016-08-18 | 2 | -58/+6 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Minor changes to keymaps and other files |