summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master'Brendan Johan Lee2017-01-302-2/+18
|\
| * Merge pull request #1043 from potz/patch-1skullydazed2017-01-271-0/+16
| |\ | | | | | | Clarify license on abnt2 keymap (#1038)
| | * Clarify license on abnt2 keymap (#1038)Potiguar Faga2017-01-271-0/+16
| |/
| * Merge pull request #869 from dylanjgscott/masterJack Humbert2017-01-271-2/+2
| |\ | | | | | | Use `type cmp` to test for cmp in Makefile
| | * Compare Makefile with itself instead of using `--help`Dylan Scott2017-01-241-2/+2
| | |
* | | Merge remote-tracking branch 'upstream/master'Brendan Johan Lee2017-01-2716-22/+22
|\| |
| * | Merge pull request #1035 from qmk/qmk_org_changesJack Humbert2017-01-2716-22/+22
| |\ \ | | | | | | | | Updated urls due to transfer to qmk org
| | * | replace jackhumbert with qmkJack Humbert2017-01-2616-22/+22
| |/ /
* | | [deadcyclo layout] Added more unicode keys and ibus unicode compose trigger keysBrendan Johan Lee2017-01-274-23/+26
| | |
* | | Merge remote-tracking branch 'upstream/master'Brendan Johan Lee2017-01-2611-16/+403
|\| |
| * | Merge pull request #1029 from SjB/qmk_infinity60Jack Humbert2017-01-265-0/+46
| |\ \ | | | | | | | | fix: infinity60 keyboard was not using quantum features.
| | * | updated all the other keymaps to support the new changes.SjB2017-01-243-0/+28
| | | | | | | | | | | | | | | | | | | | | | | | qmk firmware requires the matrix_init_user and matrix_scan_user function to be implementated. Added these function to all the existing keymaps.
| | * | fix: infinity60 keyboard was not using quantum features.SjB2017-01-232-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | the quantum matrix codes where not being initialized or/and called so no feature of the quantum firmware could be used. These codes have been added and now we can enjoy the quantum firmware goodness.
| * | | Merge pull request #1033 from smt/smt/preonicJack Humbert2017-01-263-0/+335
| |\ \ \ | | | | | | | | | | Add smt's keymap for Preonic
| | * | | Remove COLEMAK from preonic_keycodes enumStephen Tudor2017-01-251-1/+0
| | | | |
| | * | | Update readme for smt Preonic keymapStephen Tudor2017-01-251-1/+85
| | | | |
| | * | | Add smt keymap for PreonicStephen Tudor2017-01-253-0/+252
| | | | |
| * | | | Add gitter image, start update to qmk orgJack Humbert2017-01-261-3/+3
| | | | |
| * | | | Merge branch 'master' of github.com:jackhumbert/qmk_firmwareJack Humbert2017-01-253-3/+66
| |\| | |
| * | | | layer defines to enumJack Humbert2017-01-252-13/+19
| | |/ / | |/| |
* | | | [deadcyclo layout] Added lotsof new emojis and some new unicode keysBrendan Johan Lee2017-01-253-11/+178
| | | |
* | | | Merge remote-tracking branch 'upstream/master'Brendan Johan Lee2017-01-246-8/+72
|\ \ \ \ | | |/ / | |/| |
| * | | Merge pull request #1014 from SjB/lcd_mods_statusJack Humbert2017-01-243-3/+66
| |\ \ \ | | |/ / | |/| | added mods status bit to visualizer.
| | * | added mods status bit to visualizer.SjB2017-01-173-3/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since we can't read the real_mods and oneshot_mods static variable directly within the update_user_visualizer_state function (Threading and serial link). We are know storing the mods states in the visualizer_keyboard_status_t structure. We can now display the status of the modifier keys on the LCD display.
| * | | turn off rgb_midi in ezJack Humbert2017-01-233-5/+6
| | | |
* | | | [deadcyclo layout] Added unicode layerBrendan Johan Lee2017-01-245-27/+98
| | | |
* | | | [deadcyclo layout] Added support for ergodox ez shineBrendan Johan Lee2017-01-244-14/+40
|/ / /
* | | Merge pull request #1026 from TerryMathews/masterJack Humbert2017-01-232-23/+0
|\ \ \ | | | | | | | | Let's Split: More code cleanup
| * | | More code cleanupTerryMathews2017-01-222-23/+0
| | | | | | | | | | | | | | | | | | | | Missed a few commented out vestigal defines in revx/config.h that had been moved to keymap/serial and i2c.
* | | | Merge pull request #1018 from hot-leaf-juice/masterJack Humbert2017-01-222-44/+19
|\ \ \ \ | | | | | | | | | | simplified my keymap
| * | | | simplifyCallum Oakley2017-01-202-44/+19
| | | | |
* | | | | More keyboard map tweaking (#1019)Christopher Browne2017-01-222-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add HOME/END keys as upper/lower on arrow-up/down * Reduce .hex file size by turning off unneeded options * Put digit keypad onto left hand upon RAISE; this will sometimes be preferable to double-hits of right hand
* | | | | Merge pull request #1020 from remigius42/masterJack Humbert2017-01-226-0/+1157
|\ \ \ \ \ | | | | | | | | | | | | Swiss German layout for Ergodox EZ & Infinity
| * | | | | SG Ergodox layout: Updated layout documentationAndreas Schmidt2017-01-223-4/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Swiss German Ergodox layout: Updated layout documentation based on previous layout changes.
| * | | | | SG Ergodox layout: Fixed ENTER key mappingAndreas Schmidt2017-01-221-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Swiss German Ergodox layout: Additional ENTER key was mapped to wrong layer and keyboard half.
| * | | | | SG Ergodox layout: Minor code formatting changesAndreas Schmidt2017-01-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Swiss German Ergodox layout: Removed unnecessary spaces.
| * | | | | SG Ergodox layout: Add ENTER to left keyboardAndreas Schmidt2017-01-221-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Swiss German Ergodox layout: Added ENTER key to left keyboard half on media layer such that the enter key is available on both halves to be able to flash both halves without an additional keyboard.
| * | | | | SG Ergodox layout: Add <br/> macro to media layerAndreas Schmidt2017-01-221-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Added <br/> macro to media layer of Swiss German layout for Ergodox
| * | | | | Renamed JSON source of Ergodox Swiss GermanAndreas Schmidt2017-01-212-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Renamed the JSON source files for the layout description of the Ergodox Swiss German keymap
| * | | | | Correct layout description of ergodox swissgermanAndreas Schmidt2017-01-212-15/+16
| | | | | | | | | | | | | | | | | | | | | | | | - Added missing HTML macros to media layer.
| * | | | | Removed Ergodox EZ & Infinity specific keymapsAndreas Schmidt2017-01-2112-2233/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Removed the keymaps for Swiss German spefic for Ergodox EZ and Infinity after previously merging them.
| * | | | | Merged keymap for Ergodox EZ & InfinityAndreas Schmidt2017-01-216-0/+1136
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Merged keymap for Ergodox EZ & Infinity into one single keymap using pre-processor macros.
| * | | | | Add Swiss German layout for Ergodox InfinityAndreas Schmidt2017-01-216-0/+1112
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add Swiss German layout for Ergodox Infinity based on default layout for Ergodox EZ. - Minor changes in the event loop to prevent flashing display background lights.
| * | | | | Add Swiss German layout for Ergodox EZAndreas Schmidt2017-01-216-0/+1121
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | - Add Swiss German layout for Ergodox EZ based on default layout for Ergodox EZ. - Minor changes in the event loop to prevent flashing of leds.
* | | | | Merge pull request #1022 from lucwastiaux/masterJack Humbert2017-01-222-13/+48
|\ \ \ \ \ | | | | | | | | | | | | Improvements to Dvorak Programmer Ergodox keymap
| * | | | | document BRACKETS and SHELL_LAYERlucwastiaux2017-01-221-1/+6
| | | | | |
| * | | | | make shell layer more compatible with default layerlucwastiaux2017-01-211-15/+16
| | | | | |
| * | | | | couple of changes to the shell layerlucwastiaux2017-01-211-4/+4
| | | | | |
| * | | | | introduce shell_layerlucwastiaux2017-01-191-3/+31
| | | | | |
| * | | | | put shell nav under tab, introduce an OSL for the brackets layerlucwastiaux2017-01-171-4/+5
| | | | | |