Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | | | | * | | | Fixed getting "stuck" in gaming layer | Joshua T | 2016-08-24 | 1 | -1/+1 | |
| | | | | * | | | Merge remote-tracking branch 'upstream/master' | Joshua T | 2016-08-24 | 219 | -3936/+16346 | |
| | | | | |\ \ \ | ||||||
| | | | | * | | | | Several key placement fixes. | Joshua T | 2016-08-24 | 8 | -11/+21 | |
| | | | | * | | | | Minor changes to Extend and Number layers. | Joshua T | 2016-08-16 | 3 | -10/+10 | |
| | | | | * | | | | Moved Shift keys to Z and ? | Joshua T | 2016-08-09 | 1 | -9/+9 | |
| | | | | * | | | | Created build.bat | Joshua T | 2016-08-09 | 1 | -0/+51 | |
| | | | | * | | | | Merged branch master into master | Joshua T | 2016-08-09 | 28 | -168/+1575 | |
| | | | | |\ \ \ \ | | | | |_|/ / / / | | | |/| | | | | | ||||||
| | | | | * | | | | Changed left thumb back to Ctrl/Alt | Joshua T | 2016-08-09 | 1 | -11/+8 | |
| | | | | * | | | | Created keymap-specific config.h | Joshua T | 2016-08-09 | 1 | -0/+63 | |
| | | | | * | | | | Reverted Ergodox config.h | Joshua T | 2016-08-09 | 1 | -1/+1 | |
| | | | | * | | | | Created keymap local config.h file | Joshua T | 2016-08-09 | 2 | -4/+95 | |
| | | | | * | | | | Merge remote-tracking branch 'upstream/master' | Joshua T | 2016-08-07 | 35 | -612/+2743 | |
| | | | | |\ \ \ \ | ||||||
| | | | | * | | | | | Moved PREVENT_STUCK_MODIFIERS to config.h | Joshua T | 2016-07-30 | 2 | -3/+3 | |
| | | | | * | | | | | Moved my Ergodox keymap to match upstream changes | Joshua T | 2016-07-30 | 2 | -8/+10 | |
| | | | | * | | | | | Merge remote-tracking branch 'upstream/master' | Joshua T | 2016-07-30 | 245 | -1742/+3096 | |
| | | | | |\ \ \ \ \ | ||||||
| | | | | * \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' | Joshua T | 2016-07-26 | 97 | -431/+6775 | |
| | | | | |\ \ \ \ \ \ | ||||||
| | | | | * | | | | | | | Modified Atreus extend and Ergodox. | Joshua T | 2016-07-26 | 5 | -179/+151 | |
| | | | | * | | | | | | | Created readme and added screenshots | Joshua T | 2016-07-20 | 6 | -15/+74 | |
| | | | | * | | | | | | | Modified Atreus layout to account for keymap() function | Joshua T | 2016-07-19 | 1 | -30/+30 | |
| | | | | * | | | | | | | Adjusted Atreus KEYMAP() function. | Joshua T | 2016-07-19 | 1 | -5/+5 | |
| | | | | * | | | | | | | Added Gaming layer and removed Dvorak | Joshua T | 2016-07-19 | 1 | -23/+23 | |
| | | | | * | | | | | | | Merge branch 'master' of https://github.com/replicaJunction/qmk_firmware | Joshua T | 2016-07-15 | 0 | -0/+0 | |
| | | | | |\ \ \ \ \ \ \ | ||||||
| | | | | | * | | | | | | | Added default layer switch QWERTY to Colemak | Joshua T | 2016-07-15 | 1 | -3/+3 | |
| | | | | * | | | | | | | | 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 | 4 | -10/+229 | |
| | | | | |\ \ \ \ \ \ \ | ||||||
| | | | | * \ \ \ \ \ \ \ | 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 | |
| | | | | |/ / / / / / / / | ||||||
* | | | | / / / / / / / / | Added layer images to deadcyclo layout readme | Brendan Johan Lee | 2017-01-10 | 5 | -0/+26 | |
| |/ / / / / / / / / / / |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | 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 | |
|/ / / / / / / / / / / | ||||||
* | | | | | | | | | | | 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 | 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 | 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 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | 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 | |
| |/ / / / / / / / / / / | ||||||
* | | | | | | | | | | | | Merge pull request #973 from Wilba6582/keycode_refactor | Jack Humbert | 2016-12-30 | 4 | -314/+331 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | 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 | Gergely Nagy | 2016-12-28 | 3 | -6/+21 | |
| |/ / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | Merge pull request #974 from fredizzimo/remove_malloc_from_sysex | Jack Humbert | 2016-12-30 | 4 | -27/+71 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | API Sysex fixes | Fred Sundvik | 2016-12-29 | 4 | -27/+71 | |
| | |/ / / / / / / / / / / | |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge pull request #972 from mechkeys/rgb_compat | Jack Humbert | 2016-12-29 | 2 | -0/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / |/| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | 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 | |
|\ \ \ \ \ \ \ \ \ \ \ \ |