Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #1425 from kynikos/patch-1 | Jack Humbert | 2017-06-24 | 1 | -1/+1 |
|\ | | | | | Fix typo | ||||
| * | Fix typo | Dario Giovannetti | 2017-06-24 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #1426 from rai-suta/master | Jack Humbert | 2017-06-24 | 1 | -22/+120 |
|\ \ | |/ |/| | Add JIS_KEYCODE layout for send_string() | ||||
| * | Add JIS_KEYCODE layout for send_string() | rai-suta | 2017-06-24 | 1 | -22/+120 |
|/ | |||||
* | update docs for isp | Jack Humbert | 2017-06-23 | 2 | -2/+2 |
| | |||||
* | Merge branch 'master' of https://github.com/qmk/qmk_firmware | Jack Humbert | 2017-06-23 | 34 | -322/+2615 |
|\ | |||||
| * | Merge pull request #1422 from nstickney/master | Jack Humbert | 2017-06-23 | 3 | -63/+82 |
| |\ | | | | | | | update ErgoDox "Familiar" layout | ||||
| | * | updated README.md | Stick | 2017-06-23 | 2 | -5/+3 |
| | | | |||||
| | * | Merge remote-tracking branch 'upstream/master' | Stick | 2017-06-23 | 18 | -259/+738 |
| | |\ | |||||
| | * | | added media keys; many bug fixes | Stick | 2017-06-23 | 2 | -27/+26 |
| | | | | |||||
| | * | | added tapdance locking | Stick | 2017-06-22 | 2 | -44/+66 |
| | | | | |||||
| | * | | Merge remote-tracking branch 'upstream/master' | Stick | 2017-06-22 | 485 | -25863/+9757 |
| | |\ \ | |||||
| | * | | | Revert "ugly workaround for ErgoDoxEZ LED bugs: turn 'em all off" | Stick | 2017-06-08 | 3 | -23/+24 |
| | | | | | | | | | | | | | | | | | | | | This reverts commit f397402e101774eedd1748b1e31c7386f927d4ed. | ||||
| | * | | | trying to fix LEDs | Stick | 2017-06-08 | 1 | -21/+21 |
| | | | | | |||||
| | * | | | Merge remote-tracking branch 'upstream/master' | Stick | 2017-06-08 | 12 | -3/+361 |
| | |\ \ \ | |||||
| | * \ \ \ | Merge remote-tracking branch 'upstream/master' | Stick | 2017-06-07 | 11 | -28/+279 |
| | |\ \ \ \ | |||||
| | * | | | | | ugly workaround for ErgoDoxEZ LED bugs: turn 'em all off | Stick | 2017-06-02 | 3 | -45/+44 |
| | | | | | | | |||||
| | * | | | | | moved alt out from under space | Stick | 2017-06-02 | 1 | -7/+7 |
| | | | | | | | |||||
| | * | | | | | Merge remote-tracking branch 'upstream/master' | Stick | 2017-06-02 | 376 | -684/+16127 |
| | |\ \ \ \ \ | |||||
| | * | | | | | | small changes | Stick | 2017-04-18 | 2 | -6/+6 |
| | | | | | | | | |||||
| * | | | | | | | Update _summary.md | Jack Humbert | 2017-06-23 | 1 | -0/+1 |
| | | | | | | | | |||||
| * | | | | | | | Create isp_flashing_guide.md | Jack Humbert | 2017-06-23 | 1 | -0/+106 |
| | | | | | | | | |||||
| * | | | | | | | Merge pull request #1418 from npoirey/master | Jack Humbert | 2017-06-23 | 11 | -0/+1688 |
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | Frenchdev v1 | ||||
| | * | | | | | | Updated frenchdev readme | npoirey | 2017-06-23 | 1 | -10/+48 |
| | | | | | | | | |||||
| | * | | | | | | Refactoring frenchdev | npoirey | 2017-06-23 | 5 | -59/+61 |
| | | | | | | | | |||||
| | * | | | | | | Moved frenchdev to handwired | npoirey | 2017-06-23 | 16 | -167/+77 |
| | | | | | | | | |||||
| | * | | | | | | Removed image from git and added references to imgur album for Frenchdev ↵ | npoirey | 2017-06-22 | 2 | -0/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | keyboard. | ||||
| | * | | | | | | Fix warning in frenchdev | npoirey | 2017-06-22 | 1 | -2/+2 |
| | | | | | | | | |||||
| | * | | | | | | Frenchdev v1 | npoirey | 2017-06-22 | 16 | -0/+1729 |
| | | | | | | | | |||||
| * | | | | | | | Merge pull request #1421 from 333fred/update-layout | Jack Humbert | 2017-06-23 | 4 | -61/+106 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Update my layout | ||||
| | * | | | | | | | Doc updates | Fredric Silberberg | 2017-06-23 | 2 | -18/+22 |
| | | | | | | | | | |||||
| | * | | | | | | | Copy/paste additions. | Fredric Silberberg | 2017-06-23 | 2 | -15/+17 |
| | | | | | | | | | |||||
| | * | | | | | | | Added backlight control keys | Fredric Silberberg | 2017-06-23 | 2 | -5/+4 |
| | | | | | | | | | |||||
| | * | | | | | | | Added a few more VS macros and another ctrl | Fredric Silberberg | 2017-06-23 | 1 | -11/+30 |
| | | | | | | | | | |||||
| | * | | | | | | | Small keymap layout updates | Fredric Silberberg | 2017-06-23 | 3 | -18/+39 |
| | | |_|_|_|_|/ | | |/| | | | | | |||||
| * | | | | | | | Merge pull request #1419 from Wraul/phantom-improvements | Jack Humbert | 2017-06-23 | 14 | -198/+632 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | Phantom improvements | ||||
| | * | | | | | | Update Phantom readme | Mathias Andersson | 2017-06-23 | 2 | -3/+46 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added basic description of the keyboard and some build and configuration instructions. Also moved the RGB underlight modification instructions to the readme. | ||||
| | * | | | | | | Adjust Phantom for standard PCB | Mathias Andersson | 2017-06-23 | 10 | -121/+405 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous default configuration and keymap was made for a Phantom modified with RGB underlight. This commit makes the default more in line with the "official" configurations provided by the PCB. The previous default have been moved to a separate keymap named `rgbmod`. It has also been updated to better match the template keymap. | ||||
| | * | | | | | | Update Phantom config to better match template | Mathias Andersson | 2017-06-23 | 2 | -22/+122 |
| | | | | | | | | |||||
| | * | | | | | | Move Phantom LED handling to phantom.c | Mathias Andersson | 2017-06-23 | 3 | -53/+60 |
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is more in line with the structure provided by the keyboard template. | ||||
* / / / / / / | add other mcu bootloaders | Jack Humbert | 2017-06-23 | 3 | -0/+540 |
|/ / / / / / | |||||
* | | | | | | Update _summary.md | Jack Humbert | 2017-06-22 | 1 | -1/+2 |
| | | | | | | |||||
* | | | | | | Create adding_a_keyboard_to_qmk.md | Jack Humbert | 2017-06-22 | 1 | -0/+35 |
| | | | | | | |||||
* | | | | | | Update porting_your_keyboard_to_qmk.md | Jack Humbert | 2017-06-22 | 1 | -1/+5 |
| | | | | | | |||||
* | | | | | | Merge pull request #1416 from geofflane/feature/s65_x_std_grv_esc | Jack Humbert | 2017-06-22 | 3 | -200/+6 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Use the new Quantum KC_GESC instead of custom code | ||||
| * | | | | | | Use the new Quantum KC_GESC instead of custom code | Geoff Lane | 2017-06-21 | 3 | -200/+6 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #1331 from ariasuni/master | Erez Zukerman | 2017-06-22 | 4 | -8/+62 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | Fix undefined reference errors with avr-gcc 7.1 | ||||
| * | | | | | | Fix undefined reference errors with avr-gcc 7.1 | ariasuni | 2017-05-27 | 4 | -8/+62 |
| | | | | | | | |||||
* | | | | | | | add group edge via travis updates | Jack Humbert | 2017-06-21 | 1 | -0/+1 |
| |/ / / / / |/| | | | | | |||||
* | | | | | | Merge pull request #1405 from cquiroz/oneshot-mods-timeout | Jack Humbert | 2017-06-20 | 1 | -1/+3 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Oneshot mods timeout |