Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'upstream/master' | Daniel | 2016-08-31 | 340 | -7101/+22090 |
|\ | |||||
| * | Merge branch 'master' | Jason Janse van Rensburg | 2016-08-30 | 583 | -6781/+26180 |
| |\ | | | | | | | | | | | | | 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 |
| | | | |||||
| | * | Merge pull request #696 from fredizzimo/community_boards | Jack Humbert | 2016-08-27 | 1 | -19/+28 |
| | |\ | | | | | | | | | Update list of community keyboards | ||||
| | | * | Update list of community keyboards | Fred Sundvik | 2016-08-28 | 1 | -19/+28 |
| | | | | |||||
| | * | | Merge pull request #689 from jeebak/tv44-jeebak | Jack Humbert | 2016-08-27 | 4 | -0/+596 |
| | |\ \ | | | | | | | | | | | Port jeebak's Planck/JD45 keymap to TV44 | ||||
| | | * | | [tv44] Port jeebak's planck keymap to tv44 | JeeBak Kim | 2016-08-26 | 3 | -69/+538 |
| | | | | | |||||
| | | * | | [tv44] Add "jeebak" keymap folder as a copy of the "default" folder | JeeBak Kim | 2016-08-26 | 4 | -0/+127 |
| | | | | | |||||
| | * | | | Merge pull request #684 from tomb0y/kc60_workman_dead | Jack Humbert | 2016-08-27 | 2 | -4/+4 |
| | |\ \ \ | | | | | | | | | | | | | Correct typo in kc60 workman-dead keymap | ||||
| | | * | | | Correct typo in kc60 workman-dead keymap | zs | 2016-08-26 | 2 | -4/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | and rename README.md to readme.md | ||||
| | * | | | | Rename infinity_chibios to infinity60, and add readme | Fred Sundvik | 2016-08-27 | 16 | -9/+37 |
| | | |_|/ | | |/| | | |||||
| | * | | | Merge branch 'master' into fix_line_endings | Fred Sundvik | 2016-08-27 | 102 | -2716/+2713 |
| | |\ \ \ | |||||
| | | * \ \ | Merge remote-tracking branch 'upstream/master' into makefile_overhaul | Fred Sundvik | 2016-08-26 | 1 | -23/+142 |
| | | |\ \ \ | | | | | |/ | | | | |/| | |||||
| | | * | | | Fix bad merge | Fred Sundvik | 2016-08-26 | 2 | -4/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | Led should have been added to KC60, not GH60 | ||||
| | | * | | | Split vision_division into Makefile/rules.mk | Fred Sundvik | 2016-08-25 | 2 | -75/+72 |
| | | | | | | |||||
| | | * | | | Merge branch 'master' into makefile_overhaul | Fred Sundvik | 2016-08-25 | 50 | -333/+2839 |
| | | |\ \ \ | | | | | |/ | | | | |/| | |||||
| | | * | | | Merge remote-tracking branch 'upstream/master' into makefile_overhaul | Fred Sundvik | 2016-08-24 | 3 | -0/+419 |
| | | |\ \ \ | |||||
| | | * | | | | Split kitten_paw into Makefile/rules.mk | Fred Sundvik | 2016-08-23 | 2 | -75/+73 |
| | | | | | | | |||||
| | | * | | | | Merge branch 'master' into makefile_overhaul | Fred Sundvik | 2016-08-23 | 33 | -490/+1324 |
| | | |\ \ \ \ | |||||
| | | * | | | | | Update keyboard readme files with new makefile instructions | Fred Sundvik | 2016-08-20 | 16 | -58/+75 |
| | | | | | | | | |||||
| | | * | | | | | Split subproject make files into Makefile and rules.mk | Fred Sundvik | 2016-08-20 | 28 | -605/+705 |
| | | | | | | | | |||||
| | | * | | | | | Split keyboard makefiles into rules and Makefile | Fred Sundvik | 2016-08-20 | 55 | -1902/+1791 |
| | | | | | | | | |||||
| | * | | | | | | Normalize line endings | Fred Sundvik | 2016-08-27 | 21 | -3204/+3204 |
| | | |_|_|_|/ | | |/| | | | | |||||
| | * | | | | | Merge pull request #664 from linsomniac/infinity_readme | Erez Zukerman | 2016-08-26 | 1 | -23/+144 |
| | |\ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | Adding nicer Infinity build instructions. | ||||
| | | * | | | | Making the existing firmware link better | Sean Reifschneider | 2016-08-24 | 1 | -1/+2 |
| | | | | | | | |||||
| | | * | | | | Changes based on @fredizzimo review, flashing Infinity details | Sean Reifschneider | 2016-08-24 | 1 | -0/+34 |
| | | | | | | | |||||
| | | * | | | | Changes from review by @fredizzimo and @Xyverz | Sean Reifschneider | 2016-08-22 | 1 | -19/+16 |
| | | | | | | | |||||
| | | * | | | | Tweaks after review. | Sean Reifschneider | 2016-08-19 | 1 | -3/+3 |
| | | | | | | | |||||
| | | * | | | | Restructuring of the ergodox README. | Sean Reifschneider | 2016-08-19 | 1 | -29/+105 |
| | | | | | | | |||||
| | | * | | | | Noting the change directory. | Sean Reifschneider | 2016-08-19 | 1 | -0/+1 |
| | | | | | | | |||||
| | | * | | | | Adding submodule note. | Sean Reifschneider | 2016-08-19 | 1 | -0/+1 |
| | | | | | | | |||||
| | | * | | | | Adding nicer Infinity build instructions. | Sean Reifschneider | 2016-08-19 | 1 | -0/+11 |
| | | | | | | | |||||
| | * | | | | | Merge pull request #659 from Dbroqua/master | Jack Humbert | 2016-08-25 | 15 | -161/+319 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | - Updated dbroqua layout for planck keyboard | ||||
| | | * | | | | | - Added capslock led for KC60 keyboard (based on gitbug.com/jpec/kc60 works) | dbroqua | 2016-08-25 | 2 | -1/+33 |
| | | | | | | | | |||||
| | | * | | | | | - Updated kc60/readme | dbroqua | 2016-08-25 | 2 | -0/+76 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Added layout examples for kc60 | ||||
| | | * | | | | | - Fixed layout for kc60 | dbroqua | 2016-08-24 | 6 | -18/+18 |
| | | | | | | | | |||||
| | | * | | | | | - Updated kc60.h for 2x 1u backspace (K49) | dbroqua | 2016-08-24 | 3 | -3/+119 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Added dbroqua layout | ||||
| | | * | | | | | - 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 | -0/+419 |
| | | |\ \ \ \ \ | | | | | |_|_|/ | | | | |/| | | | |||||
| | | * | | | | | Merge remote-tracking branch 'upstream/master' | dbroqua | 2016-08-23 | 52 | -575/+2291 |
| | | |\ \ \ \ \ | | | | | |_|_|/ | | | | |/| | | | | | | | | | | | | | | | | | | | # 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 |
| | | | | | | | | |||||
| | * | | | | | | Merge pull request #683 from ickerwx/master | Jack Humbert | 2016-08-25 | 9 | -53/+322 |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | LEDs work now, fixed Kitten Paw default keymap, added my own keymap as a better example |