summaryrefslogtreecommitdiffstats
path: root/keyboards/ergodox
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | [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
| * | Merged keymap for Ergodox EZ & InfinityAndreas Schmidt2017-01-216-0/+1136
| * | Add Swiss German layout for Ergodox InfinityAndreas Schmidt2017-01-216-0/+1112
| * | Add Swiss German layout for Ergodox EZAndreas Schmidt2017-01-216-0/+1121
* | | Merge pull request #1022 from lucwastiaux/masterJack Humbert2017-01-222-13/+48
|\ \ \ | |/ / |/| |
| * | document BRACKETS and SHELL_LAYERlucwastiaux2017-01-221-1/+6
| * | make shell layer more compatible with default layerlucwastiaux2017-01-211-15/+16
| * | couple of changes to the shell layerlucwastiaux2017-01-211-4/+4
| * | introduce shell_layerlucwastiaux2017-01-191-3/+31
| * | put shell nav under tab, introduce an OSL for the brackets layerlucwastiaux2017-01-171-4/+5
| * | enable brackets using the - key on the right, and cleanupslucwastiaux2016-12-151-8/+8
* | | Merge pull request #999 from deadcyclo/masterJack Humbert2017-01-155-0/+26
|\ \ \
| * | | 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
| |\ \ \
| * | | | Added layer images to deadcyclo layout readmeBrendan Johan Lee2017-01-105-0/+26
* | | | | Merge pull request #1007 from bryan4887/bryanJack Humbert2017-01-151-0/+226
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Added Bryan's keymapBryan Hernandez2017-01-131-0/+226
* | | | | 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