summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update Keycodes.mdJack Humbert2017-06-021-1/+1
|
* Merge pull request #1356 from fabienheureux/patch-1Jack Humbert2017-06-021-1/+1
|\ | | | | Broken Keymap docs link
| * Update Keycodes.mdJack Humbert2017-06-021-1/+1
| |
| * Broken Keymap docs linkfabienheureux2017-06-021-1/+1
|/
* Merge pull request #1347 from nooges/nyquistJack Humbert2017-06-0132-0/+2750
|\ | | | | Add Nyquist keyboard support
| * Update keymap layout commentsDanny Nguyen2017-06-017-13/+35
| |
| * Remove OLED code and set I2C rate back to 100kHzDanny Nguyen2017-06-015-766/+2
| |
| * Update copyright infoDanny Nguyen2017-05-306-6/+6
| |
| * Remove Let’s Split plate filesDanny Nguyen2017-05-305-22008/+0
| |
| * Update readmeDanny Nguyen2017-05-305-61/+93
| |
| * Modify pinout and layouts for NyquistDanny Nguyen2017-05-2920-259/+104
| |
| * Fork Let’s Split filesDanny Nguyen2017-05-2944-0/+25623
| |
* | Merge pull request #1294 from shieldsd/masterJack Humbert2017-06-011-0/+4
|\ \ | | | | | | Prevent the recording of looping dynamic macros.
| * | Prevent the recording of looping dynamic macros.Daniel Shields2017-06-011-0/+4
|/ / | | | | | | | | | | | | If a macro play key is inadvertently recorded in a dynamic macro a loop is created and the macro will not terminate when played. This should be prevented.
* | Merge pull request #1350 from originerd/add-originerd-planck-keymapJack Humbert2017-06-013-0/+256
|\ \ | | | | | | Add originerd planck keymap
| * | Add originerd planck keymapJitae Kim2017-05-313-0/+256
| | |
* | | Merge pull request #1351 from Alfrheim/fixing_dvorak_layoutJack Humbert2017-06-011-1/+1
|\ \ \ | | | | | | | | replacing one R for a T
| * | | replacing one R for a TAlfrheim2017-05-311-1/+1
| | | |
* | | | Merge pull request #1353 from 333fred/333fred-layoutJack Humbert2017-06-014-0/+528
|\ \ \ \ | | | | | | | | | | ergodox/333fred layout
| * | | | Update licensing on visualizer.cFredric Silberberg2017-05-311-14/+1
| | | | |
| * | | | Updated readmeFredric Silberberg2017-05-312-7/+13
| | | | |
| * | | | Added several new macrosFredric Silberberg2017-05-311-19/+63
| | | | |
| * | | | Fixed numpad 0 layoutFredric Silberberg2017-05-312-3/+3
| | | | |
| * | | | Use code blocks for keyboard layoutsFredric Silberberg2017-05-301-3/+13
| | | | |
| * | | | Completed iteration 1 of my layoutFredric Silberberg2017-05-304-98/+306
| | | | |
| * | | | Added initial keymap filesFredric Silberberg2017-05-303-0/+273
| | | | |
* | | | | Merge pull request #1354 from shieldsd/tweaksJack Humbert2017-06-012-8/+10
|\ \ \ \ \ | |_|/ / / |/| | | | Tweak reported power consumption to work with iOS
| * | | | Tweak reported power consumption to work with iOSDaniel Shields2017-06-012-8/+10
|/ / / /
* | | | Merge pull request #1348 from Dbroqua/masterJack Humbert2017-05-307-0/+242
|\ \ \ \ | |/ / / |/| | | Added DK60 keyboard
| * | | Merge remote-tracking branch 'origin/feature/DK60'dbroqua2017-05-302-3/+1
| |\ \ \
| | * | | - Updated copyrightdbroqua2017-05-302-3/+1
| | | | |
| * | | | Merge remote-tracking branch 'origin/feature/DK60'Damien Broqua2017-05-301-1/+3
| |\| | |
| | * | | - Updated readmeDamien Broqua2017-05-301-1/+3
| | | | |
| * | | | Merge remote-tracking branch 'origin/feature/DK60'Damien Broqua2017-05-307-0/+242
| |\| | |
| | * | | - Added Capslock/Esc ledDamien Broqua2017-05-303-35/+97
| | | | |
| | * | | - Some changes on DK60Damien Broqua2017-05-305-41/+37
| | | | |
| | * | | - Initial commit for branch DK60dbroqua2017-05-077-0/+184
| | | | |
* | | | | Merge pull request #1323 from nikchi/masterJack Humbert2017-05-305-22/+62
|\ \ \ \ \ | | | | | | | | | | | | Variable tapping terms
| * | | | | hmm?Nick Choi2017-05-301-1/+1
| | | | | |
| * | | | | Merge pull request #2 from qmk/masterNick Choi2017-05-3092-34/+5520
| |\ \ \ \ \ | |/ / / / / |/| | | | | pull in new qmk changes
* | | | | | Merge branch 'master' of https://github.com/qmk/qmk_firmwareJack Humbert2017-05-303-3/+21
|\ \ \ \ \ \
| * \ \ \ \ \ Merge pull request #1342 from priyadi/adafruit-mouse-buttonsJack Humbert2017-05-303-3/+21
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Adafruit Feather BLE / BLE Friend mouse buttons support
| | * | | | | | Adafruit Feather BLE / BLE Friend mouse buttons supportPriyadi Iman Nurcahyo2017-05-293-3/+21
| | | | | | | |
* | | | | | | | make qmk bot do the hard workJack Humbert2017-05-301-2/+2
|/ / / / / / /
* | | | | | | Merge branch 'master' of https://github.com/qmk/qmk_firmwareJack Humbert2017-05-301-4/+6
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Merge pull request #1344 from qmk/jackhumbert-patch-1Jack Humbert2017-05-291-4/+6
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Re-enable mouse buttons from #1327
| | * | | | | | Re-enable mouse buttonsJack Humbert2017-05-291-4/+6
| |/ / / / / /
* / / / / / / exclude PRsJack Humbert2017-05-302-5/+6
|/ / / / / /
* | | | | | no master needed on push maybeJack Humbert2017-05-291-1/+1
| | | | | |
* | | | | | Merge branch 'master' of https://github.com/qmk/qmk_firmwareJack Humbert2017-05-298-15/+360
|\ \ \ \ \ \