summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | | | Added another Shift on Extend layer.Joshua T2017-01-071-8/+8
| | * | | | | Updated Atreus layout to 0.4Joshua T2017-01-061-26/+28
| | * | | | | 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
| | * | | | | Reduced TAPPING_TERM to 150Joshua T2016-10-151-4/+2
| | * | | | | Added Ctrl+` (ConEmu shortcut)Joshua T2016-10-151-1/+1
| | * | | | | Merge remote-tracking branch 'upstream/master'Joshua T2016-10-15192-2351/+10300
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge remote-tracking branch 'upstream/master'Joshua T2016-09-01237-10442/+14521
| | |\ \ \ \ \ \
| | * | | | | | | Fixed getting "stuck" in gaming layerJoshua T2016-08-241-1/+1
| | * | | | | | | Merge remote-tracking branch 'upstream/master'Joshua T2016-08-24219-3936/+16346
| | |\ \ \ \ \ \ \
| | * | | | | | | | Several key placement fixes.Joshua T2016-08-248-11/+21
| | * | | | | | | | Minor changes to Extend and Number layers.Joshua T2016-08-163-10/+10
| | * | | | | | | | Moved Shift keys to Z and ?Joshua T2016-08-091-9/+9
| | * | | | | | | | Created build.batJoshua T2016-08-091-0/+51
| | * | | | | | | | Merged branch master into masterJoshua T2016-08-0928-168/+1575
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | Changed left thumb back to Ctrl/AltJoshua T2016-08-091-11/+8
| | * | | | | | | | | Created keymap-specific config.hJoshua T2016-08-091-0/+63
| | * | | | | | | | | Reverted Ergodox config.hJoshua T2016-08-091-1/+1
| | * | | | | | | | | Created keymap local config.h fileJoshua T2016-08-092-4/+95
| | * | | | | | | | | Merge remote-tracking branch 'upstream/master'Joshua T2016-08-0735-612/+2743
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | 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-30245-1742/+3096
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master'Joshua T2016-07-2697-431/+6775
| | |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Modified Atreus extend and Ergodox.Joshua T2016-07-265-179/+151
| | * | | | | | | | | | | | Created readme and added screenshotsJoshua T2016-07-206-15/+74
| | * | | | | | | | | | | | Modified Atreus layout to account for keymap() functionJoshua T2016-07-191-30/+30
| | * | | | | | | | | | | | Adjusted Atreus KEYMAP() function.Joshua T2016-07-191-5/+5
| | * | | | | | | | | | | | Added Gaming layer and removed DvorakJoshua T2016-07-191-23/+23
| | * | | | | | | | | | | | Merge branch 'master' of https://github.com/replicaJunction/qmk_firmwareJoshua T2016-07-150-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | Added default layer switch QWERTY to ColemakJoshua T2016-07-151-3/+3
| | * | | | | | | | | | | | | Added default layer switch QWERTY to ColemakJoshua T2016-07-151-3/+5
| | |/ / / / / / / / / / / /
| | * | | | | | | | | | | | Fixed a merge conflictJoshua T2016-07-151-9/+0
| | * | | | | | | | | | | | Merge remote-tracking branch 'upstream/master'Joshua T2016-07-154-10/+229
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ Corrected merge conflictJoshua T2016-07-131-0/+7
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | Created replicaJunction keymaps.Joshua T2016-07-112-0/+489
| | * | | | | | | | | | | | | | Created replicaJunction keymaps.Joshua T2016-07-132-0/+503
| | |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge pull request #15 from jackhumbert/masterDamien2017-01-0769-2383/+21443
|\| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge pull request #989 from ishigoya/masterJack Humbert2017-01-065-0/+1016
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | new file: keyboards/ergodox/keymaps/ishigoya-jp/img/keyboard-layout-enL.pngishigoya2017-01-065-3/+57