Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #961 from Dbroqua/master | Jack Humbert | 2016-12-18 | 1 | -2/+2 |
|\ | |||||
| * | - Revert local fail o_O | dbroqua | 2016-12-17 | 5 | -0/+9 |
| * | Merge branch 'master' of https://github.com/Dbroqua/qmk_firmware | dbroqua | 2016-12-17 | 50 | -245/+2003 |
| |\ | |||||
| | * | Merge pull request #14 from jackhumbert/master | Damien | 2016-12-17 | 50 | -245/+2003 |
| | |\ | |||||
| * | | | Merge branch 'master' of https://github.com/Dbroqua/qmk_firmware | dbroqua | 2016-12-17 | 191 | -2405/+14432 |
| |\| | | |||||
| | * | | Merge pull request #13 from jackhumbert/master | Damien | 2016-12-09 | 191 | -2405/+14432 |
| | |\ \ | |||||
| * | | | | - Added capslock key | dbroqua | 2016-12-17 | 1 | -2/+2 |
| |/ / / | |||||
| * | | | - Merged | dbroqua | 2016-11-27 | 5 | -9/+0 |
* | | | | Merge pull request #962 from stanleylai/master | Jack Humbert | 2016-12-18 | 11 | -0/+350 |
|\ \ \ \ | |_|_|/ |/| | | | |||||
| * | | | Merge remote-tracking branch 'refs/remotes/jackhumbert/master' | Stanley Lai | 2016-12-18 | 39 | -196/+1893 |
| |\ \ \ | |/ / / |/| | | | |||||
* | | | | Adds a troubleshooting layout for resetting the EEPROM | Erez Zukerman | 2016-12-16 | 1 | -0/+140 |
* | | | | Removes alt/j dual function | Erez Zukerman | 2016-12-16 | 1 | -6/+6 |
* | | | | Merge pull request #957 from priyadi/qwertz-dot-comma | Jack Humbert | 2016-12-15 | 2 | -23/+100 |
|\ \ \ \ | |||||
| * | | | | QWERTZ style dot & comma, move QUOT to SCLN position | Priyadi Iman Nurcahyo | 2016-12-16 | 2 | -23/+100 |
|/ / / / | |||||
* | | | | Merge pull request #956 from sgoodwin/master | Jack Humbert | 2016-12-15 | 1 | -0/+1 |
|\ \ \ \ | |||||
| * | | | | Make keymap compile again. | Samuel Ryan Goodwin | 2016-12-15 | 1 | -0/+1 |
|/ / / / | |||||
* | | | | Merge pull request #949 from priyadi/promethium | Jack Humbert | 2016-12-15 | 3 | -94/+31 |
|\ \ \ \ | |||||
| * | | | | fine tune trackpoint initialization | Priyadi Iman Nurcahyo | 2016-12-14 | 2 | -90/+21 |
| * | | | | disable remote mode | Priyadi Iman Nurcahyo | 2016-12-14 | 1 | -1/+0 |
| * | | | | Enable Adafruit BLE support | Priyadi Iman Nurcahyo | 2016-12-14 | 2 | -2/+2 |
| * | | | | Pretend to be Thinkpad USB Keyboard | Priyadi Iman Nurcahyo | 2016-12-14 | 1 | -2/+8 |
| * | | | | Enable PS2 remote mode | Priyadi Iman Nurcahyo | 2016-12-14 | 1 | -0/+1 |
* | | | | | Merge pull request #952 from pvinis/master | Jack Humbert | 2016-12-15 | 1 | -63/+108 |
|\ \ \ \ \ | |||||
| * | | | | | tap dance for some layers. one tap sysctl, two taps mouse. | Pavlos Vinieratos | 2016-12-09 | 1 | -3/+29 |
| * | | | | | add light for some layers | Pavlos Vinieratos | 2016-12-09 | 1 | -0/+19 |
| * | | | | | separate sysctl and mouse layers | Pavlos Vinieratos | 2016-12-09 | 1 | -57/+57 |
| * | | | | | add alt key | Pavlos Vinieratos | 2016-12-09 | 1 | -2/+2 |
| * | | | | | media keys | Pavlos Vinieratos | 2016-12-09 | 1 | -11/+11 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge pull request #953 from priyadi/ibm_terminal | Jack Humbert | 2016-12-15 | 18 | -0/+1063 |
|\ \ \ \ \ | |||||
| * | | | | | My layout for M-122 terminal keyboard | Priyadi Iman Nurcahyo | 2016-12-14 | 3 | -0/+345 |
| * | | | | | Update KEYMAP macro to be consistent with the rest of QMK | Priyadi Iman Nurcahyo | 2016-12-14 | 4 | -105/+58 |
| * | | | | | IBM Terminal M-122 converter support | Priyadi Iman Nurcahyo | 2016-12-14 | 15 | -0/+765 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge pull request #955 from askreet/powerDrawPerKeyboard | Jack Humbert | 2016-12-15 | 2 | -1/+6 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Allow power consumption to be set per-keyboard. | Kyle Smith | 2016-12-14 | 2 | -1/+6 |
|/ / / / | |||||
* | | | | Merge pull request #948 from climbalima/master | Jack Humbert | 2016-12-12 | 11 | -9/+438 |
|\ \ \ \ | |||||
| * | | | | svg bug fix and added pilcrow to hand wire | climbalima | 2016-12-12 | 11 | -9/+438 |
| | | * | | Added XD60 support | Stanley Lai | 2016-12-18 | 11 | -0/+350 |
| | | * | | Merge remote-tracking branch 'refs/remotes/jackhumbert/master' | Stanley Lai | 2016-12-17 | 1043 | -16377/+67867 |
| | | |\ \ | |_|_|/ / |/| | | | | |||||
* | | | | | specialise music variables | Jack Humbert | 2016-12-12 | 1 | -3/+3 |
* | | | | | re-enable audio and extrakeys | Jack Humbert | 2016-12-12 | 4 | -5/+27 |
* | | | | | Merge pull request #946 from climbalima/master | Jack Humbert | 2016-12-12 | 1 | -11/+19 |
|\| | | | | |||||
| * | | | | changed svg after merge | climbalima | 2016-12-10 | 1 | -470/+470 |
| * | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | climbalima | 2016-12-10 | 149 | -2031/+6676 |
| |\| | | | |||||
| * | | | | changed svg to support proto pcb | climbalima | 2016-12-10 | 1 | -474/+482 |
* | | | | | Merge pull request #945 from priyadi/planck_priyadi | Jack Humbert | 2016-12-12 | 1 | -6/+2 |
|\ \ \ \ \ | |||||
| * | | | | | Remove unneeded options to reduce firmware size | Priyadi Iman Nurcahyo | 2016-12-10 | 1 | -6/+2 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge pull request #944 from priyadi/negmousefix | Jack Humbert | 2016-12-12 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | Allow negative values for mouse movements | Priyadi Iman Nurcahyo | 2016-12-10 | 1 | -1/+1 |
| |/ / / / | |||||
* | | | | | Merge pull request #943 from lucwastiaux/master | Jack Humbert | 2016-12-12 | 3 | -27/+62 |
|\ \ \ \ \ | |||||
| * | | | | | put home/end on thumb cluster | lucwastiaux | 2016-12-10 | 1 | -2/+2 |