summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2016-07-31Merge branch 'master' of github.com:jackhumbert/qmk_firmwareNathan Sharfi6334-2415530/+64043
2016-07-31Merge pull request #594 from jeebak/jeebakJack Humbert3-0/+496
2016-07-31Merge pull request #590 from jeebak/in-like-flintJack Humbert1-0/+8
2016-07-31Update readme.mdJeeBak Kim1-1/+106
2016-07-30Add additional shortcut keymaps to TOUCHCURSOR layerJeeBak Kim1-4/+7
2016-07-30Add additional maps for [, and ], to LOWERJeeBak Kim1-4/+4
2016-07-30Make RAISE layer an all numbers/arithmatic layerJeeBak Kim1-6/+6
2016-07-30Move reset to a less accessible locationJeeBak Kim1-4/+4
2016-07-30Add -, +, and . to RAISEJeeBak Kim1-4/+4
2016-07-30Change calls from persistant_default_layer_set() to default_layer_set()JeeBak Kim1-3/+3
2016-07-30PrintScreen and RGUI replace BACKLIT and Ctrl. Move BACKLIT to LOWER/RAISE la...JeeBak Kim1-10/+10
2016-07-30Media keys for all the "regular" layersJeeBak Kim1-10/+10
2016-07-30Add mouse layer, and remove default arrow keys (touchcursor only, now)JeeBak Kim1-15/+36
2016-07-30Add numbers to _RAISEJeeBak Kim1-4/+4
2016-07-30Move _RAISE symbols to _LOWERJeeBak Kim1-6/+6
2016-07-30Tap for Enter, hold for ShiftJeeBak Kim1-30/+31
2016-07-30Add personalized TouchCursor layerJeeBak Kim1-6/+28
2016-07-30Tap for Esc, hold for ControlJeeBak Kim1-30/+33
2016-07-30Add IN_LIKE_FLINT songJeeBak Kim1-0/+8
2016-07-30Add "jeebak" keymap folder as a copy of the "default" folderJeeBak Kim3-0/+341
2016-07-30Merge pull request #589 from algernon/h/ergodox_ez-vs-ergodoxJack Humbert7-9/+9
2016-07-30Update some obsolete referencesGergely Nagy7-9/+9
2016-07-30Merge pull request #587 from fredizzimo/documentation_quick_fixJack Humbert1-13/+15
2016-07-30Merge pull request #503 from fredizzimo/ergodox_subprojectJack Humbert225-1795/+1651
2016-07-29Fix the quick aliases documentation sectionFred Sundvik1-13/+15
2016-07-29Small fix for infinity include guardFred Sundvik1-3/+3
2016-07-29Fix typo in the readme.Fred Sundvik1-1/+1
2016-07-29A couple of more Ergodox readme fixesFred Sundvik1-2/+2
2016-07-29Unify the ErgoDox EZ and Infinity documentationFred Sundvik1-8/+13
2016-07-29Refer to the right path in the readmeFred Sundvik1-1/+1
2016-07-29Move Ergodox readme from ez subfolder to parentFred Sundvik1-0/+0
2016-07-29Include the main Makefile before including Ergodox infinity driversFred Sundvik1-4/+4
2016-07-29Move Infinity Ergodox drivers to subproject, and fix makefileFred Sundvik14-2/+2
2016-07-29Remove the Infinity Ergodox default keymapFred Sundvik2-282/+0
2016-07-29Cleanup the townk_osx config.h and make filesFred Sundvik2-52/+2
2016-07-29Rename supercoder config_user to config.hFred Sundvik1-1/+1
2016-07-29Fix config.h include guardsFred Sundvik2-4/+4
2016-07-29Define weak matrix user function for Infinity ErgodoxFred Sundvik1-0/+9
2016-07-29Speed up ChibiOS keymap compilationFred Sundvik1-17/+33
2016-07-29Change _delay_ms to wait_ms in algernon keymapFred Sundvik1-1216/+1217
2016-07-29Move some of the Ergodox config settings to sharedFred Sundvik3-37/+37
2016-07-29Add empty led control functions to Infinity ErgodoxFred Sundvik2-0/+96
2016-07-29Most ergodox keymaps compiles on InfinityFred Sundvik21-32/+46
2016-07-29All Ez keymaps compilesFred Sundvik58-58/+70
2016-07-29Initial structure for Ergodox as subprojectsFred Sundvik219-23/+58
2016-07-29Merge pull request #584 from algernon/ergodox-ez/algernonErez Zukerman4-28/+687
2016-07-29Merge pull request #583 from coderkun/coderkun_neo2Erez Zukerman2-7/+15
2016-07-29Merge pull request #580 from MatsLanGoH/patch-1Erez Zukerman1-1/+1
2016-07-29ergodox_ez: Upgrade my keymap to v1.4Gergely Nagy4-28/+687
2016-07-29disable sleep LEDcoderkun1-1/+2