summaryrefslogtreecommitdiffstats
path: root/keyboards
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master'Joshua T2016-08-0724-199/+2015
|\
| * Merge pull request #599 from Depariel/masterJack Humbert2016-08-036-154/+196
| |\ | | | | | | Fixed compiling errors and updated keymaps for infinity_chibios
| | * added support for Infinity 1.1a (4th drop) matrix, no LED support yetDepariel2016-07-312-5/+50
| | |
| | * fixed typo in hasu/keymap.cDepariel2016-07-311-1/+1
| | |
| | * fixed compiling bugs in infinity_chibios.h, updated keymaps, added depariel ↵Depariel2016-07-315-149/+146
| | | | | | | | | | | | keymap
| * | Merge pull request #592 from sethbc/ez-sethbcErez Zukerman2016-08-023-0/+119
| |\ \ | | | | | | | | Ez sethbc
| | * | rebaseSeth Chandler2016-07-303-1/+1
| | | |
| | * | update makefileSeth Chandler2016-07-301-1/+1
| | | |
| | * | initial commit of sethbc keymapSeth Chandler2016-07-303-0/+119
| | | |
| * | | Merge pull request #593 from J3RN/masterErez Zukerman2016-08-022-22/+26
| |\ \ \ | | | | | | | | | | Updated the J3RN ErgoDox keymap
| | * | | Updated readme with recent changesJonathan Arnett2016-07-301-3/+6
| | | | |
| | * | | Updated my keymapJack Humbert2016-07-303-21/+22
| | |\| |
| * | | | Merge pull request #600 from adiabatic/masterErez Zukerman2016-08-024-14/+1167
| |\ \ \ \ | | | | | | | | | | | | zweihander-osx: add left-hand-thumb tab key
| | * | | | Thumb ⌫ into ⇥, numpad & into :, yank home/endNathan Sharfi2016-07-313-13/+1166
| | | | | | | | | | | | | | | | | | | | | | | | Also: add (back?) in the light-shine disabler
| | * | | | Merge branch 'master' of github.com:jackhumbert/qmk_firmwareNathan Sharfi2016-07-311-1/+1
| | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | # Conflicts: # keyboard/ergodox_ez/keymaps/zweihander-osx/keymap.c # keyboard/ergodox_ez/keymaps/zweihander-osx/zweihander-osx.hex
| * | | | Updates ErgoDox readmeErez Zukerman2016-08-011-9/+6
| | | | |
| * | | | Merge pull request #596 from fredizzimo/rid_of_quickJack Humbert2016-08-015-0/+5
| |\ \ \ \ | | |/ / / | |/| | | Fix the makefile dependencies and remove quick targets
| | * | | Generate version information to version.hFred Sundvik2016-07-315-0/+5
| | | |/ | | |/| | | | | | | | | So that only the files that really needs a version are recompiled.
| * | | Update readme.mdJeeBak Kim2016-07-301-1/+106
| | | |
| * | | Add additional shortcut keymaps to TOUCHCURSOR layerJeeBak Kim2016-07-301-4/+7
| | | |
| * | | Add additional maps for [, and ], to LOWERJeeBak Kim2016-07-301-4/+4
| | | |
| * | | Make RAISE layer an all numbers/arithmatic layerJeeBak Kim2016-07-301-6/+6
| | | |
| * | | Move reset to a less accessible locationJeeBak Kim2016-07-301-4/+4
| | | |
| * | | Add -, +, and . to RAISEJeeBak Kim2016-07-301-4/+4
| | | |
| * | | Change calls from persistant_default_layer_set() to default_layer_set()JeeBak Kim2016-07-301-3/+3
| | | |
| * | | PrintScreen and RGUI replace BACKLIT and Ctrl. Move BACKLIT to LOWER/RAISE ↵JeeBak Kim2016-07-301-10/+10
| | | | | | | | | | | | | | | | layers
| * | | Media keys for all the "regular" layersJeeBak Kim2016-07-301-10/+10
| | | |
| * | | Add mouse layer, and remove default arrow keys (touchcursor only, now)JeeBak Kim2016-07-301-15/+36
| | | |
| * | | Add numbers to _RAISEJeeBak Kim2016-07-301-4/+4
| | | |
| * | | Move _RAISE symbols to _LOWERJeeBak Kim2016-07-301-6/+6
| | | |
| * | | Tap for Enter, hold for ShiftJeeBak Kim2016-07-301-30/+31
| | | |
| * | | Add personalized TouchCursor layerJeeBak Kim2016-07-301-6/+28
| | | |
| * | | Tap for Esc, hold for ControlJeeBak Kim2016-07-301-30/+33
| | | |
| * | | Add "jeebak" keymap folder as a copy of the "default" folderJeeBak Kim2016-07-303-0/+341
| |/ /
* | | Moved PREVENT_STUCK_MODIFIERS to config.hJoshua T2016-07-302-3/+3
| | |
* | | Moved my Ergodox keymap to match upstream changesJoshua T2016-07-302-8/+10
| | |
* | | Merge remote-tracking branch 'upstream/master'Joshua T2016-07-30234-1700/+2992
|\| |
| * | Update some obsolete referencesGergely Nagy2016-07-302-2/+2
| |/ | | | | | | | | | | | | | | | | | | | | Some links were still pointing to `/keyboards/ergodox_ez`, while the directory is `/keyboards/erdogox` now. Not all references have been updated, and some of the text here and there may need updating to mention the ErgoDox Infinity too, but that's out of the scope for this quick fix. Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
| * Small fix for infinity include guardFred Sundvik2016-07-291-3/+3
| |
| * Fix typo in the readme.Fred Sundvik2016-07-291-1/+1
| |
| * A couple of more Ergodox readme fixesFred Sundvik2016-07-291-2/+2
| |
| * Unify the ErgoDox EZ and Infinity documentationFred Sundvik2016-07-291-8/+13
| |
| * Refer to the right path in the readmeFred Sundvik2016-07-291-1/+1
| |
| * Move Ergodox readme from ez subfolder to parentFred Sundvik2016-07-291-0/+0
| |
| * Include the main Makefile before including Ergodox infinity driversFred Sundvik2016-07-291-4/+4
| |
| * Move Infinity Ergodox drivers to subproject, and fix makefileFred Sundvik2016-07-2914-2/+2
| |
| * Remove the Infinity Ergodox default keymapFred Sundvik2016-07-292-282/+0
| |
| * Cleanup the townk_osx config.h and make filesFred Sundvik2016-07-292-52/+2
| |
| * Rename supercoder config_user to config.hFred Sundvik2016-07-291-1/+1
| | | | | | | | Also fixup the include path of parent config
| * Fix config.h include guardsFred Sundvik2016-07-292-4/+4
| |