aboutsummaryrefslogtreecommitdiff
path: root/keyboard/ergodox_ez/keymaps
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareRoman Zolotarev2016-04-2629-5353/+8864
|\
| * [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 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
| * | | | 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 Roman's single layer layout based on NormanRoman Zolotarev2016-04-164-0/+1165
| |_|_|/ / / |/| | | | |
* | | | | | Add HJKL layoutRoman Zolotarev2016-04-115-5/+1331
| |_|/ / / |/| | | |
* | | | | Merge pull request #215 from nrrkeene/masterErez Zukerman2016-04-063-6/+60
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | The Ordinary Layout is unremarkably mundane and remarkably usefulNicholas Keene2016-03-273-6/+60
* | | | | Updated hexAlex Johnstone2016-04-051-893/+895
* | | | | :pound: typoAlex Johnstone2016-04-051-0/+4
* | | | | :pound: typoAlex Johnstone2016-04-051-1/+1
* | | | | Merge pull request #5 from jackhumbert/masterAlex Johnstone2016-04-0519-1252/+6867
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge pull request #235 from mbarkhau/masterErez Zukerman2016-04-042-92/+123
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | add indent to generated keymapManuel Barkhau2016-04-032-92/+123
| * | | | Merge pull request #213 from mbarkhau/masterErez Zukerman2016-04-034-0/+2890
| |\| | |
| | * | | use action function for unicodeManuel Barkhau2016-04-024-2540/+1651
| | * | | Update compile_keymap.pymbarkhau2016-03-291-13/+11
| | * | | add hex fileManuel Barkhau2016-03-281-0/+1624
| | * | | Merge remote-tracking branch 'origin/master'Manuel Barkhau2016-03-2819-1147/+4256
| | |\ \ \