Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merged from upstream | Joshua T | 2017-01-07 | 336 | -3127/+39980 |
|\ | |||||
| * | Merge pull request #989 from ishigoya/master | Jack Humbert | 2017-01-06 | 5 | -0/+1016 |
| |\ | | | | | | | Keymap | ||||
| | * | new file: keyboards/ergodox/keymaps/ishigoya-jp/img/keyboard-layout-enL.png | ishigoya | 2017-01-06 | 5 | -3/+57 |
| | | | | | | | | | | | | | | | | | | | | | new file: keyboards/ergodox/keymaps/ishigoya-jp/img/keyboard-layout-jpL.png new file: keyboards/ergodox/keymaps/ishigoya-jp/img/keyboard-layout-numL.png modified: keyboards/ergodox/keymaps/ishigoya-jp/keymap.c new file: keyboards/ergodox/keymaps/ishigoya-jp/readme.md | ||||
| | * | new file: keyboards/ergodox/keymaps/ishigoya-jp/keymap.c | ishigoya | 2017-01-06 | 1 | -0/+962 |
| |/ | |||||
| * | Merge pull request #983 from common-nighthawk/master | Jack Humbert | 2017-01-04 | 2 | -0/+222 |
| |\ | | | | | | | adds personal keymap for ergodox optimized for macOS with Vim | ||||
| | * | reverts change outside of personal keymap. | Daniel | 2017-01-01 | 1 | -2/+1 |
| | | | |||||
| | * | adds dedicated double-quote key. | Daniel | 2017-01-01 | 1 | -5/+9 |
| | | | |||||
| | * | removes double-tab brackets and adds back quot to left cmd. | Daniel | 2016-12-06 | 1 | -10/+10 |
| | | | |||||
| | * | removes the double actions from the metakeys. | Daniel | 2016-11-27 | 1 | -17/+15 |
| | | | |||||
| | * | moves brackets to top row. | Daniel | 2016-11-18 | 1 | -9/+9 |
| | | | |||||
| | * | moves brackets from J/K to U/I to remove block of common vim sequence. | Daniel | 2016-09-06 | 1 | -8/+8 |
| | | | |||||
| | * | adds tap dance and macro to move underscore and l- and r- brackets to base ↵ | Daniel | 2016-09-02 | 2 | -25/+57 |
| | | | | | | | | | | | | layer. | ||||
| | * | adds Hyper key. improves media layer. first attempt at tap dance. | Daniel | 2016-09-01 | 2 | -35/+43 |
| | | | |||||
| | * | Merge remote-tracking branch 'upstream/master' | Daniel | 2016-08-31 | 439 | -13797/+30544 |
| | |\ | |||||
| | * | | minor tweaks to numpad and media layer | Daniel | 2016-08-14 | 1 | -26/+24 |
| | | | | |||||
| | * | | completes first-pass at media layer | Daniel | 2016-08-12 | 1 | -15/+15 |
| | | | | |||||
| | * | | completes first-pass at symbol layer | Daniel | 2016-08-12 | 1 | -36/+36 |
| | | | | |||||
| | * | | completes first-pass at base layer | Daniel | 2016-08-10 | 1 | -0/+183 |
| | | | | |||||
| * | | | Merge pull request #984 from deadcyclo/master | Jack Humbert | 2017-01-04 | 2 | -0/+283 |
| |\ \ \ | | | | | | | | | | | Added the deadcyclo layout | ||||
| | * | | | fix version macro making layer 3 sticky on deadcyclo layout | Brendan Johan Lee | 2017-01-03 | 1 | -2/+2 |
| | | | | | |||||
| | * | | | Added the deadcyclo layout | Brendan Johan Lee | 2017-01-02 | 2 | -0/+283 |
| | | | | | |||||
| * | | | | Merge pull request #988 from jcowgar/master | Jack Humbert | 2017-01-04 | 2 | -0/+265 |
| |\ \ \ \ | | |/ / / | |/| | | | Added Jeremy’s developers keymap for the Planck | ||||
| | * | | | Added Jeremy’s developers keymap for the Planck | Jeremy Cowgar | 2017-01-04 | 2 | -0/+265 |
| |/ / / | |||||
| * | | | Update config.h | Jack Humbert | 2017-01-02 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge pull request #980 from TerryMathews/master | Jack Humbert | 2016-12-31 | 6 | -0/+340 |
| |\ \ \ | | | | | | | | | | | Establish support for AMJPAD | ||||
| | * | | | Establish support for AMJPAD | TerryMathews | 2016-12-31 | 6 | -0/+340 |
| |/ / / | |||||
| * | | | Merge pull request #975 from fredizzimo/remove_temp_files | Jack Humbert | 2016-12-30 | 1 | -66/+0 |
| |\ \ \ | | | | | | | | | | | Remove extra file that has been commited by mistake | ||||
| | * | | | Remove extra file that has been commited by mistake | Fred Sundvik | 2016-12-29 | 1 | -66/+0 |
| | | | | | |||||
| * | | | | Merge pull request #976 from fredizzimo/fix_makefile_on_cygwin | Jack Humbert | 2016-12-30 | 1 | -18/+3 |
| |\ \ \ \ | | | | | | | | | | | | | Fix makefile on cygwin | ||||
| | * | | | | Clean up the SKIP_GIT code | Fred Sundvik | 2016-12-29 | 1 | -17/+2 |
| | | | | | | |||||
| | * | | | | Remove extra parenthesis from Makefile | Fred Sundvik | 2016-12-29 | 1 | -1/+1 |
| | |/ / / | | | | | | | | | | | | | | | | Cygwin had trouble running the tests | ||||
| * | | | | Merge pull request #973 from Wilba6582/keycode_refactor | Jack Humbert | 2016-12-30 | 4 | -314/+331 |
| |\ \ \ \ | | | | | | | | | | | | | Keycode refactor | ||||
| | * | | | | Keycode refactor | Wilba6582 | 2016-12-29 | 4 | -314/+331 |
| | | | | | | |||||
| * | | | | | Merge pull request #971 from algernon/ergodox-ez/algernon | Jack Humbert | 2016-12-30 | 3 | -6/+21 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | ergodox: Update algernon's keymap to v1.10 | ||||
| | * | | | | | ergodox: Update algernon's keymap to v1.10 | Gergely Nagy | 2016-12-28 | 3 | -6/+21 |
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Miscellaneous ============= * `µ` can now be entered with UCIS. * `™` can now be entered with UCIS. Tools ===== * `tools/hid-commands` can now find Banshee, and prefers it over Kodi. * `tools/hid-commands` can now find Chrome too, not juts Chromium. Signed-off-by: Gergely Nagy <algernon@madhouse-project.org> | ||||
| * | | | | | Merge pull request #974 from fredizzimo/remove_malloc_from_sysex | Jack Humbert | 2016-12-30 | 4 | -27/+71 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | API Sysex fixes | ||||
| | * | | | | | API Sysex fixes | Fred Sundvik | 2016-12-29 | 4 | -27/+71 |
| | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix memory leaks by using stack instead of malloc Reduce memory usage by having less temporary bufffers Remove warnings by adding includes Decrease code size by 608 bytes (mostly due to not linking malloc) More robust handling of buffer overflows | ||||
| * | | | | | Merge pull request #972 from mechkeys/rgb_compat | Jack Humbert | 2016-12-29 | 2 | -0/+3 |
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | Add extern for 'led' global, set 'weak' attribute for rgblight_set() | ||||
| | * | | | | Removed errant + | Scott Wilson | 2016-12-29 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Add extern for 'led' global, set 'weak' attribute for rgblight_set() | Scott Wilson | 2016-12-28 | 2 | -0/+3 |
| | |/ / / | |||||
| * | | | | Merge pull request #968 from ofples/bugfix/right-modifiers | Jack Humbert | 2016-12-28 | 2 | -0/+3 |
| |\ \ \ \ | | | | | | | | | | | | | Fixed bug in do_code16 | ||||
| | * | | | | Added check that makes sure a code is a right modifier before considering it ↵ | Ofer Plesser | 2016-12-23 | 2 | -0/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | as one | ||||
| * | | | | | Merge pull request #966 from Dbroqua/master | Jack Humbert | 2016-12-28 | 7 | -111/+650 |
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | Some updates for GH60 and Satan keyboard | ||||
| | * | | | | - Updated dbroqua layout for Satan keyboard | dbroqua | 2016-12-24 | 1 | -19/+17 |
| | | | | | | |||||
| | * | | | | - Added RGB layer on dbroqua GH60 layout | dbroqua | 2016-12-24 | 3 | -10/+288 |
| | | | | | | |||||
| | * | | | | - Fixed bug in dbroqua layout for Satan keyboard | dbroqua | 2016-12-22 | 2 | -40/+24 |
| | | | | | | |||||
| | * | | | | - Fixed bad typo in dbroqua layout for gh60 | dbroqua | 2016-12-22 | 1 | -19/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | - Removed unused function in dbroqua layout for gh60 | ||||
| | * | | | | - Renamed dbroqua_hhkb as dbroqua for gh60 layout | dbroqua | 2016-12-21 | 2 | -0/+0 |
| | | | | | | |||||
| | * | | | | - Rewrote dbroqua layout for Satan keyboard and adding RGB light | dbroqua | 2016-12-21 | 4 | -110/+170 |
| | | | | | | |||||
| | * | | | | - Updated gh60 files | dbroqua | 2016-12-20 | 3 | -1/+237 |
| | | | | | |