summaryrefslogtreecommitdiffstats
path: root/keyboards
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #999 from deadcyclo/masterJack Humbert2017-01-155-0/+26
|\
| * Fixed incorrect layer image in deadcyclo readmeBrendan Johan Lee2017-01-101-1/+1
| * Merge remote-tracking branch 'upstream/master'Brendan Johan Lee2017-01-1023-27/+2232
| |\
| * | Added layer images to deadcyclo layout readmeBrendan Johan Lee2017-01-105-0/+26
* | | Merge pull request #1003 from mneme/masterJack Humbert2017-01-158-0/+519
|\ \ \
| * | | Update makefile.David Olsson2017-01-122-5/+4
| * | | - Change docs to match keymap.David Olsson2017-01-123-21/+50
| * | | Remove comments and change to correct KN_PLUS instead of KC_PLUS.David Olsson2017-01-121-4/+4
| * | | Link fix in readme.David Olsson2017-01-111-2/+2
| * | | Readme + minor change to make it match reality.David Olsson2017-01-115-14/+60
| * | | Atreus62 first semi-final draftDavid Olsson2017-01-115-0/+445
| | |/ | |/|
* | | Merge pull request #1005 from kd0kkv/patch-1Jack Humbert2017-01-151-1/+1
|\ \ \
| * | | Update keymap.ckd0kkv2017-01-131-1/+1
| |/ /
* | | Merge pull request #1006 from Vifon/masterJack Humbert2017-01-153-6/+8
|\ \ \
| * | | Update the vifon keymapWojciech Siewierski2017-01-133-6/+8
| |/ /
* | | Merge pull request #1007 from bryan4887/bryanJack Humbert2017-01-151-0/+226
|\ \ \ | |/ / |/| |
| * | Added Bryan's keymapBryan Hernandez2017-01-131-0/+226
* | | Merge pull request #993 from priyadi/greek_layerJack Humbert2017-01-082-5/+193
|\ \ \
| * | | Greek alphabet layerPriyadi Iman Nurcahyo2017-01-091-4/+183
| * | | om telolet omPriyadi Iman Nurcahyo2017-01-082-1/+10
* | | | Merged from upstreamJoshua T2017-01-07277-1030/+35859
|\| | |
| * | | new file: keyboards/ergodox/keymaps/ishigoya-jp/img/keyboard-layout-enL.pngishigoya2017-01-065-3/+57
| * | | new file: keyboards/ergodox/keymaps/ishigoya-jp/keymap.cishigoya2017-01-061-0/+962
| * | | Merge pull request #983 from common-nighthawk/masterJack Humbert2017-01-042-0/+222
| |\ \ \
| | * | | reverts change outside of personal keymap.Daniel2017-01-011-2/+1
| | * | | adds dedicated double-quote key.Daniel2017-01-011-5/+9
| | * | | removes double-tab brackets and adds back quot to left cmd.Daniel2016-12-061-10/+10
| | * | | removes the double actions from the metakeys.Daniel2016-11-271-17/+15
| | * | | moves brackets to top row.Daniel2016-11-181-9/+9
| | * | | moves brackets from J/K to U/I to remove block of common vim sequence.Daniel2016-09-061-8/+8
| | * | | adds tap dance and macro to move underscore and l- and r- brackets to base la...Daniel2016-09-022-25/+57
| | * | | adds Hyper key. improves media layer. first attempt at tap dance.Daniel2016-09-012-35/+43
| | * | | Merge remote-tracking branch 'upstream/master'Daniel2016-08-31340-7101/+22090
| | |\ \ \
| | * | | | minor tweaks to numpad and media layerDaniel2016-08-141-26/+24
| | * | | | completes first-pass at media layerDaniel2016-08-121-15/+15
| | * | | | completes first-pass at symbol layerDaniel2016-08-121-36/+36
| | * | | | completes first-pass at base layerDaniel2016-08-101-0/+183
| * | | | | Merge pull request #984 from deadcyclo/masterJack Humbert2017-01-042-0/+283
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | fix version macro making layer 3 sticky on deadcyclo layoutBrendan Johan Lee2017-01-031-2/+2
| | * | | | Added the deadcyclo layoutBrendan Johan Lee2017-01-022-0/+283
| * | | | | Added Jeremy’s developers keymap for the PlanckJeremy Cowgar2017-01-042-0/+265
| |/ / / /
| * | | | Update config.hJack Humbert2017-01-021-1/+1
| * | | | Establish support for AMJPADTerryMathews2016-12-316-0/+340
| * | | | Merge pull request #975 from fredizzimo/remove_temp_filesJack Humbert2016-12-301-66/+0
| |\ \ \ \
| | * | | | Remove extra file that has been commited by mistakeFred Sundvik2016-12-291-66/+0
| * | | | | ergodox: Update algernon's keymap to v1.10Gergely Nagy2016-12-283-6/+21
| * | | | | Merge pull request #966 from Dbroqua/masterJack Humbert2016-12-287-111/+650
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | - Updated dbroqua layout for Satan keyboarddbroqua2016-12-241-19/+17
| | * | | | - Added RGB layer on dbroqua GH60 layoutdbroqua2016-12-243-10/+288
| | * | | | - Fixed bug in dbroqua layout for Satan keyboarddbroqua2016-12-222-40/+24