summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Removed build.batJoshua T2017-01-071-51/+0
* Merged from upstreamJoshua T2017-01-07336-3127/+39980
|\
| * Merge pull request #989 from ishigoya/masterJack Humbert2017-01-065-0/+1016
| |\
| | * 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-31439-13797/+30544
| | |\
| | * | 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
| * | | | Merge pull request #988 from jcowgar/masterJack Humbert2017-01-042-0/+265
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Added Jeremy’s developers keymap for the PlanckJeremy Cowgar2017-01-042-0/+265
| |/ / /
| * | | Update config.hJack Humbert2017-01-021-1/+1
| * | | Merge pull request #980 from TerryMathews/masterJack Humbert2016-12-316-0/+340
| |\ \ \
| | * | | 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
| * | | | Merge pull request #976 from fredizzimo/fix_makefile_on_cygwinJack Humbert2016-12-301-18/+3
| |\ \ \ \
| | * | | | Clean up the SKIP_GIT codeFred Sundvik2016-12-291-17/+2
| | * | | | Remove extra parenthesis from MakefileFred Sundvik2016-12-291-1/+1
| | |/ / /
| * | | | Merge pull request #973 from Wilba6582/keycode_refactorJack Humbert2016-12-304-314/+331
| |\ \ \ \
| | * | | | Keycode refactorWilba65822016-12-294-314/+331
| * | | | | Merge pull request #971 from algernon/ergodox-ez/algernonJack Humbert2016-12-303-6/+21
| |\ \ \ \ \
| | * | | | | ergodox: Update algernon's keymap to v1.10Gergely Nagy2016-12-283-6/+21
| | |/ / / /
| * | | | | Merge pull request #974 from fredizzimo/remove_malloc_from_sysexJack Humbert2016-12-304-27/+71
| |\ \ \ \ \
| | * | | | | API Sysex fixesFred Sundvik2016-12-294-27/+71
| | | |/ / / | | |/| | |
| * | | | | Merge pull request #972 from mechkeys/rgb_compatJack Humbert2016-12-292-0/+3
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Removed errant +Scott Wilson2016-12-291-1/+1
| | * | | | Add extern for 'led' global, set 'weak' attribute for rgblight_set()Scott Wilson2016-12-282-0/+3
| | |/ / /
| * | | | Merge pull request #968 from ofples/bugfix/right-modifiersJack Humbert2016-12-282-0/+3
| |\ \ \ \
| | * | | | Added check that makes sure a code is a right modifier before considering it ...Ofer Plesser2016-12-232-0/+3
| * | | | | 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
| | * | | | - Fixed bad typo in dbroqua layout for gh60dbroqua2016-12-221-19/+2
| | * | | | - Renamed dbroqua_hhkb as dbroqua for gh60 layoutdbroqua2016-12-212-0/+0
| | * | | | - Rewrote dbroqua layout for Satan keyboard and adding RGB lightdbroqua2016-12-214-110/+170