summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master'Callum Oakley2016-08-09274-2508/+5133
|\
| * Add support for the cluecardskullY2016-08-089-0/+484
| * Clueboard: Fix the title in keymaps/skully/readme.mdskullY2016-08-081-1/+1
| * Clueboard: Add some readme.md files and do some minor cleanup.skullY2016-08-086-14/+101
| * Merge pull request #613 from di0ib/masterJack Humbert2016-08-081-0/+5
| |\
| | * Convert hex to bindi0ib2016-08-071-0/+5
| | * Merge remote-tracking branch 'refs/remotes/jackhumbert/master'di0ib2016-08-07356-2789/+13709
| | |\
| * | \ Merge pull request #612 from kuel/masterJack Humbert2016-08-082-2/+81
| |\ \ \
| | * | | Removed unnecessary commentkuel2016-08-071-2/+0
| | * | | Add keymap_russian.h, a software implementation of Russiankuel2016-08-072-2/+83
| | * | | Merge pull request #1 from jackhumbert/masterkuel2016-08-037-511/+574
| | |\ \ \ | | | | |/ | | | |/|
| * | | | Merge pull request #609 from sethbc/fix_clueboard_orphaned_filesJack Humbert2016-08-082-134/+0
| |\ \ \ \
| | * | | | remove orphaned clueboard filesSeth Chandler2016-08-052-134/+0
| | | |/ / | | |/| |
| * | | | Merge pull request #607 from jeebak/jeebakJack Humbert2016-08-082-72/+187
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Tap for ;, hold for GUI, tap for ", hold for AltJeeBak Kim2016-08-072-6/+10
| | * | | Tap for Tab, hold for HyperJeeBak Kim2016-08-072-27/+32
| | * | | Add Tab Close, New, Reopen macros to TouchCursor layerJeeBak Kim2016-08-062-7/+22
| | * | | Add Virtual Desktop Switching macros to TouchCursor layerJeeBak Kim2016-08-062-4/+14
| | * | | Move KC_ACL1 buttonJeeBak Kim2016-08-062-6/+6
| | * | | Fix KC_ALT_TAB/KC_CMD_TAB logicJeeBak Kim2016-08-061-3/+3
| | * | | Mouse layer updatesJeeBak Kim2016-08-052-23/+23
| | * | | Revert swapp of AltTab/CmdTab in readme. Layout did not changeJeeBak Kim2016-08-041-1/+1
| | * | | Workaround for KC_COPY, etc. based on current AG_NORM/AG_SWAP settingJeeBak Kim2016-08-032-9/+50
| | * | | Add CmdSlash to TouchCursor LayerJeeBak Kim2016-08-031-1/+5
| | * | | Number layer tweaksJeeBak Kim2016-08-032-6/+6
| | * | | Add Alt-Tab, Cmd-Tab, and Ctl-Tab Macros to TouchCursor layer, swap LGUI and ...JeeBak Kim2016-08-032-8/+43
| | * | | Update readme.mdJeeBak Kim2016-08-031-6/+7
| |/ / /
| * | | Merge pull request #605 from kuel/masterJack Humbert2016-08-031-0/+161
| |\| |
| | * | Add keymap_cyrillic.h, lots of cyrillic characterskuel2016-08-021-0/+161
| * | | Merge pull request #599 from Depariel/masterJack Humbert2016-08-036-154/+196
| |\ \ \
| | * | | added support for Infinity 1.1a (4th drop) matrix, no LED support yetDepariel2016-07-312-5/+50
| | * | | fixed typo in hasu/keymap.cDepariel2016-07-311-1/+1
| | * | | fixed compiling bugs in infinity_chibios.h, updated keymaps, added depariel k...Depariel2016-07-315-149/+146
| * | | | Merge pull request #561 from 0xdec/patch-1Jack Humbert2016-08-031-357/+378
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Simplify HSV->RGB calculationJordi Orlando2016-07-261-14/+12
| | * | | Increament -> incrementJordi Orlando2016-07-261-9/+9
| | * | | Clean up rgblight.cJordi Orlando2016-07-261-354/+377
| * | | | Merge pull request #592 from sethbc/ez-sethbcErez Zukerman2016-08-023-0/+119
| |\ \ \ \
| | * | | | rebaseSeth Chandler2016-07-303-1/+1
| | * | | | update makefileSeth Chandler2016-07-301-1/+1
| | * | | | initial commit of sethbc keymapSeth Chandler2016-07-303-0/+119
| * | | | | Merge pull request #593 from J3RN/masterErez Zukerman2016-08-022-22/+26
| |\ \ \ \ \
| | * | | | | Updated readme with recent changesJonathan Arnett2016-07-301-3/+6
| | * | | | | Updated my keymapJack Humbert2016-07-308-28/+29
| | |\ \ \ \ \
| * | \ \ \ \ \ Merge pull request #600 from adiabatic/masterErez Zukerman2016-08-024-14/+1167
| |\ \ \ \ \ \ \
| | * | | | | | | Thumb ⌫ into ⇥, numpad & into :, yank home/endNathan Sharfi2016-07-313-13/+1166
| | * | | | | | | Remove /keyboard/* filesNathan Sharfi2016-07-313-1394/+0
| | * | | | | | | Merge branch 'master' of github.com:jackhumbert/qmk_firmwareNathan Sharfi2016-07-316362-2418080/+66593
| | |\ \ \ \ \ \ \ | | | | |_|_|_|/ / | | | |/| | | | |
| | * | | | | | | zweihander-osx: Use power instead of ejectNathan Sharfi2016-05-312-3/+3
| | * | | | | | | zweihander-osx: use eject instead of powerNathan Sharfi2016-05-312-1110/+1097