summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix 2 macros in the Nordic keymapFernando Mendonca2016-02-051-3/+3
| | | | | | | By testing I found out that, at least on Linux using the Swedish layout, two macros present on this file were wrong, for the backslash and pipe keys. Jack helped me find the correct combination for the backslash and that led me to the right one for pipe.
* Merge pull request #124 from zorab47/disable-console-by-defaultErez Zukerman2016-02-041-1/+1
|\ | | | | Disable Ergodox EZ debug console for improved performance
| * Disable console for improved performanceCharles Maresh2016-02-031-1/+1
| | | | | | | | | | | | Commenting out the line is the only way to disable the console, as the value of CONSOLE_ENABLE isn't checked. There are only checks for its existence; setting it to `yes` or `no` doesn't change the compilation.
* | Merge pull request #125 from gkubed/patch-1Erez Zukerman2016-02-041-1/+1
|\ \ | |/ |/| Update QUICK_START.md
| * Update QUICK_START.mdGuyon Cumby2016-02-041-1/+1
|/ | | Fix ErgoDox EZ readme.md link
* Merge pull request #123 from cbbrowne/masterJack Humbert2016-02-014-0/+183
|\ | | | | README notes and cbbrowne layout
| * Add notes on what sorts of actions are riskyChristopher Browne2016-02-011-0/+21
| |
| * Many of the changes I wantedChristopher Browne2016-02-011-18/+20
| |
| * Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareChristopher Browne2016-01-3011-1466/+2238
| |\
| * | More notesChristopher Browne2016-01-291-1/+1
| | |
| * | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareChristopher Browne2016-01-296-0/+1718
| |\ \
| * | | On Linux, run dfu-programmer as rootChristopher Browne2016-01-291-0/+4
| | | |
| * | | Notes on what's done, and plans to change my key mappingChristopher Browne2016-01-291-0/+11
| | | |
| * | | Notes on what's done, and plans to change my key mappingChristopher Browne2016-01-291-0/+19
| | | |
| * | | Bunch of reformatting, improvements to commentsChristopher Browne2016-01-291-19/+22
| | | |
| * | | Latest version of cbbrowne key mapsChristopher Browne2016-01-292-14/+37
| | | |
| * | | Added in a keypad layer that replaces DvorakChristopher Browne2016-01-281-0/+100
| | | |
* | | | Refreshes default keymap for single tap L1 switchErez Zukerman2016-02-011-1285/+1285
| | | |
* | | | Merge pull request #116 from tachk/readmeFixJack Humbert2016-01-311-1/+1
|\ \ \ \ | | | | | | | | | | Fix for broken link in readme.
| * | | | Fix for broken link in readme.Kacey A2016-01-301-1/+1
| | | | |
* | | | | Merge pull request #119 from seancaffery/teensynoteJack Humbert2016-01-311-0/+4
|\ \ \ \ \ | | | | | | | | | | | | Clarify Atreus support
| * | | | | Clarify Atreus supportSean Caffery2016-01-311-0/+4
| | |_|_|/ | |/| | |
* | | | | Merge pull request #118 from sboesebeck/masterErez Zukerman2016-01-312-29/+163
|\ \ \ \ \ | |/ / / / |/| | | | created new layer for egosooters like counterstrike
| * | | | some fixes in readmeStephan Bösebeck2016-01-311-2/+3
| | | | |
| * | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-01-3111-1466/+2238
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge pull request #117 from coderkun/masterErez Zukerman2016-01-303-1466/+1681
|\ \ \ \ \ | |_|/ / / |/| | | | Merge changes for coderkun’s Neo2 layout
| * | | | add build instructions to readmecoderkun2016-01-301-2/+17
| | | | |
| * | | | correct link and some minor details in readme filecoderkun2016-01-301-3/+3
| | | | |
| * | | | add readme file for coderkun’s Neo2 layoutcoderkun2016-01-301-0/+16
| | | | |
| * | | | Merge remote-tracking branch 'upstream/master'coderkun2016-01-308-0/+557
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge pull request #115 from seancaffery/sean/atreusJack Humbert2016-01-296-0/+510
|\ \ \ \ \ | | | | | | | | | | | | Add Teensy2 Atreus support
| * | | | | Add Teensy2 Atreus supportSean Caffery2016-01-306-0/+510
| | | | | |
* | | | | | audio on resetJack Humbert2016-01-291-0/+17
|/ / / / /
* | | | / missing fileJack Humbert2016-01-291-0/+30
| |_|_|/ |/| | |
| * | | add layers for poor man’s QWERTZ and poor man’s Neo including Neo’s ↵coderkun2016-01-302-1466/+1650
|/ / / | | | | | | | | | layer 4
| * | fixed some copy paste errorsStephan Bösebeck2016-01-291-2/+2
| | |
| * | added a egoshooter layerStephan Bösebeck2016-01-291-4/+58
| | |
| * | Merge branch 'master' of https://github.com/sboesebeck/qmk_firmwareStephan Bösebeck2016-01-290-0/+0
| |\ \
| | * \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-01-286-0/+1718
| | |\ \ | |_|/ / |/| | |
| * | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-01-296-0/+1718
| |\ \ \ | |/ / / |/| / / | |/ /
* | | Merge pull request #113 from chschmitz/masterErez Zukerman2016-01-286-0/+1718
|\ \ \ | |_|/ |/| | New German layout for ErgoDox, similar to Kinesis Ergo Elan and regular German keyboards
| * | Added .hex file.Christoph Schmitz2016-01-281-0/+1473
| | |
| * | Fixed graphics.Christoph Schmitz2016-01-281-0/+0
| | |
| * | Added media layer.Christoph Schmitz2016-01-282-0/+4
| | |
| * | Added links.Christoph Schmitz2016-01-281-1/+7
| | |
| * | Added documentation.Christoph Schmitz2016-01-283-0/+25
| | |
| * | Made all layer change keys momentary. Removed Hyper and Meh in favor of ↵Christoph Schmitz2016-01-281-11/+11
| | | | | | | | | | | | layer 1 and 2 on both halves.
| * | Switched up and down keys to be closer to the vi etc. world.Christoph Schmitz2016-01-271-2/+2
| | |
| * | Fixed circonflex key.Christoph Schmitz2016-01-271-1/+3
| | |
| * | Fixed regarding Ctrl and Alt keys.Christoph Schmitz2016-01-271-4/+4
| | |