summaryrefslogtreecommitdiffstats
path: root/keyboards/ergodox
Commit message (Expand)AuthorAgeFilesLines
* Fixed incorrect layer image in deadcyclo readmeBrendan Johan Lee2017-01-101-1/+1
* Merge remote-tracking branch 'upstream/master'Brendan Johan Lee2017-01-1011-1/+1643
|\
| * Merged from upstreamJoshua T2017-01-0786-449/+5505
| |\
| | * new file: keyboards/ergodox/keymaps/ishigoya-jp/img/keyboard-layout-enL.pngishigoya2017-01-065-3/+57
| | * 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
| | |\
| | | * 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 la...Daniel2016-09-022-25/+57
| | | * adds Hyper key. improves media layer. first attempt at tap dance.Daniel2016-09-012-35/+43
| | | * Merge remote-tracking branch 'upstream/master'Daniel2016-08-3134-1717/+2900
| | | |\
| | | * | 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
| * | | | Increased TAPPING_TERM to 200Joshua T2017-01-061-1/+3
| * | | | Fixed key not matching its diagramJoshua T2017-01-061-1/+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
| * | | | Merge remote-tracking branch 'upstream/master'Joshua T2016-10-1560-994/+4052
| |\ \ \ \
| * \ \ \ \ Merge remote-tracking branch 'upstream/master'Joshua T2016-09-017-205/+329
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| * | | | | Merge remote-tracking branch 'upstream/master'Joshua T2016-08-2427-1512/+2571
| |\ \ \ \ \
| * | | | | | 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
| * | | | | | Merge remote-tracking branch 'upstream/master'Joshua T2016-08-0713-45/+1321
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| * | | | | | Moved my Ergodox keymap to match upstream changesJoshua T2016-07-302-0/+379
* | | | | | | Added layer images to deadcyclo layout readmeBrendan Johan Lee2017-01-105-0/+26
| |_|_|_|_|/ |/| | | | |
* | | | | | 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
* | | | | | Update config.hJack Humbert2017-01-021-1/+1
* | | | | | ergodox: Update algernon's keymap to v1.10Gergely Nagy2016-12-283-6/+21
* | | | | | Update readme.mdErez Zukerman2016-12-211-1/+1
* | | | | | Update readme.mdErez Zukerman2016-12-211-5/+4
* | | | | | updates readmeErez Zukerman2016-12-211-1/+4
* | | | | | New default firmware graphicErez Zukerman2016-12-211-0/+0
* | | | | | Merge branch 'master' of github.com:jackhumbert/qmk_firmwareJack Humbert2016-12-196-82/+269
|\ \ \ \ \ \
| * | | | | | Flips off MIDI and API_SYSEXErez Zukerman2016-12-192-2/+2
| * | | | | | Merge pull request #958 from pvinis/masterJack Humbert2016-12-181-12/+12
| |\ \ \ \ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-14 21:38:12 +0000