Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | Added Ctrl+` (ConEmu shortcut) | Joshua T | 2016-10-15 | 1 | -1/+1 | |
| * | | | | | | | | Merge remote-tracking branch 'upstream/master' | Joshua T | 2016-10-15 | 154 | -2157/+9342 | |
| |\ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' | Joshua T | 2016-09-01 | 182 | -6034/+9444 | |
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | | | ||||||
| * | | | | | | | | | 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 | 168 | -1634/+12955 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | 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 | |
| * | | | | | | | | | | Merged branch master into master | Joshua T | 2016-08-09 | 25 | -166/+1489 | |
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | | | ||||||
| * | | | | | | | | | | 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 | 24 | -199/+2015 | |
| |\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | 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 | 234 | -1700/+2992 | |
| |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' | Joshua T | 2016-07-26 | 76 | -324/+6517 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | 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 | |
| * | | | | | | | | | | | | | 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 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | 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 | |
| |/ / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | Usaility changes to keymap, tidying up a bit. | xyverz | 2017-01-08 | 1 | -12/+12 | |
* | | | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/master' | xyverz | 2016-12-13 | 17 | -52/+520 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Merge pull request #948 from climbalima/master | Jack Humbert | 2016-12-12 | 11 | -9/+438 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | / | | | |_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | svg bug fix and added pilcrow to hand wire | climbalima | 2016-12-12 | 11 | -9/+438 | |
| * | | | | | | | | | | | | | re-enable audio and extrakeys | Jack Humbert | 2016-12-12 | 2 | -4/+4 | |
| * | | | | | | | | | | | | | Merge pull request #946 from climbalima/master | Jack Humbert | 2016-12-12 | 1 | -11/+19 | |
| |\| | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | changed svg after merge | climbalima | 2016-12-10 | 1 | -470/+470 | |
| | * | | | | | | | | | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | climbalima | 2016-12-10 | 108 | -356/+3734 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | changed svg to support proto pcb | climbalima | 2016-12-10 | 1 | -474/+482 | |
| * | | | | | | | | | | | | | Merge pull request #945 from priyadi/planck_priyadi | Jack Humbert | 2016-12-12 | 1 | -6/+2 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | Remove unneeded options to reduce firmware size | Priyadi Iman Nurcahyo | 2016-12-10 | 1 | -6/+2 | |
| | | |/ / / / / / / / / / / | | |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | put home/end on thumb cluster | lucwastiaux | 2016-12-10 | 1 | -2/+2 | |
| * | | | | | | | | | | | | | readme updates | lucwastiaux | 2016-12-10 | 1 | -1/+4 | |
| * | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/master' | lucwastiaux | 2016-12-10 | 151 | -609/+11350 | |
| |\| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | use thumb cluster key to toggle brackets layer | lucwastiaux | 2016-12-10 | 2 | -2/+3 | |
| * | | | | | | | | | | | | | added more shortcut keys | lucwastiaux | 2016-11-05 | 2 | -9/+9 | |
| * | | | | | | | | | | | | | updated readme | lucwastiaux | 2016-11-05 | 1 | -1/+2 | |
| * | | | | | | | | | | | | | removed brackets anywhere but in brackets layer, added mouse layer back in, r... | lucwastiaux | 2016-11-05 | 3 | -20/+50 | |
* | | | | | | | | | | | | | | Changes | xyverz | 2016-12-13 | 3 | -133/+70 | |
* | | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/master' | xyverz | 2016-12-06 | 118 | -534/+9578 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | Merge pull request #936 from jackhumbert/f/shine_default | Erez Zukerman | 2016-12-06 | 3 | -30/+63 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ |