summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | |
| | * Added a German layout inspired by the Kinesis Ergo Elan and based on the ↵Christoph Schmitz2016-01-271-0/+208
| |/ | | | | | | "german" keymap.
* | added new macrosStephan Bösebeck2016-01-281-1/+27
| |
* | playing more with cursor keysStephan Bösebeck2016-01-281-1/+1
| |
* | playing a bit with cursor keysStephan Bösebeck2016-01-281-23/+76
| |
* | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-01-281-0/+149
|\|
| * Merge pull request #110 from mollat/masterJack Humbert2016-01-261-0/+149
| |\ | | | | | | add mollat keymap
| | * add mollat keymapAM2016-01-261-0/+149
| |/
* | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-01-254-0/+1671
|\|
| * Merge pull request #109 from petereichinger/masterJack Humbert2016-01-251-0/+11
| |\ | | | | | | Fix flickering when sleeping
| | * Merge branch 'master' into flicker-fixPeter Eichinger2016-01-2562-566/+7863
| | |\ | | |/ | |/|
| * | Merge pull request #107 from tonyabra/config/tonyabra-osxErez Zukerman2016-01-253-0/+1660
| |\ \ | | | | | | | | Simplified osx layout for ergodox ez
| | * | Simplified osx layout for ergodox eztonyabra2016-01-243-0/+1660
| |/ /
| | * Remove led_off() it is not usedPeter Eichinger2016-01-241-2/+0
| | |
| | * Backlight fix from redditPeter Eichinger2016-01-221-0/+13
| | | | | | | | | | | | https://www.reddit.com/r/olkb/comments/41ur41/crazy_flashing_when_my_computer_sleeps/
* | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-01-2513-19/+1064
|\| |
| * | Merge pull request #106 from yangliu/planck-rgbJack Humbert2016-01-2413-19/+1064
| |\ \ | | | | | | | | RGB Underglow with WS2812 LEDs
| | * | no messageYang Liu2016-01-241-2/+2
| | | |
| | * | Update READMEYang Liu2016-01-241-11/+41
| | | |
| | * | add one more photoYang Liu2016-01-241-0/+0
| | | |
| | * | Add a photo for the demonstration of RGB underflowYang Liu2016-01-241-0/+0
| | | |
| | * | fix bugs in animation effectsYang Liu2016-01-242-2/+2
| | | |
| | * | Integrate WS2812 code into quantum coreYang Liu2016-01-247-15/+8
| | | |
| | * | Add support for WS2812 LEDsYang Liu2016-01-249-7/+1029
| |/ /