summaryrefslogtreecommitdiff
path: root/keyboards/ergodox
Commit message (Expand)AuthorAge
* Merge pull request #728 from fitzsim/yoruianErez Zukerman2016-09-06
|\
| * Fix ergodox_yoruian XKB namingThomas Fitzsimmons2016-09-06
| * Add new ErgoDox EZ keymap, YORUIANThomas Fitzsimmons2016-09-05
* | Merge pull request #686 from coderkun/coderkun_neo2Erez Zukerman2016-09-05
|\ \
| * | Add box-drawing Unicode characters to keymap “coderkun_neo2”coderkun2016-08-26
| * | Set Unicode input mode and override unicode_input_start() method to keymap ...coderkun2016-08-26
| * | Disable debugging for Ergodox keymap “coderkun_neo2”coderkun2016-08-26
* | | Merge pull request #678 from algernon/ergodox-ez/algernonErez Zukerman2016-09-05
|\ \ \ | |_|/ |/| |
| * | ergodox: Update algernon's keymap to v1.6Gergely Nagy2016-08-24
| |/
* | Merge remote-tracking branch 'upstream/master' into makefile_overhaulFred Sundvik2016-08-26
|\ \
| * \ Merge pull request #664 from linsomniac/infinity_readmeErez Zukerman2016-08-26
| |\ \ | | |/ | |/|
| | * Making the existing firmware link betterSean Reifschneider2016-08-24
| | * Changes based on @fredizzimo review, flashing Infinity detailsSean Reifschneider2016-08-24
| | * Changes from review by @fredizzimo and @XyverzSean Reifschneider2016-08-22
| | * Tweaks after review.Sean Reifschneider2016-08-19
| | * Restructuring of the ergodox README.Sean Reifschneider2016-08-19
| | * Noting the change directory.Sean Reifschneider2016-08-19
| | * Adding submodule note.Sean Reifschneider2016-08-19
| | * Adding nicer Infinity build instructions.Sean Reifschneider2016-08-19
* | | Merge remote-tracking branch 'upstream/master' into makefile_overhaulFred Sundvik2016-08-24
|\| |
| * | Merge pull request #677 from SmackleFunky/masterJack Humbert2016-08-23
| |\ \
| | * | move to ergodox-ez onlyJason Green2016-08-23
| | * | Remove unneeded includeJason Green2016-08-23
| | * | add missing #includeJason Green2016-08-23
| | * | TxBolt (Steno) Serial protocol for Ergodox EzJason Green2016-08-23
* | | | Merge branch 'master' into makefile_overhaulFred Sundvik2016-08-23
|\| | |
| * | | Add default swap configs for a couple of boards.Joe Wasson2016-08-20
| |/ /
| * | Merge pull request #665 from linsomniac/keymap_jafoJack Humbert2016-08-20
| |\ \
| | * | Bringing over changes from default map.Sean Reifschneider2016-08-19
| | * | Adding jafo layout.Sean Reifschneider2016-08-19
| | |/
| * | Merge pull request #658 from Xyverz/masterJack Humbert2016-08-20
| |\ \
| | * | Changed the Ergodox keymap to use the KEYMAP() macro, updated readme.md.Xyverz2016-08-19
| | * | Changed my keymap to match normal keymaps.Xyverz2016-08-19
| | * | Added compatibility for the Infinity ErgoDox to my Ergodox keymap.Xyverz2016-08-18
| | |/
| * | Merge pull request #630 from nrrkeene/masterJack Humbert2016-08-20
| |\ \ | | |/ | |/|
| | * The Ordinary Layout is boring because all the keys are where you expect them ...Nicholas Keene2016-08-19
| | * The Ordinary Layout is boring because all the keys are where you expect them ...Nicholas Keene2016-08-19
| | * The Ordinary Layout is the unsurprising layoutNicholas Keene2016-08-13
* | | Update keyboard readme files with new makefile instructionsFred Sundvik2016-08-20
* | | Split subproject make files into Makefile and rules.mkFred Sundvik2016-08-20
* | | Split keyboard makefiles into rules and MakefileFred Sundvik2016-08-20
|/ /
* | One last change to the readme.Xyverz2016-08-18
* | One last formatting changeXyverz2016-08-18
* | more formatting changesXyverz2016-08-18
* | Hopefully this fixes the layout diagrams.Xyverz2016-08-18
* | Added a readme, tidied up comments in the keymap.Xyverz2016-08-18
* | Merge branch 'master' of https://github.com/Xyverz/qmk_firmwareXyverz2016-08-17
|\ \
| * | Update readme.mdXyverz2016-08-17
| * | Create readme.mdXyverz2016-08-17
* | | tap-dance: Major rework, to make it more reliableGergely Nagy2016-08-17
|/ /