summaryrefslogtreecommitdiffstats
path: root/keyboards/planck
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne2016-09-0714-240/+966
|\
| * Merge pull request #724 from sgoodwin/masterJack Humbert2016-09-053-0/+268
| |\ | | | | | | Add my keymap.
| | * Add my keymap.Samuel Ryan Goodwin2016-09-053-0/+268
| | |
| * | Merge pull request #719 from IBNobody/masterJack Humbert2016-09-052-199/+238
| |\ \ | | | | | | | | Updated docs to show more info on backlight breathing.
| | * | Added diagonal mice macros, breathing ala AtomicIBNobody2016-09-042-199/+238
| | |/
| * | fixed incorrect key combination for locking screen on macOSCallum Oakley2016-09-022-5/+5
| | |
| * | changed some of the wording in the readmeCallum Oakley2016-09-011-4/+4
| | |
| * | changed order of modifiers after experimentation, updated readmeCallum Oakley2016-09-012-12/+7
| | |
| * | Merge remote-tracking branch 'upstream/master'Callum Oakley2016-09-0131-115/+1756
| |\|
| | * Merge branch 'master'Jason Janse van Rensburg2016-08-3037-97/+2539
| | |\ | | | | | | | | | | | | | | | | Conflicts: keyboards/planck/keymaps/bone2planck/keymap.c
| | | * Update READMEJack Henahan2016-08-291-3/+9
| | | |
| | | * jhenahan layoutJack Henahan2016-08-294-0/+383
| | | |
| | * | include base config.h instead of copying itJason Janse van Rensburg2016-07-261-88/+5
| | | |
| | * | added config.h, and missing Ins of filpped navigation layerJason Janse van Rensburg2016-07-262-3/+93
| | | |
| | * | Merged branch master into bone2planckJason Janse van Rensburg2016-07-251-1/+1
| | |\ \
| | * | | added missing F keys in flipped layerJason Janse van Rensburg2016-07-251-6/+6
| | | | |
| | * | | added readmeJason Janse van Rensburg2016-07-241-0/+8
| | | | |
| | * | | moved insertJason Janse van Rensburg2016-07-241-5/+5
| | | | |
| | * | | moved ctrlJason Janse van Rensburg2016-07-241-11/+12
| | | | |
| | * | | fixed stupid errorsJason Janse van Rensburg2016-07-241-12/+17
| | | | |
| * | | | added a lock screen keyCallum Oakley2016-08-121-3/+16
| | | | |
| * | | | Merge remote-tracking branch 'upstream/master'Callum Oakley2016-08-095-0/+613
| |\ \ \ \
| * | | | | updated readme.md to reflect keymap changesCallum Oakley2016-08-091-2/+2
| | | | | |
| * | | | | changed order of bottom row of symbol layer to ease acess to bracketsCallum Oakley2016-08-091-2/+2
| | | | | |
* | | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne2016-08-297-79/+85
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Merge branch 'master' into makefile_overhaulFred Sundvik2016-08-254-149/+83
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into makefile_overhaulFred Sundvik2016-08-233-4/+15
| |\ \ \ \ \ \
| * | | | | | | Update keyboard readme files with new makefile instructionsFred Sundvik2016-08-201-3/+5
| | | | | | | |
| * | | | | | | Split subproject make files into Makefile and rules.mkFred Sundvik2016-08-204-6/+12
| | | | | | | |
| * | | | | | | Split keyboard makefiles into rules and MakefileFred Sundvik2016-08-202-70/+68
| | | | | | | |
* | | | | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne2016-08-264-149/+83
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | Merge pull request #659 from Dbroqua/masterJack Humbert2016-08-253-139/+73
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | - Updated dbroqua layout for planck keyboard
| | * | | | | | | - Updated readme by adding link on kle for each layerdbroqua2016-08-241-0/+3
| | | | | | | | |
| | * | | | | | | Merge remote-tracking branch 'upstream/master'dbroqua2016-08-233-4/+15
| | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # keyboards/planck/keymaps/dbroqua/keymap.c
| | * | | | | | | - Added PrintScreen key on multimedia layerdbroqua2016-08-222-2/+2
| | | | | | | | |
| | * | | | | | | - Inverted key Tab and Escdbroqua2016-08-212-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Reorganised bottom row
| | * | | | | | | - Moved Insert/Del in Esc layerdbroqua2016-08-193-7/+7
| | | | | | | | |
| | * | | | | | | - Updated lower and raise layerdbroqua2016-08-192-126/+46
| | | | | | | | |
| | * | | | | | | - Added readme file and layout previewdbroqua2016-08-192-0/+11
| | | | | | | | |
| | * | | | | | | - Moved Home/End/PgUp/PgDn on arrow keysdbroqua2016-08-191-9/+9
| | | | | | | | |
| | * | | | | | | - Moved Brite function on esc to avoid conflict with ctrl key.dbroqua2016-08-191-4/+4
| | | | | | | | |
| | * | | | | | | - Updated dbroqua layout for planck keyboarddbroqua2016-08-191-0/+314
| | | | | | | | |
| * | | | | | | | NightlyIBNobody2016-08-231-10/+10
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | Prep for Vision build
* | | | | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne2016-08-243-4/+15
|\| | | | | | |
| * | | | | | | Add one-hand key to planck/experimental keymap.Joe Wasson2016-08-202-4/+5
| | | | | | | |
| * | | | | | | Add default swap configs for a couple of boards.Joe Wasson2016-08-201-0/+10
| | |/ / / / / | |/| | | | |
* | | | | | | More notescbbrowne2016-08-241-3/+4
| | | | | | |
* | | | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne2016-08-2211-58/+998
|\| | | | | |
| * | | | | | Added dbroqua layout for planck keyboardDamien2016-08-181-0/+314
| |/ / / / /
| * | | | | Merge pull request #650 from Xyverz/masterJack Humbert2016-08-182-58/+6
| |\ \ \ \ \ | | | | | | | | | | | | | | Minor changes to keymaps and other files