summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master'xyverz2017-01-08116-2714/+24308
|\
| * Merge pull request #994 from priyadi/unicode_mods_fixJack Humbert2017-01-081-8/+33
| |\ | | | | | | Unregister all mods before inputting Unicode, and reregister afterwards
| | * Unregister all mods before inputting Unicode, and reregister afterwardsPriyadi Iman Nurcahyo2017-01-091-8/+33
| | |
| * | Merge pull request #993 from priyadi/greek_layerJack Humbert2017-01-082-5/+193
| |\ \ | | | | | | | | Greek alphabet layer
| | * | Greek alphabet layerPriyadi Iman Nurcahyo2017-01-091-4/+183
| | | |
| | * | Merge branch 'promethium' of github.com:priyadi/qmk_firmware into promethiumPriyadi Iman Nurcahyo2017-01-090-0/+0
| | |\ \
| | | * | om telolet omPriyadi Iman Nurcahyo2017-01-082-1/+10
| | | | |
| | * | | om telolet omPriyadi Iman Nurcahyo2017-01-082-1/+10
| | | |/ | | |/|
| * | | Merge pull request #990 from replicaJunction/masterJack Humbert2017-01-0812-22/+536
| |\ \ \ | | |/ / | |/| | Update replicaJunction keymap
| | * | Removed build.batJoshua T2017-01-071-51/+0
| | | | | | | | | | | | | | | | Make.exe is easy enough to use, and there's no real sense in having a wrapper aroung it.
| | * | Merged from upstreamJoshua T2017-01-07336-3127/+39980
| | |\ \ | | |/ / | |/| |
| * | | Merge pull request #989 from ishigoya/masterJack Humbert2017-01-065-0/+1016
| |\ \ \ | | | | | | | | | | Keymap
| | * | | new file: keyboards/ergodox/keymaps/ishigoya-jp/img/keyboard-layout-enL.pngishigoya2017-01-065-3/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | new file: keyboards/ergodox/keymaps/ishigoya-jp/img/keyboard-layout-jpL.png new file: keyboards/ergodox/keymaps/ishigoya-jp/img/keyboard-layout-numL.png modified: keyboards/ergodox/keymaps/ishigoya-jp/keymap.c new file: keyboards/ergodox/keymaps/ishigoya-jp/readme.md
| | * | | 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
| |\ \ \ | | | | | | | | | | adds personal keymap for ergodox optimized for macOS with Vim
| | * | | 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 ↵Daniel2016-09-022-25/+57
| | | | | | | | | | | | | | | | | | | | layer.
| | * | | 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
| |\ \ \ \ \ | | | | | | | | | | | | | | Added the deadcyclo layout
| | * | | | | 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 Planck
| | * | | | | 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 AMJPAD
| | * | | | | 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 mistake
| | * | | | | 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
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix makefile on cygwin
| | * | | | | | Clean up the SKIP_GIT codeFred Sundvik2016-12-291-17/+2
| | | | | | | |
| | * | | | | | Remove extra parenthesis from MakefileFred Sundvik2016-12-291-1/+1
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | Cygwin had trouble running the tests
| * | | | | | Merge pull request #973 from Wilba6582/keycode_refactorJack Humbert2016-12-304-314/+331
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Keycode refactor
| | * | | | | | 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.10
| | * | | | | | | ergodox: Update algernon's keymap to v1.10Gergely Nagy2016-12-283-6/+21
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Miscellaneous ============= * `µ` can now be entered with UCIS. * `™` can now be entered with UCIS. Tools ===== * `tools/hid-commands` can now find Banshee, and prefers it over Kodi. * `tools/hid-commands` can now find Chrome too, not juts Chromium. Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
| * | | | | | | Merge pull request #974 from fredizzimo/remove_malloc_from_sysexJack Humbert2016-12-304-27/+71
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | API Sysex fixes
| | * | | | | | | API Sysex fixesFred Sundvik2016-12-294-27/+71
| | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix memory leaks by using stack instead of malloc Reduce memory usage by having less temporary bufffers Remove warnings by adding includes Decrease code size by 608 bytes (mostly due to not linking malloc) More robust handling of buffer overflows
| * | | | | | | Merge pull request #972 from mechkeys/rgb_compatJack Humbert2016-12-292-0/+3
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | Add extern for 'led' global, set 'weak' attribute for rgblight_set()
| | * | | | | | 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
| | |/ / / / /
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-21 15:25:57 +0000