summaryrefslogtreecommitdiffstats
path: root/keyboard
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | new keymapStephan Bösebeck2016-04-021-1/+9
| |/ / / / /
| * | | | | added CTL_Shift / Hash macroStephan Bösebeck2016-03-291-11/+24
| | | | | |
| * | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-03-2824-1176/+4336
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Merge pull request #216 from msc654/masterErez Zukerman2016-03-286-0/+1334
| | |\ \ \ \ | | | | | | | | | | | | | | Added msc keymap for ergodox_ez
| | | * | | | Corrected duplicate image issueMatthew Carroll2016-03-281-0/+0
| | | | | | |
| | | * | | | Added msc keymap for ergodox_ezMatthew Carroll2016-03-276-0/+1334
| | | | |_|/ | | | |/| |
| | * | | | Merge pull request #214 from cdlm/action-hookJack Humbert2016-03-282-15/+18
| | |\ \ \ \ | | | | | | | | | | | | | | Add per-event user hook function
| | | * | | | Add action-preprocessing kb/user hooks in planckDamien Pollet2016-03-282-15/+18
| | | |/ / /
| | * / / / Magic Key Overrides / Keyboard Lock / Forced NKROIBNobody2016-03-282-13/+57
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | Added Magic Key Overrides / Magic Key Cleanup / Added Keyboard Lock option to template / Added forced NKRO option to template (disabled by default)
| * | | | minor changesStephan Bösebeck2016-03-242-1113/+1111
| | | | |
| * | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-03-2491-41409/+33727
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-03-224-0/+1309
| |\ \ \ \ \
| * | | | | | fix number pad, add ,Stephan Bösebeck2016-03-201-1/+1
| | | | | | |
| * | | | | | changing cursor keys, back to "default" cursor key layout, adding ISO-cursor ↵Stephan Bösebeck2016-03-201-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | keys to Symb layer. Changed numbers back to symmetric layout again, keeping F-keys in symb though
| * | | | | | tweaking it a bit further, fixing thingsStephan Bösebeck2016-03-201-12/+12
| | | | | | |
| * | | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-03-209-2961/+3078
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-03-087-3/+1744
| |\ \ \ \ \ \ \
| * | | | | | | | forgot F6Stephan Bösebeck2016-03-022-2/+2
| | | | | | | | |
| * | | | | | | | updated version, changed F-Key-Layout, minor change in code layerStephan Bösebeck2016-03-022-1481/+1479
| | | | | | | | |
| * | | | | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-03-029-1524/+1650
| |\ \ \ \ \ \ \ \
| * | | | | | | | | testing moving the 6 to the left, having one key more on the right used for ↵Stephan Bösebeck2016-02-152-1519/+1561
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | hash now feels a bit more natural to me. Need to investigate further.
* | | | | | | | | | Updated hexAlex Johnstone2016-03-281-1139/+1138
| | | | | | | | | |
* | | | | | | | | | ££££Alex Johnstone2016-03-281-1/+1
| | | | | | | | | |
* | | | | | | | | | Forgot to change ent/spcAlex Johnstone2016-03-281-693/+697
| | | | | | | | | |
* | | | | | | | | | Didn'tAlex Johnstone2016-03-281-2/+2
| | | | | | | | | |
* | | | | | | | | | Fixed issues, added unicode layer ⌬ ¯\_⩾ツ⩽_/¯Alex Johnstone2016-03-271-6/+45
| | | | | | | | | |
* | | | | | | | | | Merge pull request #4 from jackhumbert/masterAlex Johnstone2016-03-2713-1147/+2922
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | | upstream
| * | | | | | | | | Merge pull request #211 from nrrkeene/masterErez Zukerman2016-03-2710-1147/+1232
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | The Ordinary Layout is unremarkably mundane and remarkably useful
| | * \ \ \ \ \ \ \ \ Merge https://github.com/jackhumbert/qmk_firmwareNicholas Keene2016-03-261-1/+5
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ | | | |/| | | | | | |
| | * | | | | | | | | The Ordinary Layout is unremarkably mundane and remarkably usefulNicholas Keene2016-03-2610-1109/+1192
| | | | | | | | | | |
| | * | | | | | | | | The Ordinary Layout is familiar to users of common keyboardsNicholas Keene2016-03-241-58/+60
| | | |_|_|_|_|_|/ / | | |/| | | | | | |
| * | | | | | | | | Merge pull request #196 from naps62/naps62Erez Zukerman2016-03-273-0/+1690
| |\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | | Adds naps62's Ergodox EZ layout
| | * | | | | | | | Adds naps62's layoutMiguel Palhas2016-03-153-0/+1690
| | | | | | | | | |
* | | | | | | | | | Fixed issues, added unicode layer ⌬ ¯\_⩾ツ⩽_/¯Alex Johnstone2016-03-272-1140/+1198
| | | | | | | | | |
* | | | | | | | | | Merge pull request #3 from jackhumbert/masterAlex Johnstone2016-03-2592-41438/+33800
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pull upstream
| * | | | | | | | | Merge pull request #207 from romanzolotarev/masterErez Zukerman2016-03-251-1/+5
| |\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | | Add important note about brightness on OS X
| | * | | | | | | | Add important note about brightness on OS XRoman Zolotarev2016-03-221-1/+5
| | | | | | | | | |
| * | | | | | | | | Edited to work with jackhumbert/qmk_firmware pull #190Norberto Monarrez2016-03-232-16/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Basically changes "* matrix_scan_user(void)" to "matrix_scan_user(void)"
| * | | | | | | | | Merge pull request #209 from n0bs/masterJack Humbert2016-03-236-0/+332
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Added project folder for Bantam-44
| | * | | | | | | | | Added files for Bantam-44Norberto Monarrez2016-03-236-0/+332
| | | | | | | | | | |
| * | | | | | | | | | Merge pull request #200 from alexives/add_diagram_to_planck_layoutJack Humbert2016-03-231-5/+65
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | Added layout diagrams to the default planck keymap
| | * | | | | | | | | Added layout diagrams to the default planck keymapAlex Ives2016-03-161-5/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Alex Ives <alex@ives.mn>
| * | | | | | | | | | Fixed LED Function CallsIBNobody2016-03-222-24/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed LED indicator function calls to match how the matrix init function calls are formatted.
| * | | | | | | | | | Merge remote-tracking branch 'refs/remotes/jackhumbert/master'IBNobody2016-03-2284-41564/+34408
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # quantum/template/template.c # quantum/template/template.h
| | * \ \ \</