Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | Stephan Bösebeck | 2016-04-04 | 8 | -108/+1848 |
|\ | |||||
| * | Merge pull request #235 from mbarkhau/master | Erez Zukerman | 2016-04-04 | 2 | -92/+123 |
| |\ | | | | | | | add indent to generated keymap | ||||
| | * | add indent to generated keymap | Manuel Barkhau | 2016-04-03 | 2 | -92/+123 |
| | | | |||||
| * | | music mode file | Jack Humbert | 2016-04-03 | 6 | -16/+1725 |
| | | | |||||
* | | | minor updates - new PNG | Stephan Bösebeck | 2016-04-03 | 2 | -16/+20 |
|/ / | |||||
* | | Merge pull request #213 from mbarkhau/master | Erez Zukerman | 2016-04-03 | 4 | -0/+2890 |
|\| | | | | | Add manuneo layout | ||||
| * | use action function for unicode | Manuel Barkhau | 2016-04-02 | 4 | -2540/+1651 |
| | | |||||
| * | Update compile_keymap.py | mbarkhau | 2016-03-29 | 1 | -13/+11 |
| | | |||||
| * | add hex file | Manuel Barkhau | 2016-03-28 | 1 | -0/+1624 |
| | | |||||
| * | Merge remote-tracking branch 'origin/master' | Manuel Barkhau | 2016-03-28 | 23 | -1175/+4331 |
| |\ | |||||
| * | | Refactor compiler code | Manuel Barkhau | 2016-03-28 | 3 | -1661/+1900 |
| | | | |||||
| * | | Add manuneo layout | Manuel Barkhau | 2016-03-27 | 3 | -0/+1918 |
| | | | |||||
* | | | Merge branch 'master' of https://github.com/sboesebeck/qmk_firmware | Stephan Bösebeck | 2016-04-02 | 78 | -1924/+4833 |
|\ \ \ | |||||
| * \ \ | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | Stephan Bösebeck | 2016-04-01 | 76 | -1894/+4803 |
| |\ \ \ | |||||
| | * | | | Create tak3over.c | tak3over | 2016-04-01 | 1 | -0/+136 |
| | | | | | | | | | | | | | | | Custom keymap with an additional function layer for numpad, pgup, pgdn, del, ins, home, end, and additional arrow keys. | ||||
| | * | | | adding files is always smart | Jack Humbert | 2016-04-01 | 7 | -0/+327 |
| | | | | | |||||
| | * | | | Also add compiled hex file | David Mohr | 2016-03-30 | 1 | -0/+1127 |
| | | | | | |||||
| | * | | | Squisher's international dvorak variant for ergodox ez | David Mohr | 2016-03-30 | 5 | -0/+214 |
| | | | | | | | | | | | | | | | | | | | | See README.md | ||||
| | * | | | Merge pull request #227 from NoahAndrews/patch-4 | Jack Humbert | 2016-03-30 | 1 | -2/+2 |
| | |\ \ \ | | | | | | | | | | | | | Fixed minor issues with Preonic readme | ||||
| | | * | | | Fixed minor issues with Preonic readme | Noah Andrews | 2016-03-30 | 1 | -2/+2 |
| | | | | | | |||||
| | * | | | | Tiny fix of Planck diagrams | Miha Rekar | 2016-03-30 | 1 | -2/+2 |
| | |/ / / | |||||
| | * | | | preonic readme | Jack Humbert | 2016-03-30 | 1 | -9/+3 |
| | | | | | |||||
| | * | | | Merge branch 'master' of https://github.com/jackhumbert/tmk_keyboard | Jack Humbert | 2016-03-30 | 155 | -41700/+38531 |
| | |\ \ \ | |||||
| | | * | | | Updated several keyboard folders to use new keymap naming scheme | Noah Andrews | 2016-03-29 | 39 | -40/+40 |
| | | | | | | |||||
| | | * | | | Fix error in Planck makefile comment | Noah Andrews | 2016-03-29 | 1 | -1/+1 |
| | | | |/ | | | |/| | | | | | | [This comment](https://www.reddit.com/r/olkb/comments/428umx/rgb_underglow/czaivbc) states that because both audio output and RGB support require the user of timer 3, they can't be enabled at the same time. That makes sense, I can see where audio.c uses timer 3. But this comment in the code states that the incompatibility is with MIDI support, which doesn't make sense based on what I see in the code. Please enlighten me if I'm mistaken. | ||||
| | * | | | .hex files | Jack Humbert | 2016-03-30 | 3 | -2/+2893 |
| | | | | | |||||
| | * | | | preonic update | Jack Humbert | 2016-03-30 | 19 | -1844/+64 |
| | | | | | |||||
| * | | | | minor tweaks at the keymap, new png for documentation | Stephan Bösebeck | 2016-04-01 | 2 | -6/+6 |
| | | | | | |||||
| * | | | | fixed de_osx prefix in keymap include to avoid conflicts | Stephan Bösebeck | 2016-03-31 | 1 | -25/+25 |
| | | | | | |||||
* | | | | | new keymap | Stephan Bösebeck | 2016-04-02 | 1 | -1/+9 |
|/ / / / | |||||
* | | | | added CTL_Shift / Hash macro | Stephan Bösebeck | 2016-03-29 | 1 | -11/+24 |
| | | | | |||||
* | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | Stephan Bösebeck | 2016-03-28 | 24 | -1176/+4336 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | Merge pull request #216 from msc654/master | Erez Zukerman | 2016-03-28 | 6 | -0/+1334 |
| |\ \ \ | | | | | | | | | | | Added msc keymap for ergodox_ez | ||||
| | * | | | 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 |
| | | | | | |||||
| * | | | | Merge pull request #214 from cdlm/action-hook | Jack Humbert | 2016-03-28 | 2 | -15/+18 |
| |\ \ \ \ | | | | | | | | | | | | | Add per-event user hook function | ||||
| | * | | | | Add action-preprocessing kb/user hooks in planck | Damien Pollet | 2016-03-28 | 2 | -15/+18 |
| | |/ / / | |||||
| * / / / | Magic Key Overrides / Keyboard Lock / Forced NKRO | IBNobody | 2016-03-28 | 2 | -13/+57 |
| |/ / / | | | | | | | | | | | | | | | | | | | | | Added Magic Key Overrides / Magic Key Cleanup / Added Keyboard Lock option to template / Added forced NKRO option to template (disabled by default) | ||||
| * | | | 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 |
| | | | | | |||||
| * | | | | 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 |
| | | | | | |||||
* | | | | | 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 | 91 | -41409/+33727 |
|\| | | | | |||||
| * | | | | 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 |