summaryrefslogtreecommitdiffstats
path: root/keyboards/ergodox
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #664 from linsomniac/infinity_readmeErez Zukerman2016-08-261-23/+144
|\
| * Making the existing firmware link betterSean Reifschneider2016-08-241-1/+2
| * Changes based on @fredizzimo review, flashing Infinity detailsSean Reifschneider2016-08-241-0/+34
| * Changes from review by @fredizzimo and @XyverzSean Reifschneider2016-08-221-19/+16
| * Tweaks after review.Sean Reifschneider2016-08-191-3/+3
| * Restructuring of the ergodox README.Sean Reifschneider2016-08-191-29/+105
| * Noting the change directory.Sean Reifschneider2016-08-191-0/+1
| * Adding submodule note.Sean Reifschneider2016-08-191-0/+1
| * Adding nicer Infinity build instructions.Sean Reifschneider2016-08-191-0/+11
* | Merge pull request #677 from SmackleFunky/masterJack Humbert2016-08-233-0/+419
|\ \
| * | move to ergodox-ez onlyJason Green2016-08-233-0/+0
| * | Remove unneeded includeJason Green2016-08-231-1/+0
| * | add missing #includeJason Green2016-08-231-0/+1
| * | TxBolt (Steno) Serial protocol for Ergodox EzJason Green2016-08-233-0/+419
* | | Add default swap configs for a couple of boards.Joe Wasson2016-08-201-0/+24
|/ /
* | Merge pull request #665 from linsomniac/keymap_jafoJack Humbert2016-08-205-0/+213
|\ \
| * | Bringing over changes from default map.Sean Reifschneider2016-08-191-4/+3
| * | Adding jafo layout.Sean Reifschneider2016-08-195-0/+214
| |/
* | Merge pull request #658 from Xyverz/masterJack Humbert2016-08-202-209/+211
|\ \
| * | Changed the Ergodox keymap to use the KEYMAP() macro, updated readme.md.Xyverz2016-08-192-17/+10
| * | Changed my keymap to match normal keymaps.Xyverz2016-08-191-314/+198
| * | Added compatibility for the Infinity ErgoDox to my Ergodox keymap.Xyverz2016-08-182-53/+178
| |/
* | Merge pull request #630 from nrrkeene/masterJack Humbert2016-08-2010-275/+237
|\ \ | |/ |/|
| * The Ordinary Layout is boring because all the keys are where you expect them ...Nicholas Keene2016-08-191-1/+1
| * The Ordinary Layout is boring because all the keys are where you expect them ...Nicholas Keene2016-08-198-111/+98
| * The Ordinary Layout is the unsurprising layoutNicholas Keene2016-08-1310-183/+158
* | One last change to the readme.Xyverz2016-08-181-3/+1
* | One last formatting changeXyverz2016-08-181-1/+1
* | more formatting changesXyverz2016-08-181-90/+90
* | Hopefully this fixes the layout diagrams.Xyverz2016-08-181-91/+91
* | Added a readme, tidied up comments in the keymap.Xyverz2016-08-182-29/+147
* | Merge branch 'master' of https://github.com/Xyverz/qmk_firmwareXyverz2016-08-171-0/+5
|\ \
| * | Update readme.mdXyverz2016-08-171-1/+1
| * | Create readme.mdXyverz2016-08-171-0/+5
* | | tap-dance: Major rework, to make it more reliableGergely Nagy2016-08-171-1/+1
|/ /
* | Merge remote-tracking branch 'upstream/master'Xyverz2016-08-136-1237/+1244
|\ \
| * | ergodox: Update my keymap to v1.5Gergely Nagy2016-08-126-1237/+1244
| |/
* | Adding my own layouts for the Phantom and Ergodox. My Ergodox layout adds per...Ian Sterling2016-08-091-0/+311
* | Delete keymap.cXyverz2016-08-081-184/+0
* | Delete old_keymap.cXyverz2016-08-081-311/+0
* | Delete readme.mdXyverz2016-08-081-10/+0
* | Delete dvorak.pngXyverz2016-08-081-0/+0
* | Adding my own keymaps to the following keyboards:Ian Sterling2016-08-084-0/+505
|/
* Merge pull request #592 from sethbc/ez-sethbcErez Zukerman2016-08-023-0/+119
|\
| * rebaseSeth Chandler2016-07-303-0/+119
* | Merge pull request #593 from J3RN/masterErez Zukerman2016-08-022-22/+26
|\ \
| * | Updated readme with recent changesJonathan Arnett2016-07-301-3/+6
| * | Updated my keymapJack Humbert2016-07-302-20/+21
| |\|
* | | Merge pull request #600 from adiabatic/masterErez Zukerman2016-08-024-14/+1167
|\ \ \
| * | | Thumb ⌫ into ⇥, numpad & into :, yank home/endNathan Sharfi2016-07-313-13/+1166
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-01 01:34:06 +0000