summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1269 from ryanmaclean/patch-6Jack Humbert2017-05-011-6/+3
|\ | | | | Cleaning Up Dockerfile Layers Per Official Docs
| * Cleaning Up Dockerfile Layers Per Official DocsRyan MacLean2017-04-301-6/+3
|/ | | | | | | | | | | | | From the official docs: ``` Note: The official Debian and Ubuntu images automatically run apt-get clean, so explicit invocation is not required. ``` Also added ` && rm -rf /var/lib/apt/lists/*` as part of the install line which probably does what was intended (no need to make a new layer). Added apt-get update to the RUN payload, as it should be part of the same layer. Both are documented here: https://docs.docker.com/engine/userguide/eng-image/dockerfile_best-practices/
* Merge pull request #1266 from ryanmaclean/patch-5Jack Humbert2017-04-302-0/+76
|\ | | | | Adding AMJ60 ANSI Maximized Layout
| * Addind Sample Maxed Out KeymapRyan MacLean2017-04-291-0/+61
| | | | | | Keeping hold space for fn1, adding three other user-mappable keys.
| * Adding Maximized LayoutRyan MacLean2017-04-291-0/+15
| | | | | | Both split shifts and HHKB split backspace.
* | Merge pull request #1268 from priyadi/promethiumJack Humbert2017-04-309-85/+215
|\ \ | | | | | | Promethium keymap update
| * | Simple RGB backlight themingPriyadi Iman Nurcahyo2017-04-305-72/+161
| | |
| * | Syntax fixPriyadi Iman Nurcahyo2017-04-301-2/+2
| | |
| * | Promethium update: demo LED, fix PS2 delay, fix LED ordering, change click ↵Priyadi Iman Nurcahyo2017-04-294-22/+55
| | | | | | | | | | | | frequency
| * | tune clicksPriyadi Iman Nurcahyo2017-04-191-3/+3
| | |
| * | Merge remote-tracking branch 'upstream/master' into promethiumPriyadi Iman Nurcahyo2017-04-198-71/+300
| |\ \
| * | | Fix LED sequence; bug fixesPriyadi Iman Nurcahyo2017-04-192-10/+18
| | | |
* | | | Merge pull request #1264 from fredizzimo/wsl_supportJack Humbert2017-04-302-20/+26
|\ \ \ \ | | | | | | | | | | Add possibility to override the command to execute when flashing
| * | | | Add possibility to override the command to execute when flashingFred Sundvik2017-04-292-20/+26
| | |_|/ | |/| |
* | | | fixes s60_x keyboardJack Humbert2017-04-3053-31/+44
| | | |
* | | | Merge pull request #1263 from Dbroqua/masterJack Humbert2017-04-305-62/+26
|\ \ \ \ | |/ / / |/| | | Fixed bugs for S60-X RGB version
| * | | Merge branch 'master' of https://github.com/Dbroqua/qmk_firmwaredbroqua2017-04-2992-234/+2831
| |\ \ \
| | * \ \ Merge pull request #21 from qmk/masterDamien2017-04-2992-234/+2831
| | |\ \ \ | |_|/ / / |/| | | | Merge from QMK
* | | | | Merge pull request #1259 from laelath/masterJack Humbert2017-04-262-11/+121
|\ \ \ \ \ | | | | | | | | | | | | Added a proper README to the lae3 keymap
| * | | | | Expanded lae3 keymap readmelaelath2017-04-262-11/+121
| | | | | |
* | | | | | Merge pull request #1258 from smt/smt/hhkbJack Humbert2017-04-261-0/+176
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Add smt keymap for HHKB
| * | | | | Add smt keymap for HHKBStephen Tudor2017-04-241-0/+176
| | | | | |
* | | | | | Merge pull request #1231 from Dbroqua/masterJack Humbert2017-04-2515-209/+458
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | S60-X RGB support
* | | | | | Merge pull request #1253 from laelath/masterJack Humbert2017-04-254-0/+294
|\ \ \ \ \ \ | | | | | | | | | | | | | | Added lae3 keymap
| * | | | | | Switched Alt and GUI key placesJustin Frank2017-04-231-2/+2
| | | | | | |
| * | | | | | Added lae3 keymapJustin Frank2017-04-224-0/+294
| | | | | | |
* | | | | | | Merge pull request #1255 from ryanmaclean/patch-4Jack Humbert2017-04-252-0/+130
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Initial Ortholinear Commit for AMJPad
| * | | | | | | Adding Right LayoutRyan MacLean2017-04-221-0/+65
| | | | | | | |
| * | | | | | | Update keymap.cRyan MacLean2017-04-220-0/+0
| | | | | | | |
| * | | | | | | Initial Ortho Commit (LEFT SIDE)Ryan MacLean2017-04-221-0/+65
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Using only one layer, and activating it with two keys at the moment. As with previous comments, this isn't final, but is a good starting point for a one-handed keyboard, half a Planck-like ortholinear keyboard, or a sample to show a layout with a function layer.
* | | | | | | Merge pull request #1257 from MachineIndustries/keyboards/M10AJack Humbert2017-04-257-0/+229
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | Add RAMA x Machine Industries M10A to the keyboards directory
| * | | | | | Add RAMA x Machine Industries M10A to the keyboards directoryJosh Black2017-04-257-0/+229
|/ / / / / /
* | | | | | Added an additional clueboard layout. (#1252)Solomon2017-04-226-0/+130
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Current building keymap * Working media keys * Added mute key. Fixed volume. Fixed media * Updating readme * Swapped readme order
* | | | | | Tweak the shift_fn keymap so it worksskullY2017-04-212-19/+22
| | | | | |
* | | | | | Merge pull request #1246 from reversebias/masterJack Humbert2017-04-198-0/+687
|\ \ \ \ \ \ | | | | | | | | | | | | | | Initial support for the Mitosis Keyboard
| * | | | | | Update readme.mdreversebias2017-04-191-158/+6
| | | | | | |
| * | | | | | First Commitcam2017-04-198-0/+839
| | | | | | |
| * | | | | | Delete tempreversebias2017-04-191-1/+0
| | | | | | |
| * | | | | | Create tempreversebias2017-04-191-0/+1
| | |_|_|_|/ | |/| | | |
* | | | | | Merge pull request #1245 from fredizzimo/fix_lcd_pin_configurationJack Humbert2017-04-191-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix LCD SS pin configuration
| * | | | | | Fix LCD SS pin configurationFred Sundvik2017-04-191-1/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There was a typo, so the attempted configuration proably didn't do what it should have done. I think it left the pin floating, and could cause the LCD problems issue-1230.
* | | | | | Merge pull request #1244 from ryanmaclean/patch-3Jack Humbert2017-04-192-1/+118
|\ \ \ \ \ \ | | | | | | | | | | | | | | Adding Maximized Keymap
| * | | | | | Adding Sample Max LayoutRyan MacLean2017-04-181-0/+102
| | | | | | |
| * | | | | | Adding Maximized KeymapRyan MacLean2017-04-181-1/+16
| |/ / / / / | | | | | | | | | | | | For use with grid layout pads.
* | | | | | Merge pull request #1243 from Xyverz/masterJack Humbert2017-04-191-25/+20
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Removed LT macros
| * | | | | LT doesn't work with tri_layer. Removed it from this keymap.Xyverz2017-04-181-25/+20
| | | | | |
| * | | | | swapped RAISE with LOWER in layer-tapping macros.Xyverz2017-04-181-6/+6
| | | | | |
* | | | | | Merge pull request #1239 from priyadi/promethiumJack Humbert2017-04-188-54/+501
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | Keymap updates
| * | | | | Fix Planck compatibilityPriyadi Iman Nurcahyo2017-04-191-0/+2
| | | | | |
| * | | | | Keymap updates and some adjustment for latest version of QMKPriyadi Iman Nurcahyo2017-04-194-24/+125
| | | | | |