summaryrefslogtreecommitdiff
path: root/keyboards/planck
Commit message (Collapse)AuthorAge
* Merge pull request #736 from tong92/masterJack Humbert2016-09-08
|\ | | | | add tong92 keymap
| * add tong92 keymaptong922016-09-08
| |
* | Merge pull request #733 from cbbrowne/masterJack Humbert2016-09-08
|\ \ | | | | | | Various recent enhancements to my keyboard map
| * | Borrowed joint Shift/Enter idea from sgoodwin mappingcbbrowne2016-09-07
| | |
| * | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne2016-09-07
| |\|
| * | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne2016-08-29
| |\ \
| * \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne2016-08-26
| |\ \ \
| * \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne2016-08-24
| |\ \ \ \
| * | | | | More notescbbrowne2016-08-24
| | | | | |
| * | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne2016-08-22
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne2016-08-10
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne2016-08-08
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne2016-08-04
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareChristopher Browne2016-07-28
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareChristopher Browne2016-07-26
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareChristopher Browne2016-07-25
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Notes about changesChristopher Browne2016-07-18
| | | | | | | | | | | | |
| * | | | | | | | | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareChristopher Browne2016-07-12
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | I did not like Space Cadet paren; it jumps in in way too many extra casesChristopher Browne2016-07-12
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareChristopher Browne2016-07-07
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareChristopher Browne2016-07-04
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareChristopher Browne2016-06-30
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareChristopher Browne2016-06-28
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareChristopher Browne2016-06-24
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareChristopher Browne2016-06-23
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Use Space Cadet parens on LSFTChristopher Browne2016-06-22
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareChristopher Browne2016-06-22
| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Added User Print - A "light" console out option (#8)IBNobody2016-09-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | User print disables the normal print messages in the body of QMK/TMK code and is meant as a lightweight alternative to NOPRINT. Use it when you only want to do a spot of debugging but lack flash resources for allowing all of the codebase to print (and store their wasteful strings).
* | | | | | | | | | | | | | | | | | | | Use keyboard config for nkro (#7)IBNobody2016-09-06
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * removing nkro references - wip * changed NKRO to be defined by keymap_config
* | | | | | | | | | | | | | | | | | | Merge pull request #724 from sgoodwin/masterJack Humbert2016-09-05
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add my keymap.
| * | | | | | | | | | | | | | | | | | | Add my keymap.Samuel Ryan Goodwin2016-09-05
| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge pull request #719 from IBNobody/masterJack Humbert2016-09-05
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated docs to show more info on backlight breathing.
| * | | | | | | | | | | | | | | | | | | | Added diagonal mice macros, breathing ala AtomicIBNobody2016-09-04
| |/ / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | fixed incorrect key combination for locking screen on macOSCallum Oakley2016-09-02
| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | changed some of the wording in the readmeCallum Oakley2016-09-01
| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | changed order of modifiers after experimentation, updated readmeCallum Oakley2016-09-01
| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/master'Callum Oakley2016-09-01
|\| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Merge branch 'master'Jason Janse van Rensburg2016-08-30
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: keyboards/planck/keymaps/bone2planck/keymap.c
| | * | | | | | | | | | | | | | | | | | | Update READMEJack Henahan2016-08-29
| | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | jhenahan layoutJack Henahan2016-08-29
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Merge branch 'master' into makefile_overhaulFred Sundvik2016-08-25
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | Merge pull request #659 from Dbroqua/masterJack Humbert2016-08-25
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Updated dbroqua layout for planck keyboard
| | | | * | | | | | | | | | | | | | | | | - Updated readme by adding link on kle for each layerdbroqua2016-08-24
| | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/master'dbroqua2016-08-23
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # keyboards/planck/keymaps/dbroqua/keymap.c
| | | | * | | | | | | | | | | | | | | | | - Added PrintScreen key on multimedia layerdbroqua2016-08-22
| | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | - Inverted key Tab and Escdbroqua2016-08-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Reorganised bottom row
| | | | * | | | | | | | | | | | | | | | | - Moved Insert/Del in Esc layerdbroqua2016-08-19
| | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | - Updated lower and raise layerdbroqua2016-08-19
| | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | - Added readme file and layout previewdbroqua2016-08-19
| | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | - Moved Home/End/PgUp/PgDn on arrow keysdbroqua2016-08-19
| | | | | | | | | | | | | | | | | | | | |