summaryrefslogtreecommitdiffstats
path: root/keyboards/ergodox
Commit message (Expand)AuthorAgeFilesLines
* Fixed minor error in ergodox infinity section.Joshua Colbeck2017-03-071-1/+1
* Merge pull request #1121 from Leszek111/masterJack Humbert2017-02-275-0/+280
|\
| * Ammend readme.md2017-02-271-2/+4
| * Add colemak_programmer2017-02-275-0/+278
* | Merge pull request #1113 from kesslern/masterJack Humbert2017-02-212-0/+240
|\ \
| * | Add dvorak_emacs_software layout for ergodoxNathan Kessler2017-02-202-0/+240
* | | Merge remote-tracking branch 'qmk/master'Josh Colbeck2017-02-211-13/+21
|/ /
* | remove more warningsJack Humbert2017-02-162-0/+3
* | Merge pull request #1105 from nrrkeene/masterJack Humbert2017-02-168-80/+165
|\ \
| * | The Ordinary Layout has all the keys in the right places.Nicholas Keene2017-02-151-1/+1
| * | This is the best layout, really, come lookNicholas Keene2017-02-151-4/+4
| * | The Ordinary Layout is the best one, the one you are looking for. Really. Che...Nicholas Keene2017-02-154-29/+43
| * | The Ordinary Layout is boring, normal, typical, expected.Nicholas Keene2017-02-142-54/+125
| * | The Ordinary Layout has a feature for one-handed chorded typingNicholas Keene2017-02-142-3/+3
| * | All my friends us The Ordinary Layout because it doesn't force you to change ...Nicholas Keene2017-02-142-4/+4
| * | The Ordinary Layout now has more symbols on the Symbols layer! So useful!Nicholas Keene2017-02-142-11/+11
* | | updated readmeluc wastiaux2017-02-131-1/+1
* | | Merge remote-tracking branch 'upstream/master'luc wastiaux2017-02-1322-146/+1298
|\| |
| * | [Typo] correct link to default keymap in readme.Rob Rogers2017-02-091-1/+1
| * | Add missing header to ergodox ordinary keymapNikolaus Wittenstein2017-02-031-0/+1
| * | Fix compile warnings in egodox robot_test_layoutNikolaus Wittenstein2017-02-031-4/+4
| * | Merge remote-tracking branch 'upstream/master'Brendan Johan Lee2017-02-015-30/+900
| |\ \
| | * \ Merge pull request #1039 from zabereer/albert_ergodox_keymapErez Zukerman2017-01-314-0/+866
| | |\ \
| | | * | albert ergodox keymapAlbert Pretorius2017-01-264-0/+866
| | * | | update my neo2 keymapMatthias Schmitt2017-01-301-30/+34
| * | | | [deadcyclo layout] Refactoring. Use custom functions and macrosBrendan Johan Lee2017-01-301-237/+266
| * | | | [deadcyclo layout] fixed failing testsBrendan Johan Lee2017-01-301-16/+1
| * | | | Merge remote-tracking branch 'upstream/master'Brendan Johan Lee2017-01-278-9/+9
| |\| | |
| | * | | replace jackhumbert with qmkJack Humbert2017-01-268-9/+9
| | |/ /
| * | | [deadcyclo layout] Added more unicode keys and ibus unicode compose trigger keysBrendan Johan Lee2017-01-274-23/+26
| * | | [deadcyclo layout] Added lotsof new emojis and some new unicode keysBrendan Johan Lee2017-01-253-11/+178
| * | | Merge remote-tracking branch 'upstream/master'Brendan Johan Lee2017-01-242-5/+5
| |\| |
| * | | [deadcyclo layout] Added unicode layerBrendan Johan Lee2017-01-245-27/+98
| * | | [deadcyclo layout] Added support for ergodox ez shineBrendan Johan Lee2017-01-244-14/+40
* | | | change thumb cluster key to be shiftluc wastiaux2017-02-131-2/+2
* | | | made left shift an MO for SHELL_NAVluc wastiaux2017-02-103-45/+9
* | | | increase timeout for dual mode caps keylucwastiaux2017-02-011-1/+1
* | | | eliminate references to shell_layerlucwastiaux2017-01-281-1/+1
* | | | documented dual mode capslocklucwastiaux2017-01-282-27/+3
* | | | dual capslock functionality, activating shell nav or bracketslucwastiaux2017-01-271-3/+20
| |/ / |/| |
* | | turn off rgb_midi in ezJack Humbert2017-01-232-5/+5
|/ /
* | Merge pull request #1020 from remigius42/masterJack Humbert2017-01-226-0/+1157
|\ \
| * | SG Ergodox layout: Updated layout documentationAndreas Schmidt2017-01-223-4/+12
| * | SG Ergodox layout: Fixed ENTER key mappingAndreas Schmidt2017-01-221-2/+2
| * | SG Ergodox layout: Minor code formatting changesAndreas Schmidt2017-01-221-1/+1
| * | SG Ergodox layout: Add ENTER to left keyboardAndreas Schmidt2017-01-221-2/+2
| * | SG Ergodox layout: Add <br/> macro to media layerAndreas Schmidt2017-01-221-2/+14
| * | Renamed JSON source of Ergodox Swiss GermanAndreas Schmidt2017-01-212-1/+1
| * | Correct layout description of ergodox swissgermanAndreas Schmidt2017-01-212-15/+16
| * | Removed Ergodox EZ & Infinity specific keymapsAndreas Schmidt2017-01-2112-2233/+0