summaryrefslogtreecommitdiffstats
path: root/keyboard/ergodox_ez
Commit message (Expand)AuthorAgeFilesLines
* Merge https://github.com/jackhumbert/qmk_firmwareOlivier2016-04-3030-5337/+9928
|\
| * Merge pull request #295 from techtomas/techtomasErez Zukerman2016-04-303-0/+1433
| |\
| | * Added readmeThomas Anderson2016-04-291-0/+36
| | * Finalized my personal layoutThomas Anderson2016-04-292-0/+1397
| * | Adds brackets to inner vertical keys in experimental layoutErez Zukerman2016-04-293-12/+21
| * | Addresses #290Erez Zukerman2016-04-291-1/+1
| |/
| * Honing in on an interval that works for meErez Zukerman2016-04-262-1081/+1081
| * [Erez & Jack] Examples for advanced macro stuffErez Zukerman2016-04-262-1069/+1132
| * Merge pull request #282 from jasontwong/masterErez Zukerman2016-04-254-0/+1399
| |\
| | * Compiled Hex FileJason T. Wong2016-04-241-0/+1159
| | * Update keymap imageJason T. Wong2016-04-231-0/+0
| | * Add new keymapJason T. Wong2016-04-233-0/+240
| * | Add Twey's keymapJames ‘Twey’ Kay2016-04-253-0/+1366
| |/
| * changed the macro generation of the ELG to use UP, DOWN, TYPE instead of U,D,...Stephan Bösebeck2016-04-201-24/+24
| * added some words about the ELG in the readmeStephan Bösebeck2016-04-201-0/+13
| * Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-04-207-1326/+1337
| |\
| | * Merge pull request #267 from nrrkeene/masterErez Zukerman2016-04-207-1326/+1337
| | |\
| | | * The Ordinary Layout is the layout you are looking for. Come and see.Nicholas Keene2016-04-197-96/+96
| | | * The Ordinary Layout is the layout you are looking for. Come and see.Nicholas Keene2016-04-145-1278/+1289
| * | | re-created all layouts using ErgodoxLayoutGeneratorStephan Bösebeck2016-04-195-2546/+2544
| * | | new overview picStephan Bösebeck2016-04-191-0/+0
| * | | added new macro for toggling and holiding layerStephan Bösebeck2016-04-191-16/+48
| * | | new experimental layoutStephan Bösebeck2016-04-192-33/+31
| * | | added smly layer againStephan Bösebeck2016-04-181-2/+2
| * | | new pngStephan Bösebeck2016-04-171-0/+0
| * | | new iteration, change of lower rowStephan Bösebeck2016-04-171-46/+16
| * | | added new experimental layout - works with ErgodoxLayoutGeneratorStephan Bösebeck2016-04-174-392/+687
| * | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-04-1216-1348/+3036
| |\| |
| * | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-04-111-1/+1
| |\ \ \
| * \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-04-067-6/+1618
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-04-042-92/+123
| |\ \ \ \ \
| * | | | | | minor updates - new PNGStephan Bösebeck2016-04-032-16/+20
* | | | | | | Add a macro for Ctrl+Alt+Fx.Olivier2016-04-302-1189/+1202
* | | | | | | Use aliases where available. No firmware change.Olivier2016-04-171-6/+6
* | | | | | | Commit firmware up-to-date with latest upstream qmk_firmware changes.Olivier2016-04-171-972/+996
* | | | | | | Merge https://github.com/jackhumbert/qmk_firmwareOlivier2016-04-1711-1343/+1705
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | Merge pull request #249 from nrrkeene/masterErez Zukerman2016-04-129-1325/+1685
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | * | | | | The Ordinary Layout is the layout you are looking for. Come and see.Nicholas Keene2016-04-111-8/+8
| | * | | | | The Ordinary Layout is the layout you are looking for. Come and see.Nicholas Keene2016-04-113-1129/+1180
| | * | | | | The Ordinary Layout is the layout you are looking for. Come and see.Nicholas Keene2016-04-119-1324/+1633
| * | | | | | Merge pull request #1 from J3RN/vim-navigationJonathan Arnett2016-04-112-18/+20
| |\ \ \ \ \ \
| | * | | | | | Added README note about Vim-style navigationJonathan Arnett2016-04-111-3/+4
| | * | | | | | Stylistic changesJonathan Arnett2016-04-111-1/+1
| | * | | | | | Make a also toggle Media layerJonathan Arnett2016-04-111-1/+1
| | * | | | | | Building a row of level switch buttonsJonathan Arnett2016-03-241-3/+3
| | * | | | | | A to toggle L2, hjkl to move mouseJonathan Arnett2016-03-241-13/+14
* | | | | | | | Add underscore "_" character in the qwerty compatibility layer.Olivier2016-04-172-3/+3
* | | | | | | | Even more compatibility with QWERTY systems : added most useful characters ne...Olivier2016-04-162-1131/+1180
* | | | | | | | More compatibility with QWERTY systems.Olivier2016-04-162-1133/+1181
* | | | | | | | Simple layer to allow the keyboard to act like a bepo keyboard when plugged o...Olivier2016-04-162-1128/+1177