Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Added Gaming layer and removed Dvorak | Joshua T | 2016-07-19 | 1 | -23/+23 |
* | Added default layer switch QWERTY to Colemak | Joshua T | 2016-07-15 | 1 | -3/+5 |
* | Fixed a merge conflict | Joshua T | 2016-07-15 | 1 | -9/+0 |
* | Merge remote-tracking branch 'upstream/master' | Joshua T | 2016-07-15 | 2 | -0/+213 |
|\ | |||||
| * | Merge pull request #2 from jackhumbert/master | Joshua Colbeck | 2016-07-12 | 62 | -663/+2675 |
| |\ | |||||
| * \ | Merge branch 'master' of https://github.com/Skrymir/qmk_firmware | Josh Colbeck | 2016-07-06 | 2 | -0/+213 |
| |\ \ | |||||
| | * | | Changed layer switching to momentary | Josh Colbeck | 2016-07-06 | 1 | -6/+6 |
| | * | | Merge remote-tracking branch 'jackhumbert/master' into patch-1 | Josh Colbeck | 2016-07-04 | 2 | -14/+14 |
| | |\ \ | |||||
| | * \ \ | Merge remote-tracking branch 'jackhumbert/master' into patch-1 | Josh Colbeck | 2016-07-04 | 2 | -11/+5 |
| | |\ \ \ | |||||
| | * | | | | Added macro and readme | Josh Colbeck | 2016-07-04 | 2 | -18/+40 |
| | * | | | | Added new keymap | Josh Colbeck | 2016-07-04 | 1 | -0/+191 |
| | * | | | | Revert "Changed layout of left hand main layer" | Josh Colbeck | 2016-07-03 | 1 | -12/+12 |
| | * | | | | Changed layout of left hand main layer | Joshua Colbeck | 2016-07-03 | 1 | -12/+12 |
* | | | | | | Corrected merge conflict | Joshua T | 2016-07-13 | 1 | -0/+7 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Created replicaJunction keymaps. | Joshua T | 2016-07-11 | 2 | -0/+489 |
| | |_|_|_|/ | |/| | | | | |||||
* / | | | | | Created replicaJunction keymaps. | Joshua T | 2016-07-13 | 2 | -0/+503 |
|/ / / / / | |||||
* | | | | | Merge pull request #477 from Smilliam/master | Jack Humbert | 2016-07-11 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | amended extraneous file edits | Smilliam | 2016-07-10 | 2 | -7/+1 |
| * | | | | | Made rollover behavior for space cadet optional | Smilliam | 2016-07-10 | 2 | -2/+8 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge pull request #506 from stanleylai/master | Jack Humbert | 2016-07-11 | 2 | -0/+104 |
|\ \ \ \ \ | |||||
| * | | | | | Added my custom keymap for Satan | Stanley Lai | 2016-07-10 | 2 | -0/+104 |
* | | | | | | fixed clueboard LED pin assignments and matrix documentation | Ruiqi Mao | 2016-07-11 | 4 | -17/+33 |
|/ / / / / | |||||
* | | | | | Update keymap.c | Max Whittingham | 2016-07-09 | 1 | -3/+1 |
* | | | | | Cleaning up repo | Max Whittingham | 2016-07-09 | 5 | -0/+546 |
* | | | | | Merge pull request #1 from jackhumbert/master | TerryMathews | 2016-07-09 | 7 | -1/+161 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | Merge pull request #494 from robbiegill/master | Jack Humbert | 2016-07-08 | 7 | -1/+161 |
| |\ \ \ \ \ | |||||
| | * | | | | | port missing support for hhkb-jp from tmk | Robbie Gill | 2016-07-07 | 7 | -1/+161 |
| | | |/ / / | | |/| | | | |||||
* | / | | | | Establish Poker clone keymap for Satan | TerryMathews | 2016-07-09 | 1 | -0/+116 |
|/ / / / / | |||||
* | | | | | Fix a function mismatch that was causing LEDs to not properly initialize | TerryMathews | 2016-07-08 | 1 | -1/+1 |
* | | | | | Fix cluepad and planck | TerryMathews | 2016-07-07 | 2 | -5/+5 |
* | | | | | Fix compile error on Clueboard | TerryMathews | 2016-07-07 | 1 | -2/+2 |
* | | | | | Create keycodes for RGB control functions | TerryMathews | 2016-07-07 | 9 | -586/+23 |
* | | | | | Remove unhandled KC_BTLD, RESET should be used instead | Fred Sundvik | 2016-07-07 | 2 | -2/+5 |
* | | | | | updates rgblight implementation, makes non-timer stuff compatible with audio | Jack Humbert | 2016-07-07 | 13 | -49/+113 |
* | | | | | Merge pull request #490 from fredizzimo/integrate_visualizer | Jack Humbert | 2016-07-07 | 17 | -0/+1568 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Move the visualizer_user file to keymap folder | Fred Sundvik | 2016-07-07 | 1 | -0/+0 |
| * | | | | Delete lcd_backlight_hal.c | Fred Sundvik | 2016-07-07 | 2 | -84/+65 |
| * | | | | Makefile fixes and update of Visualizer | Fred Sundvik | 2016-07-07 | 1 | -0/+9 |
| * | | | | Add Infinity Ergodox display drivers | Fred Sundvik | 2016-07-07 | 13 | -0/+992 |
| * | | | | Makefile changes and files to compile Visualizer | Fred Sundvik | 2016-07-07 | 4 | -0/+586 |
* | | | | | default keymap, reset sorted out for now, added serial to makefile | Jack Humbert | 2016-07-06 | 6 | -41/+203 |
* | | | | | Merge branch 'master' into lets-split-support | Jack Humbert | 2016-07-06 | 3 | -0/+23 |
|\| | | | | |||||
| * | | | | Add serial_link compilation to Infinity Ergodox | Fred Sundvik | 2016-07-06 | 2 | -0/+11 |
| * | | | | fix/annotate wait_us lines | Jack Humbert | 2016-07-06 | 1 | -0/+12 |
* | | | | | adds eep, removes usbconfig.h | Jack Humbert | 2016-07-06 | 3 | -377/+4 |
* | | | | | remove uno_slave for now, even though it's freakin cool | Jack Humbert | 2016-07-05 | 5 | -448/+0 |
* | | | | | add options to config.h | Jack Humbert | 2016-07-05 | 1 | -2/+5 |
* | | | | | Merge branch 'master' into lets-split-support | Jack Humbert | 2016-07-05 | 12 | -0/+1863 |
|\| | | | | |||||
| * | | | | Merge pull request #480 from fredizzimo/add_infinity_ergodox | Jack Humbert | 2016-07-05 | 12 | -0/+1863 |
| |\ \ \ \ | |||||
| | * | | | | Infinity Ergodox - Add matrix.c and led.c | Fred Sundvik | 2016-07-05 | 2 | -1/+4 |