summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fixed incorrect layer image in deadcyclo readmeBrendan Johan Lee2017-01-101-1/+1
|
* Merge remote-tracking branch 'upstream/master'Brendan Johan Lee2017-01-1024-35/+2265
|\
| * 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
| * \ \ \ \ \ 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
| |/ / / / / /
| | | | | * | Updated README and images to reflect latest keymapJoshua T2017-01-077-6/+10
| | | | | | |
| | | | | * | Added another Shift on Extend layer.Joshua T2017-01-071-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This moves the GUI key to the pinkie, but honestly, I never use that function anyway.
| | | | | * | Updated Atreus layout to 0.4Joshua T2017-01-061-26/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed Alt on base layer, replaced with Function layer. Moved function keys to left hand. Added mouse keys to right hand on the function layer. Moved middle click on gaming layer to be consistent with mouse layer. Added macro _USER. Macro contents are not implemented yet.
| | | | | * | Increased TAPPING_TERM to 200Joshua T2017-01-061-1/+3
| | | | | | |
| | | | | * | Fixed key not matching its diagramJoshua T2017-01-061-1/+1
| | | | | | |
| | | | | * | Added comments with ASCII art keymapsJoshua T2016-10-241-1/+105
| | | | | | |
| | | | | * | Added VS Code dir to .gitignoreJoshua T2016-10-151-0/+1
| | | | | | |
| | | | | * | Added a bit more detail to headerJoshua T2016-10-151-24/+27
| | | | | | |
| | | | | * | Reversed tilde and graveJoshua T2016-10-151-4/+4
| | | | | | |
| | | | | * | Moved Extend tab and ^tabJoshua T2016-10-151-2/+2
| | | | | | |
| | | | | * | Added = to match AtreusJoshua T2016-10-151-4/+4
| | | | | | |
| | | | | * | Switched Tab and Ctrl backJoshua T2016-10-151-7/+7
| | | | | | |
| | | | | * | Fixed typoJoshua T2016-10-151-1/+1
| | | | | | |
| | | | | * | Added Menu key (the rclick menu)Joshua T2016-10-151-4/+4
| | | | | | |
| | | | | * | Updated layout to 1.2 - lots of changesJoshua T2016-10-151-112/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rewrote QWERTY to make it a first-class citizen instead of just a glorified game layer. Added a lot of keys to Extend layer to bring it in line with my Atreus. Plenty of other changes too.
| | | | | * | Reduced TAPPING_TERM to 150Joshua T2016-10-151-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Also removed duplicate definition of PREVENT_STUCK_MODIFIERS
| | | | | * | Added Ctrl+` (ConEmu shortcut)Joshua T2016-10-151-1/+1
| | | | | | |
| | | | | * | Merge remote-tracking branch 'upstream/master'Joshua T2016-10-15192-2351/+10300
| | | | | |\ \
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-26 09:02:52 +0000