Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | | 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 | 92 | -41438/+33800 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | Edited to work with jackhumbert/qmk_firmware pull #190 | Norberto Monarrez | 2016-03-23 | 2 | -16/+12 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Basically changes "* matrix_scan_user(void)" to "matrix_scan_user(void)" | |||||
| * | | | | | | | | | Merge pull request #209 from n0bs/master | Jack Humbert | 2016-03-23 | 6 | -0/+332 | |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Added project folder for Bantam-44 | |||||
| | * | | | | | | | | | Added files for Bantam-44 | Norberto Monarrez | 2016-03-23 | 6 | -0/+332 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | Merge pull request #200 from alexives/add_diagram_to_planck_layout | Jack Humbert | 2016-03-23 | 1 | -5/+65 | |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | Added layout diagrams to the default planck keymap | |||||
| | * | | | | | | | | | Added layout diagrams to the default planck keymap | Alex Ives | 2016-03-16 | 1 | -5/+65 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Alex Ives <alex@ives.mn> | |||||
| * | | | | | | | | | | Fixed LED Function Calls | IBNobody | 2016-03-22 | 2 | -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' | IBNobody | 2016-03-22 | 84 | -41564/+34408 | |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # quantum/template/template.c # quantum/template/template.h | |||||
| | * \ \ \ \ \ \ \ \ \ | Pull request 190 resolution with 'qmk/master' for merge | yoyoerx | 2016-03-21 | 13 | -2577/+4004 | |
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ / | | | |/| | | | | | | | | ||||||
| | * | | | | | | | | | | 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 | 44 | -149/+128 | |
| | | |_|_|_|_|_|/ / / | | |/| | | | | | | | | ||||||
| * | | | | | | | | | | Adding Retro_Refit Keyboard | IBNobody | 2016-03-16 | 6 | -0/+400 | |
| | |_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Retro_Refit is an example of using a Teensy to replace a keyboard controller on an older keyboard. The original 6x15 keyboard had a non-standard 11x8 matrix. | |||||
* | | | | | | | | | | 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 | 12 | -2730/+3994 | |
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | | | 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 | |
| | | | | | | | | | ||||||
| | * | | | | | | | CSharp dev layout V2 | Maxime Millet | 2016-03-20 | 5 | -1227/+1174 | |
| | | | | | | | | | ||||||
| * | | | | | | | |