Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'upstream/master' | Brendan Johan Lee | 2017-01-10 | 23 | -27/+2232 |
|\ | |||||
| * | Merge pull request #993 from priyadi/greek_layer | Jack Humbert | 2017-01-08 | 2 | -5/+193 |
| |\ | | | | | | | Greek alphabet layer | ||||
| | * | Greek alphabet layer | Priyadi Iman Nurcahyo | 2017-01-09 | 1 | -4/+183 |
| | | | |||||
| | * | om telolet om | Priyadi Iman Nurcahyo | 2017-01-08 | 2 | -1/+10 |
| | | | |||||
| * | | Merged from upstream | Joshua T | 2017-01-07 | 277 | -1030/+35859 |
| |\| | |||||
| | * | new file: keyboards/ergodox/keymaps/ishigoya-jp/img/keyboard-layout-enL.png | ishigoya | 2017-01-06 | 5 | -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.c | ishigoya | 2017-01-06 | 1 | -0/+962 |
| | | | |||||
| | * | Merge pull request #983 from common-nighthawk/master | Jack Humbert | 2017-01-04 | 2 | -0/+222 |
| | |\ | | | | | | | | | adds personal keymap for ergodox optimized for macOS with Vim | ||||
| | | * | reverts change outside of personal keymap. | Daniel | 2017-01-01 | 1 | -2/+1 |
| | | | | |||||
| | | * | adds dedicated double-quote key. | Daniel | 2017-01-01 | 1 | -5/+9 |
| | | | | |||||
| | | * | removes double-tab brackets and adds back quot to left cmd. | Daniel | 2016-12-06 | 1 | -10/+10 |
| | | | | |||||
| | | * | removes the double actions from the metakeys. | Daniel | 2016-11-27 | 1 | -17/+15 |
| | | | | |||||
| | | * | moves brackets to top row. | Daniel | 2016-11-18 | 1 | -9/+9 |
| | | | | |||||
| | | * | moves brackets from J/K to U/I to remove block of common vim sequence. | Daniel | 2016-09-06 | 1 | -8/+8 |
| | | | | |||||
| | | * | adds tap dance and macro to move underscore and l- and r- brackets to base ↵ | Daniel | 2016-09-02 | 2 | -25/+57 |
| | | | | | | | | | | | | | | | | layer. | ||||
| | | * | adds Hyper key. improves media layer. first attempt at tap dance. | Daniel | 2016-09-01 | 2 | -35/+43 |
| | | | | |||||
| | | * | Merge remote-tracking branch 'upstream/master' | Daniel | 2016-08-31 | 340 | -7101/+22090 |
| | | |\ | |||||
| | | * | | minor tweaks to numpad and media layer | Daniel | 2016-08-14 | 1 | -26/+24 |
| | | | | | |||||
| | | * | | completes first-pass at media layer | Daniel | 2016-08-12 | 1 | -15/+15 |
| | | | | | |||||
| | | * | | completes first-pass at symbol layer | Daniel | 2016-08-12 | 1 | -36/+36 |
| | | | | | |||||
| | | * | | completes first-pass at base layer | Daniel | 2016-08-10 | 1 | -0/+183 |
| | | | | | |||||
| | * | | | Merge pull request #984 from deadcyclo/master | Jack Humbert | 2017-01-04 | 2 | -0/+283 |
| | |\ \ \ | | | | | | | | | | | | | Added the deadcyclo layout | ||||
| | * | | | | Added Jeremy’s developers keymap for the Planck | Jeremy Cowgar | 2017-01-04 | 2 | -0/+265 |
| | | | | | | |||||
| * | | | | | Updated README and images to reflect latest keymap | Joshua T | 2017-01-07 | 7 | -6/+10 |
| | | | | | | |||||
| * | | | | | Added another Shift on Extend layer. | Joshua T | 2017-01-07 | 1 | -8/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | This moves the GUI key to the pinkie, but honestly, I never use that function anyway. | ||||
| * | | | | | Updated Atreus layout to 0.4 | Joshua T | 2017-01-06 | 1 | -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 200 | Joshua T | 2017-01-06 | 1 | -1/+3 |
| | | | | | | |||||
| * | | | | | Fixed key not matching its diagram | Joshua T | 2017-01-06 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Added comments with ASCII art keymaps | Joshua T | 2016-10-24 | 1 | -1/+105 |
| | | | | | | |||||
| * | | | | | Added a bit more detail to header | Joshua T | 2016-10-15 | 1 | -24/+27 |
| | | | | | | |||||
| * | | | | | Reversed tilde and grave | Joshua T | 2016-10-15 | 1 | -4/+4 |
| | | | | | | |||||
| * | | | | | Moved Extend tab and ^tab | Joshua T | 2016-10-15 | 1 | -2/+2 |
| | | | | | | |||||
| * | | | | | Added = to match Atreus | Joshua T | 2016-10-15 | 1 | -4/+4 |
| | | | | | | |||||
| * | | | | | Switched Tab and Ctrl back | Joshua T | 2016-10-15 | 1 | -7/+7 |
| | | | | | | |||||
| * | | | | | Fixed typo | Joshua T | 2016-10-15 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Added Menu key (the rclick menu) | Joshua T | 2016-10-15 | 1 | -4/+4 |
| | | | | | | |||||
| * | | | | | Updated layout to 1.2 - lots of changes | Joshua T | 2016-10-15 | 1 | -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 150 | Joshua T | 2016-10-15 | 1 | -4/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | Also removed duplicate definition of PREVENT_STUCK_MODIFIERS | ||||
| * | | | | | Added Ctrl+` (ConEmu shortcut) | Joshua T | 2016-10-15 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Merge remote-tracking branch 'upstream/master' | Joshua T | 2016-10-15 | 154 | -2157/+9342 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' | Joshua T | 2016-09-01 | 182 | -6034/+9444 |
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | |||||
| * | | | | | | Fixed getting "stuck" in gaming layer | Joshua T | 2016-08-24 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Merge remote-tracking branch 'upstream/master' | Joshua T | 2016-08-24 | 168 | -1634/+12955 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | Several key placement fixes. | Joshua T | 2016-08-24 | 8 | -11/+21 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Switched Tab and Super on the default layout * Moved Shift on Extend to pinky * Moved Caps Lock to upper right corner * Moved gaming toggle to avoid blocking Escape | ||||
| * | | | | | | | Minor changes to Extend and Number layers. | Joshua T | 2016-08-16 | 3 | -10/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Brought QWERTY layer in line with normal layer. Removed Undo function, as it interfered with Shift. Moved Tab and Shift-Tab, and added Insert. | ||||
| * | | | | | | | Moved Shift keys to Z and ? | Joshua T | 2016-08-09 | 1 | -9/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of using a thumb shift, I was given the idea of using the pinky keys as dual-role keys that also send the Shift keypress. This gives me a Shift key on each hand again, but it will make me learn to Shift with opposite hands after all. | ||||
| * | | | | | | | Merged branch master into master | Joshua T | 2016-08-09 | 25 | -166/+1489 |
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | | | |||||
| * | | | | | | | Changed left thumb back to Ctrl/Alt | Joshua T | 2016-08-09 | 1 | -11/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | Removed Shift from left thumb | ||||
| * | | | | | | | Created keymap-specific config.h | Joshua T | 2016-08-09 | 1 | -0/+63 |
| | | | | | | | | |||||
| * | | | | | | | Reverted Ergodox config.h | Joshua T | 2016-08-09 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | I will create a separate config.h for my keymap |