summaryrefslogtreecommitdiffstats
path: root/keyboards/ergodox
AgeCommit message (Collapse)AuthorFilesLines
2017-03-04Merge remote-tracking branch 'upstream/master'Xyverz8-13/+541
2017-02-28Merge pull request #1121 from Leszek111/masterJack Humbert5-0/+280
add layout
2017-02-27Ammend readme.md1-2/+4
2017-02-27Add colemak_programmer5-0/+278
2017-02-22Merge pull request #1113 from kesslern/masterJack Humbert2-0/+240
Add dvorak_emacs_software layout for ergodox
2017-02-22Merge remote-tracking branch 'qmk/master'Josh Colbeck336-0/+40740
2017-02-21Merge remote-tracking branch 'upstream/master'Xyverz13-141/+186
2017-02-21Add dvorak_emacs_software layout for ergodoxNathan Kessler2-0/+240
2017-02-16remove more warningsJack Humbert2-0/+3
2017-02-16Merge pull request #1105 from nrrkeene/masterJack Humbert8-80/+165
The Ordinary Layout v5
2017-02-16The Ordinary Layout has all the keys in the right places.Nicholas Keene1-1/+1
2017-02-16This is the best layout, really, come lookNicholas Keene1-4/+4
2017-02-16The Ordinary Layout is the best one, the one you are looking for. Really. ↵Nicholas Keene4-29/+43
Check it out.
2017-02-15The Ordinary Layout is boring, normal, typical, expected.Nicholas Keene2-54/+125
2017-02-15The Ordinary Layout has a feature for one-handed chorded typingNicholas Keene2-3/+3
2017-02-15All my friends us The Ordinary Layout because it doesn't force you to change ↵Nicholas Keene2-4/+4
you typing habits
2017-02-15The Ordinary Layout now has more symbols on the Symbols layer! So useful!Nicholas Keene2-11/+11
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-11Merge remote-tracking branch 'upstream/master'Xyverz32-164/+2508
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