Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | * | | | | | Added another Shift on Extend layer. | Joshua T | 2017-01-07 | 1 | -8/+8 | |
| | * | | | | | Updated Atreus layout to 0.4 | Joshua T | 2017-01-06 | 1 | -26/+28 | |
| | * | | | | | 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 VS Code dir to .gitignore | Joshua T | 2016-10-15 | 1 | -0/+1 | |
| | * | | | | | 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 | |
| | * | | | | | Reduced TAPPING_TERM to 150 | Joshua T | 2016-10-15 | 1 | -4/+2 | |
| | * | | | | | Added Ctrl+` (ConEmu shortcut) | Joshua T | 2016-10-15 | 1 | -1/+1 | |
| | * | | | | | Merge remote-tracking branch 'upstream/master' | Joshua T | 2016-10-15 | 192 | -2351/+10300 | |
| | |\ \ \ \ \ | ||||||
| | * \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' | Joshua T | 2016-09-01 | 237 | -10442/+14521 | |
| | |\ \ \ \ \ \ | ||||||
| | * | | | | | | | 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 | 219 | -3936/+16346 | |
| | |\ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | Several key placement fixes. | Joshua T | 2016-08-24 | 8 | -11/+21 | |
| | * | | | | | | | | Minor changes to Extend and Number layers. | Joshua T | 2016-08-16 | 3 | -10/+10 | |
| | * | | | | | | | | Moved Shift keys to Z and ? | Joshua T | 2016-08-09 | 1 | -9/+9 | |
| | * | | | | | | | | Created build.bat | Joshua T | 2016-08-09 | 1 | -0/+51 | |
| | * | | | | | | | | Merged branch master into master | Joshua T | 2016-08-09 | 28 | -168/+1575 | |
| | |\ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | Changed left thumb back to Ctrl/Alt | Joshua T | 2016-08-09 | 1 | -11/+8 | |
| | * | | | | | | | | | 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 | |
| | * | | | | | | | | | Created keymap local config.h file | Joshua T | 2016-08-09 | 2 | -4/+95 | |
| | * | | | | | | | | | Merge remote-tracking branch 'upstream/master' | Joshua T | 2016-08-07 | 35 | -612/+2743 | |
| | |\ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | Moved PREVENT_STUCK_MODIFIERS to config.h | Joshua T | 2016-07-30 | 2 | -3/+3 | |
| | * | | | | | | | | | | Moved my Ergodox keymap to match upstream changes | Joshua T | 2016-07-30 | 2 | -8/+10 | |
| | * | | | | | | | | | | Merge remote-tracking branch 'upstream/master' | Joshua T | 2016-07-30 | 245 | -1742/+3096 | |
| | |\ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' | Joshua T | 2016-07-26 | 97 | -431/+6775 | |
| | |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | Modified Atreus extend and Ergodox. | Joshua T | 2016-07-26 | 5 | -179/+151 | |
| | * | | | | | | | | | | | | Created readme and added screenshots | Joshua T | 2016-07-20 | 6 | -15/+74 | |
| | * | | | | | | | | | | | | Modified Atreus layout to account for keymap() function | Joshua T | 2016-07-19 | 1 | -30/+30 | |
| | * | | | | | | | | | | | | Adjusted Atreus KEYMAP() function. | Joshua T | 2016-07-19 | 1 | -5/+5 | |
| | * | | | | | | | | | | | | Added Gaming layer and removed Dvorak | Joshua T | 2016-07-19 | 1 | -23/+23 | |
| | * | | | | | | | | | | | | Merge branch 'master' of https://github.com/replicaJunction/qmk_firmware | Joshua T | 2016-07-15 | 0 | -0/+0 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | Added default layer switch QWERTY to Colemak | Joshua T | 2016-07-15 | 1 | -3/+3 | |
| | * | | | | | | | | | | | | | Added default layer switch QWERTY to Colemak | Joshua T | 2016-07-15 | 1 | -3/+5 | |
| | |/ / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | Fixed a merge conflict | Joshua T | 2016-07-15 | 1 | -9/+0 | |
| | * | | | | | | | | | | | | Merge remote-tracking branch 'upstream/master' | Joshua T | 2016-07-15 | 4 | -10/+229 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ | Corrected merge conflict | Joshua T | 2016-07-13 | 1 | -0/+7 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | | Created replicaJunction keymaps. | Joshua T | 2016-07-11 | 2 | -0/+489 | |
| | * | | | | | | | | | | | | | | Created replicaJunction keymaps. | Joshua T | 2016-07-13 | 2 | -0/+503 | |
| | |/ / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | Merge pull request #15 from jackhumbert/master | Damien | 2017-01-07 | 69 | -2383/+21443 | |
|\| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Merge pull request #989 from ishigoya/master | Jack Humbert | 2017-01-06 | 5 | -0/+1016 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | new file: keyboards/ergodox/keymaps/ishigoya-jp/img/keyboard-layout-enL.png | ishigoya | 2017-01-06 | 5 | -3/+57 |