Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | Stephan Bösebeck | 2016-03-28 | 20 | -1148/+4261 | |
| |\| | | | | ||||||
| | * | | | | Corrected duplicate image issue | Matthew Carroll | 2016-03-28 | 1 | -0/+0 | |
| | | | | | | ||||||
| | * | | | | Added msc keymap for ergodox_ez | Matthew Carroll | 2016-03-27 | 6 | -0/+1334 | |
| | | |/ / | | |/| | | ||||||
| * | | | | minor changes | Stephan Bösebeck | 2016-03-24 | 2 | -1113/+1111 | |
| | | | | | ||||||
| * | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | Stephan Bösebeck | 2016-03-24 | 67 | -41353/+32903 | |
| |\ \ \ \ | | | |_|/ | | |/| | | ||||||
| * | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | Stephan Bösebeck | 2016-03-22 | 4 | -0/+1309 | |
| |\ \ \ \ | ||||||
| * | | | | | fix number pad, add , | Stephan Bösebeck | 2016-03-20 | 1 | -1/+1 | |
| | | | | | | ||||||
| * | | | | | changing cursor keys, back to "default" cursor key layout, adding ISO-cursor ↵ | Stephan Bösebeck | 2016-03-20 | 1 | -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 things | Stephan Bösebeck | 2016-03-20 | 1 | -12/+12 | |
| | | | | | | ||||||
| * | | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | Stephan Bösebeck | 2016-03-20 | 7 | -2724/+2677 | |
| |\ \ \ \ \ | ||||||
| * \ \ \ \ \ | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | Stephan Bösebeck | 2016-03-08 | 4 | -0/+1317 | |
| |\ \ \ \ \ \ | ||||||
| * | | | | | | | forgot F6 | Stephan Bösebeck | 2016-03-02 | 2 | -2/+2 | |
| | | | | | | | | ||||||
| * | | | | | | | updated version, changed F-Key-Layout, minor change in code layer | Stephan Bösebeck | 2016-03-02 | 2 | -1481/+1479 | |
| | | | | | | | | ||||||
| * | | | | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | Stephan Bösebeck | 2016-03-02 | 3 | -1505/+1483 | |
| |\ \ \ \ \ \ \ | ||||||
| * | | | | | | | | testing moving the 6 to the left, having one key more on the right used for ↵ | Stephan Bösebeck | 2016-02-15 | 2 | -1519/+1561 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | hash now feels a bit more natural to me. Need to investigate further. | |||||
* | | | | | | | | | Updated hex | Alex Johnstone | 2016-03-28 | 1 | -1139/+1138 | |
| | | | | | | | | | ||||||
* | | | | | | | | | ££££ | Alex Johnstone | 2016-03-28 | 1 | -1/+1 | |
| | | | | | | | | | ||||||
* | | | | | | | | | Forgot to change ent/spc | Alex Johnstone | 2016-03-28 | 1 | -693/+697 | |
| | | | | | | | | | ||||||
* | | | | | | | | | Didn't | Alex Johnstone | 2016-03-28 | 1 | -2/+2 | |
| | | | | | | | | | ||||||
* | | | | | | | | | Fixed issues, added unicode layer ⌬ ¯\_⩾ツ⩽_/¯ | Alex Johnstone | 2016-03-27 | 1 | -6/+45 | |
| | | | | | | | | | ||||||
* | | | | | | | | | Merge pull request #4 from jackhumbert/master | Alex Johnstone | 2016-03-27 | 13 | -1147/+2922 | |
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | | | upstream | |||||
| * | | | | | | | | Merge pull request #211 from nrrkeene/master | Erez Zukerman | 2016-03-27 | 10 | -1147/+1232 | |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | The Ordinary Layout is unremarkably mundane and remarkably useful | |||||
| | * \ \ \ \ \ \ \ | Merge https://github.com/jackhumbert/qmk_firmware | Nicholas Keene | 2016-03-26 | 1 | -1/+5 | |
| | |\ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ | | | |/| | | | | | | ||||||
| | * | | | | | | | | The Ordinary Layout is unremarkably mundane and remarkably useful | Nicholas Keene | 2016-03-26 | 10 | -1109/+1192 | |
| | | | | | | | | | | ||||||
| | * | | | | | | | | The Ordinary Layout is familiar to users of common keyboards | Nicholas Keene | 2016-03-24 | 1 | -58/+60 | |
| | | |_|_|_|_|_|/ | | |/| | | | | | | ||||||
| * | | | | | | | | Merge pull request #196 from naps62/naps62 | Erez Zukerman | 2016-03-27 | 3 | -0/+1690 | |
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | | Adds naps62's Ergodox EZ layout | |||||
| | * | | | | | | | Adds naps62's layout | Miguel Palhas | 2016-03-15 | 3 | -0/+1690 | |
| | | |_|_|/ / / | | |/| | | | | | ||||||
* | | | | | | | | Fixed issues, added unicode layer ⌬ ¯\_⩾ツ⩽_/¯ | Alex Johnstone | 2016-03-27 | 2 | -1140/+1198 | |
| | | | | | | | | ||||||
* | | | | | | | | Merge pull request #3 from jackhumbert/master | Alex Johnstone | 2016-03-25 | 68 | -41382/+32976 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | Pull upstream | |||||
| * | | | | | | | Merge pull request #207 from romanzolotarev/master | Erez Zukerman | 2016-03-25 | 1 | -1/+5 | |
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | Add important note about brightness on OS X | |||||
| | * | | | | | | Add important note about brightness on OS X | Roman Zolotarev | 2016-03-22 | 1 | -1/+5 | |
| | | | | | | | | ||||||
| * | | | | | | | Pull request 190 resolution with 'qmk/master' for merge | yoyoerx | 2016-03-21 | 11 | -2340/+3603 | |
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | | | ||||||
| * | | | | | | | PR190hotfix.sh, fresh hexes, makeallhex.sh script | yoyoerx | 2016-03-11 | 33 | -41292/+32894 | |
| | | | | | | | | ||||||
| * | | | | | | | Addressed void* return warning in all keymaps | yoyoerx | 2016-03-10 | 33 | -98/+85 | |
| | |_|/ / / / | |/| | | | | | ||||||
* | | | | | | | New :pound: method | Alex Johnstone | 2016-03-23 | 1 | -1/+1 | |
| | | | | | | | ||||||
* | | | | | | | New :pound: method | Alex Johnstone | 2016-03-23 | 1 | -1/+2 | |
| | | | | | | | ||||||
* | | | | | | | New :pound: method | Alex Johnstone | 2016-03-23 | 1 | -2/+2 | |
| | | | | | | | ||||||
* | | | | | | | New :pound: method | Alex Johnstone | 2016-03-23 | 1 | -0/+5 | |
| | | | | | | | ||||||
* | | | | | | | New :pound: method | Alex Johnstone | 2016-03-23 | 2 | -1135/+1131 | |
| | | | | | | | ||||||
* | | | | | | | Wrong date | Alex Johnstone | 2016-03-23 | 1 | -1/+1 | |
| | | | | | | | ||||||
* | | | | | | | Removed whitespace | Alex Johnstone | 2016-03-22 | 1 | -55/+54 | |
| | | | | | | | ||||||
* | | | | | | | Revised to version 0.1.0 | Alex Johnstone | 2016-03-22 | 4 | -979/+1010 | |
| | | | | | | | ||||||
* | | | | | | | Merge pull request #2 from jackhumbert/master | Alex Johnstone | 2016-03-22 | 11 | -2724/+3986 | |
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | Update my repo to upstream | |||||
| * | | | | | | Merge pull request #205 from romanzolotarev/master | Erez Zukerman | 2016-03-21 | 4 | -0/+1309 | |
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | / | | |_|_|_|/ | |/| | | | | Add Roman's Layout | |||||
| | * | | | | Update readme | Roman Zolotarev | 2016-03-19 | 1 | -1/+1 | |
| | | | | | | ||||||
| | * | | | | Update layout | Roman Zolotarev | 2016-03-19 | 12 | -192/+67 | |
| | | | | | | ||||||
| | * | | | | Swap volup and voldown | Roman Zolotarev | 2016-03-18 | 1 | -2/+2 | |
| | | | | | | ||||||
| | * | | | | Add Roman's Layout | Roman Zolotarev | 2016-03-18 | 11 | -0/+1434 | |
| | |/ / / | | | | | | | | | | | | | | | | Four layers BASE (Norman), SYMB, PLVR (optimized for Plover), ARRW. | |||||
| * | | | | Merge pull request #203 from XenoBits/master | Erez Zukerman | 2016-03-20 | 5 | -1227/+1174 | |
| |\ \ \ \ | | | | | | | | | | | | | Improved c# dev layout, only 2 layers now | |||||
| | * | | | | Fixed png image | Maxime Millet | 2016-03-20 | 1 | -0/+0 | |
| | | | | | |