summaryrefslogtreecommitdiffstats
path: root/keyboards/ergodox
AgeCommit message (Collapse)AuthorFilesLines
2017-02-13updated readmeluc wastiaux1-1/+1
2017-02-13Merge remote-tracking branch 'upstream/master'luc wastiaux22-146/+1298
2017-02-13change thumb cluster key to be shiftluc wastiaux1-2/+2
2017-02-10made left shift an MO for SHELL_NAVluc wastiaux3-45/+9
2017-02-09[Typo] correct link to default keymap in readme.Rob Rogers1-1/+1
2017-02-04Add missing header to ergodox ordinary keymapNikolaus Wittenstein1-0/+1
2017-02-04Fix compile warnings in egodox robot_test_layoutNikolaus Wittenstein1-4/+4
Fixes the warning "right shift count >= width of type" by adding UL to the end of constants.
2017-02-01Merge remote-tracking branch 'upstream/master'Brendan Johan Lee5-30/+900
2017-02-01increase timeout for dual mode caps keylucwastiaux1-1/+1
2017-02-01Merge pull request #1039 from zabereer/albert_ergodox_keymapErez Zukerman4-0/+866
albert ergodox keymap
2017-01-30update my neo2 keymapMatthias Schmitt1-30/+34
2017-01-30[deadcyclo layout] Refactoring. Use custom functions and macrosBrendan Johan Lee1-237/+266
2017-01-30[deadcyclo layout] fixed failing testsBrendan Johan Lee1-16/+1
2017-01-28eliminate references to shell_layerlucwastiaux1-1/+1
2017-01-28documented dual mode capslocklucwastiaux2-27/+3
2017-01-27dual capslock functionality, activating shell nav or bracketslucwastiaux1-3/+20
2017-01-27Merge remote-tracking branch 'upstream/master'Brendan Johan Lee8-9/+9
2017-01-27[deadcyclo layout] Added more unicode keys and ibus unicode compose trigger keysBrendan Johan Lee4-23/+26
2017-01-26albert ergodox keymapAlbert Pretorius4-0/+866
2017-01-26replace jackhumbert with qmkJack Humbert8-9/+9
2017-01-25[deadcyclo layout] Added lotsof new emojis and some new unicode keysBrendan Johan Lee3-11/+178
2017-01-24Merge remote-tracking branch 'upstream/master'Brendan Johan Lee2-5/+5
2017-01-24[deadcyclo layout] Added unicode layerBrendan Johan Lee5-27/+98
2017-01-24[deadcyclo layout] Added support for ergodox ez shineBrendan Johan Lee4-14/+40
2017-01-23turn off rgb_midi in ezJack Humbert2-5/+5
2017-01-23Merge pull request #1020 from remigius42/masterJack Humbert6-0/+1157
Swiss German layout for Ergodox EZ & Infinity
2017-01-23Merge pull request #1022 from lucwastiaux/masterJack Humbert2-13/+48
Improvements to Dvorak Programmer Ergodox keymap
2017-01-22SG Ergodox layout: Updated layout documentationAndreas Schmidt3-4/+12
- Swiss German Ergodox layout: Updated layout documentation based on previous layout changes.
2017-01-22SG Ergodox layout: Fixed ENTER key mappingAndreas Schmidt1-2/+2
- Swiss German Ergodox layout: Additional ENTER key was mapped to wrong layer and keyboard half.
2017-01-22SG Ergodox layout: Minor code formatting changesAndreas Schmidt1-1/+1
- Swiss German Ergodox layout: Removed unnecessary spaces.
2017-01-22SG Ergodox layout: Add ENTER to left keyboardAndreas Schmidt1-2/+2
- Swiss German Ergodox layout: Added ENTER key to left keyboard half on media layer such that the enter key is available on both halves to be able to flash both halves without an additional keyboard.
2017-01-22SG Ergodox layout: Add <br/> macro to media layerAndreas Schmidt1-2/+14
- Added <br/> macro to media layer of Swiss German layout for Ergodox
2017-01-22document BRACKETS and SHELL_LAYERlucwastiaux1-1/+6
2017-01-21Renamed JSON source of Ergodox Swiss GermanAndreas Schmidt2-1/+1
- Renamed the JSON source files for the layout description of the Ergodox Swiss German keymap
2017-01-21Correct layout description of ergodox swissgermanAndreas Schmidt2-15/+16
- Added missing HTML macros to media layer.
2017-01-21Removed Ergodox EZ & Infinity specific keymapsAndreas Schmidt12-2233/+0
- Removed the keymaps for Swiss German spefic for Ergodox EZ and Infinity after previously merging them.
2017-01-21Merged keymap for Ergodox EZ & InfinityAndreas Schmidt6-0/+1136
- Merged keymap for Ergodox EZ & Infinity into one single keymap using pre-processor macros.
2017-01-21make shell layer more compatible with default layerlucwastiaux1-15/+16
2017-01-21Add Swiss German layout for Ergodox InfinityAndreas Schmidt6-0/+1112
- Add Swiss German layout for Ergodox Infinity based on default layout for Ergodox EZ. - Minor changes in the event loop to prevent flashing display background lights.
2017-01-21Add Swiss German layout for Ergodox EZAndreas Schmidt6-0/+1121
- Add Swiss German layout for Ergodox EZ based on default layout for Ergodox EZ. - Minor changes in the event loop to prevent flashing of leds.
2017-01-21couple of changes to the shell layerlucwastiaux1-4/+4
2017-01-19introduce shell_layerlucwastiaux1-3/+31
2017-01-17put shell nav under tab, introduce an OSL for the brackets layerlucwastiaux1-4/+5
2017-01-15Merge pull request #999 from deadcyclo/masterJack Humbert5-0/+26
Adds layer images to the deadcyclo layout readme
2017-01-15Merge pull request #1007 from bryan4887/bryanJack Humbert1-0/+226
Added Bryan's keymap
2017-01-14Added Bryan's keymapBryan Hernandez1-0/+226
2017-01-10Fixed incorrect layer image in deadcyclo readmeBrendan Johan Lee1-1/+1
2017-01-10Merge remote-tracking branch 'upstream/master'Brendan Johan Lee11-1/+1643
2017-01-10Added layer images to deadcyclo layout readmeBrendan Johan Lee5-0/+26
2017-01-07Merged from upstreamJoshua T86-449/+5505