aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1319 from Johannes-Larsson/masterJack Humbert2017-05-264-0/+130
|\ | | | | Add planck/johannes layout
| * readme, media keys fixJohannes Larsson2017-05-243-25/+21
| |
| * revert changes to config.hJohannes Larsson2017-05-241-2/+2
| |
| * media keys and stuffJohannes Larsson2017-05-242-58/+15
| |
| * Merge branch 'master' of https://github.com/qmk/qmk_firmwareJohannes Larsson2017-05-241-2/+2
| |\
| * \ mergeJohannes Larsson2017-05-223-0/+177
| |\ \
| | * | colemak layout maybeJohannes Larsson2017-04-121-13/+31
| | | |
| | * | stuffjohannes2017-02-031-3/+35
| | | |
| | * | Merge branch 'master' of https://github.com/Johannes-Larsson/qmk_firmwarejohannes2017-02-032-19/+20
| | |\ \
| | * | | initial keymapjohannes2017-02-034-3/+129
| | | | |
| * | | | matrix layoutJohannes Larsson2017-05-221-2/+2
| | | | |
* | | | | Merge pull request #1327 from Dbroqua/masterJack Humbert2017-05-2610-18/+183
|\ \ \ \ \ | | | | | | | | | | | | Added Integration of IBM Trackpoint
| * | | | | - Added schematic for Trackpoint demonstrationdbroqua2017-05-262-0/+3
| | | | | |
| * | | | | - Added integration of IBM Trackpointdbroqua2017-05-269-18/+180
| | | | | |
| * | | | | Merge pull request #22 from qmk/masterDamien2017-05-26199-511/+3567
| |\ \ \ \ \ | | | | | | | | | | | | | | Merge from QMK
* | \ \ \ \ \ Merge pull request #1328 from yiancar/qmk_usb_startup_disableJack Humbert2017-05-262-7/+15
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | Use variable to disable usb check at startup
| * | | | | | Use variable to disable usb check at startupyiancar2017-05-262-7/+15
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds a define variable which when defined disables the usb startup check. Modified the makefile to separate above define from bluetooth dependancy
* | | | | | Merge pull request #1316 from nikchi/masterJack Humbert2017-05-2410-3/+552
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | FrostyFlake Keymap
| * | | | | moved unicodemap rules to localer makeNick Choi2017-05-241-1/+0
| | | | | |
| * | | | | more emoji function commentsNick Choi2017-05-242-13/+38
| | | | | |
| * | | | | Tap dancing emoji support 😩😩Nick Choi2017-05-231-11/+64
| | | | | |
| * | | | | removed sNick Choi2017-05-231-2/+1
| | | | | |
| * | | | | Merge branch 'master' of https://github.com/nikchi/qmk_firmwareNick Choi2017-05-2318-64/+436
| |\ \ \ \ \
| | * \ \ \ \ Merge pull request #1 from qmk/masterNick Choi2017-05-2318-64/+436
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | | pull new to mine
| * | | | | | preonic mapNick Choi2017-05-235-2/+255
| | | | | | |
| * | | | | | emojis and reorgNick Choi2017-05-151-28/+45
| |/ / / / /
| * | | | | emoji support butNick Choi2017-05-154-30/+78
| | | | | |
| * | | | | change readmeNick Choi2017-05-151-1/+1
| | | | | |
| * | | | | nikchi flakeNick Choi2017-05-154-0/+155
| | | | | |
* | | | | | Merge pull request #1317 from qmk/hf/faster_mouseErez Zukerman2017-05-241-2/+2
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | tweaks default mouse speed constants
| * | | | | tweaks default mouse speed constantsErez Zukerman2017-05-241-2/+2
|/ / / / /
* | | | | Update readme.mdJack Humbert2017-05-201-1/+1
| | | | |
* | | | | Update readme.mdJack Humbert2017-05-201-23/+12
| | | | |
* | | | | Workaround for the macOS caps lock delay (#1308)jerryen2017-05-192-10/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add 80ms delay for KC_CAPS when used as a tap key Workaround for the macOS caps lock delay * Revert "Increase TAPPING_TERM for the Clueboard" This reverts commit a74e69e9fa889113ee31fbc8dc7e6848fdb07576.
* | | | | m10a lowercaseJack Humbert2017-05-187-2/+2
| | | | |
* | | | | Merge pull request #1303 from cwesterlund/dvorak_dev_sweErez Zukerman2017-05-182-0/+359
|\ \ \ \ \ | | | | | | | | | | | | Created a dvorak keymap for Swedish developers using Visual Studio
| * | | | | Created a dvorak keymap for Swedish developers using Visual StudioChristian Westerlund2017-05-162-0/+359
| | | | | |
* | | | | | ESC/GRAVE/TILDE better handling (#1307)tengg2017-05-171-14/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * revise HHKB bootloader_size to 4096 such that sw reset works * cleanup esr/grave/tilde handling function
* | | | | | update travis scriptJack Humbert2017-05-172-7/+7
| | | | | |
* | | | | | Increase TAPPING_TERM for the ClueboardskullY2017-05-161-0/+10
| | | | | |
* | | | | | Make KC_GRV accessibleskullY2017-05-162-2/+2
|/ / / / /
* | | | | Merge pull request #1298 from barrar/masterJack Humbert2017-05-152-16/+43
|\ \ \ \ \ | |/ / / / |/| | | | Anti-ghost improvement for older keyboards with empty spots in matrix
| * | | | added comments and made function name clearerJeremiah2017-05-141-13/+18
| | | | |
| * | | | whoopsJeremiah2017-05-141-2/+2
| | | | |
| * | | | faster, less bits :)Jeremiah2017-05-141-9/+2
| | | | |
| * | | | faster and less bits... againJeremiah2017-05-131-6/+5
| | | | |
| * | | | faster and less bitsJeremiah2017-05-131-18/+15
| | | | |
| * | | | should be using matrix_row_tJeremiah2017-05-131-3/+3
| | | | |
| * | | | a bit smallerJeremiah2017-05-131-6/+6
| | | | |
| * | | | a bit smallerJeremiah2017-05-131-18/+35
| | | | |