summaryrefslogtreecommitdiffstats
path: root/keyboards
Commit message (Expand)AuthorAgeFilesLines
* dumber sculpt buildmilestogo2017-02-0914-0/+508
* Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwaremilestogo2017-02-0497-695/+6080
|\
| * Merge remote-tracking branch 'upstream/master'Brendan Johan Lee2017-02-015-30/+900
| |\
| | * Merge pull request #1039 from zabereer/albert_ergodox_keymapErez Zukerman2017-01-314-0/+866
| | |\
| | | * albert ergodox keymapAlbert Pretorius2017-01-264-0/+866
| | * | update my neo2 keymapMatthias Schmitt2017-01-301-30/+34
| * | | [deadcyclo layout] Refactoring. Use custom functions and macrosBrendan Johan Lee2017-01-301-237/+266
| * | | [deadcyclo layout] fixed failing testsBrendan Johan Lee2017-01-301-16/+1
| * | | Merge remote-tracking branch 'upstream/master'Brendan Johan Lee2017-01-2712-13/+13
| |\| |
| | * | replace jackhumbert with qmkJack Humbert2017-01-2612-13/+13
| | |/
| * | [deadcyclo layout] Added more unicode keys and ibus unicode compose trigger keysBrendan Johan Lee2017-01-274-23/+26
| * | Merge remote-tracking branch 'upstream/master'Brendan Johan Lee2017-01-2610-13/+400
| |\|
| | * Merge pull request #1029 from SjB/qmk_infinity60Jack Humbert2017-01-265-0/+46
| | |\
| | | * updated all the other keymaps to support the new changes.SjB2017-01-243-0/+28
| | | * fix: infinity60 keyboard was not using quantum features.SjB2017-01-232-0/+18
| | * | Merge pull request #1033 from smt/smt/preonicJack Humbert2017-01-263-0/+335
| | |\ \
| | | * | Remove COLEMAK from preonic_keycodes enumStephen Tudor2017-01-251-1/+0
| | | * | Update readme for smt Preonic keymapStephen Tudor2017-01-251-1/+85
| | | * | Add smt keymap for PreonicStephen Tudor2017-01-253-0/+252
| | | |/
| | * / layer defines to enumJack Humbert2017-01-252-13/+19
| | |/
| * | [deadcyclo layout] Added lotsof new emojis and some new unicode keysBrendan Johan Lee2017-01-253-11/+178
| * | Merge remote-tracking branch 'upstream/master'Brendan Johan Lee2017-01-242-5/+5
| |\|
| | * turn off rgb_midi in ezJack Humbert2017-01-232-5/+5
| * | [deadcyclo layout] Added unicode layerBrendan Johan Lee2017-01-245-27/+98
| * | [deadcyclo layout] Added support for ergodox ez shineBrendan Johan Lee2017-01-244-14/+40
| |/
| * Merge pull request #1026 from TerryMathews/masterJack Humbert2017-01-232-23/+0
| |\
| | * More code cleanupTerryMathews2017-01-222-23/+0
| * | Merge pull request #1018 from hot-leaf-juice/masterJack Humbert2017-01-222-44/+19
| |\ \
| | * | simplifyCallum Oakley2017-01-202-44/+19
| * | | More keyboard map tweaking (#1019)Christopher Browne2017-01-222-6/+6
| * | | Merge pull request #1020 from remigius42/masterJack Humbert2017-01-226-0/+1157
| |\ \ \
| | * | | SG Ergodox layout: Updated layout documentationAndreas Schmidt2017-01-223-4/+12
| | * | | SG Ergodox layout: Fixed ENTER key mappingAndreas Schmidt2017-01-221-2/+2
| | * | | SG Ergodox layout: Minor code formatting changesAndreas Schmidt2017-01-221-1/+1
| | * | | SG Ergodox layout: Add ENTER to left keyboardAndreas Schmidt2017-01-221-2/+2
| | * | | SG Ergodox layout: Add <br/> macro to media layerAndreas Schmidt2017-01-221-2/+14
| | * | | Renamed JSON source of Ergodox Swiss GermanAndreas Schmidt2017-01-212-1/+1
| | * | | Correct layout description of ergodox swissgermanAndreas Schmidt2017-01-212-15/+16
| | * | | Removed Ergodox EZ & Infinity specific keymapsAndreas Schmidt2017-01-2112-2233/+0
| | * | | Merged keymap for Ergodox EZ & InfinityAndreas Schmidt2017-01-216-0/+1136
| | * | | Add Swiss German layout for Ergodox InfinityAndreas Schmidt2017-01-216-0/+1112
| | * | | Add Swiss German layout for Ergodox EZAndreas Schmidt2017-01-216-0/+1121
| | |/ /
| * | | Merge pull request #1022 from lucwastiaux/masterJack Humbert2017-01-222-13/+48
| |\ \ \
| | * | | document BRACKETS and SHELL_LAYERlucwastiaux2017-01-221-1/+6
| | * | | make shell layer more compatible with default layerlucwastiaux2017-01-211-15/+16
| | * | | couple of changes to the shell layerlucwastiaux2017-01-211-4/+4
| | * | | introduce shell_layerlucwastiaux2017-01-191-3/+31
| | * | | put shell nav under tab, introduce an OSL for the brackets layerlucwastiaux2017-01-171-4/+5
| | * | | enable brackets using the - key on the right, and cleanupslucwastiaux2016-12-151-8/+8
| * | | | Merge pull request #1021 from luizribeiro/ps2avrGBJack Humbert2017-01-2210-0/+794
| |\ \ \ \