summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #867 from fredizzimo/variable_traceJack Humbert2016-11-074-0/+175
|\
| * Add documentation for the variable tracingFred Sundvik2016-11-062-0/+32
| * Add possibility to control variable trace from makeFred Sundvik2016-11-063-5/+38
| * Add variable traceFred Sundvik2016-11-062-0/+110
* | Merge pull request #852 from J3RN/remove-z-slash-controlsJack Humbert2016-11-071-3/+3
|\ \ | |/ |/|
| * Removed the control action when holding z or /Jonathan Arnett2016-11-061-3/+3
|/
* Implements dedicated text zoom keysErez Zukerman2016-11-012-3/+7
* Merge pull request #851 from J3RN/momentaryErez Zukerman2016-10-311-5/+5
|\
| * Switched to momentaryJonathan Arnett2016-10-091-5/+5
* | Merge pull request #843 from lucwastiaux/masterErez Zukerman2016-10-314-1/+428
|\ \
| * | re-introduce brackets layerlucwastiaux2016-10-261-2/+24
| * | adding readmelucwastiaux2016-10-231-0/+15
| * | add up/down keys on thumb clusterslucwastiaux2016-10-231-2/+2
| * | remove brackets layer, replace a few shortcuts on thumb clusterlucwastiaux2016-10-231-30/+13
| * | type brackets in symbol layer, using bottom rowlucwastiaux2016-10-232-8/+18
| * | add tap-dance support, make right shift double-tap=caplocklucwastiaux2016-10-222-1/+16
| * | change include fileslucwastiaux2016-10-221-1/+2
| * | added dvorak programmer layoutlucwastiaux2016-10-222-1/+382
* | | Merge pull request #836 from 20lives/masterErez Zukerman2016-10-317-472/+695
|\ \ \
| * | | merge upstreamLior Haim2016-10-2323-21/+1360
| |\| |
| * | | fixed copy-cut-paste buttonstwentylives2016-10-211-5/+5
| * | | Merge branch 'master' of https://github.com/20lives/qmk_firmwaretwentylives2016-10-201-2/+2
| |\ \ \
| | * | | fix readme20lives2016-10-191-2/+2
| * | | | fixed base layer = keytwentylives2016-10-201-1/+1
| |/ / /
| * | | update pics and readmetwentylives2016-10-195-133/+122
| * | | Update readme.md20lives2016-10-181-3/+5
| * | | Update readme.md20lives2016-10-181-1/+3
| * | | adding dvorak hebrew layouttwentylives2016-10-183-0/+230
* | | | Merge pull request #839 from priyadi/planck-priyadi-modificationJack Humbert2016-10-302-58/+98
|\ \ \ \
| * | | | Use WinCompose unicode input method instead of HexNumpadPriyadi Iman Nurcahyo2016-10-231-1/+1
| * | | | Update priyadi's keymap for Planck; added readmePriyadi Iman Nurcahyo2016-10-222-57/+97
| | |/ / | |/| |
* | | | Merge pull request #854 from slebedev/masterJack Humbert2016-10-301-1/+1
|\ \ \ \
| * | | | Add link to article about Unicode Hex Input in readmeSergey Lebedev2016-10-291-1/+1
* | | | | Merge pull request #857 from fredizzimo/fix_makefile_too_long_bashJack Humbert2016-10-301-8/+23
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Run each sumbmake in a separate shellFred Sundvik2016-10-301-8/+23
* | | | | Merge pull request #827 from Dbroqua/masterJack Humbert2016-10-263-6/+88
|\ \ \ \ \
| * | | | | - Added HHKB like layout for KC60 pcbdbroqua2016-10-162-0/+82
| * | | | | Merge branch 'master' of https://github.com/Dbroqua/qmk_firmwaredbroqua2016-10-1441-293/+1921
| |\ \ \ \ \
| | * \ \ \ \ Merge pull request #9 from jackhumbert/masterDamien2016-10-1322-35/+1252
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge pull request #8 from jackhumbert/masterDamien2016-10-0719-258/+669
| | |\ \ \ \ \ \ | | | | |_|_|_|/ | | | |/| | | |
| * | / | | | | - Updated dbroqua layout for HHKB keyboard (added some missing fn keys)dbroqua2016-10-031-6/+6
| |/ / / / / /
* | | | | | | Merge pull request #849 from hot-leaf-juice/masterJack Humbert2016-10-261-4/+4
|\ \ \ \ \ \ \
| * | | | | | | replace lock key with general power keyCallum Oakley2016-10-251-2/+2
| * | | | | | | switched to standard volume keysCallum Oakley2016-10-251-2/+2
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge pull request #848 from andrebeat/fix-dockerfileJack Humbert2016-10-261-1/+2
|\ \ \ \ \ \ \
| * | | | | | | add subproject env var to dockerfileAndre Silva2016-10-241-1/+2
| |/ / / / / /
* | | | | | | Merge pull request #847 from yinshanyang/masterJack Humbert2016-10-261-0/+13
|\ \ \ \ \ \ \
| * | | | | | | added notes on using Arduino Pro Micro 3.3V with Let’s SplitYin Shanyang2016-10-241-0/+13
| |/ / / / / /
* | | | | | | Merge pull request #844 from priyadi/unicode_wincompose_inputJack Humbert2016-10-262-4/+10
|\ \ \ \ \ \ \
| * | | | | | | Unicode WinCompose input methodPriyadi Iman Nurcahyo2016-10-232-4/+10
| |/ / / / / /