Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | more cosmetic changes (whitespace) | Toni | 2016-07-22 | 1 | -1/+1 |
| | |||||
* | purely cosmetic changes | Toni | 2016-07-22 | 1 | -42/+42 |
| | |||||
* | changed ctrl back to enter. "j" interfered with my vimming | Toni | 2016-07-19 | 1 | -2/+2 |
| | |||||
* | small cosmetic change | Toni | 2016-07-19 | 1 | -3/+3 |
| | |||||
* | renamed keymap | Toni | 2016-07-18 | 1 | -2/+3 |
| | |||||
* | reduced makefile size. not so much needed due to "inheritance" | Toni | 2016-07-18 | 1 | -51/+0 |
| | |||||
* | new modifier "J" is crtl | Toni | 2016-07-17 | 1 | -2/+2 |
| | |||||
* | helper file for me to stay up-to-date with master | Toni | 2016-07-17 | 1 | -0/+4 |
| | |||||
* | changes needed for a ISO satan PCB including a split right-shift key | Toni | 2016-07-17 | 7 | -0/+440 |
| | |||||
* | Merge pull request #489 from Skrymir/master | Jack Humbert | 2016-07-14 | 2 | -0/+213 |
|\ | | | | | New ergodox-ez layout | ||||
| * | Merge pull request #2 from jackhumbert/master | Joshua Colbeck | 2016-07-12 | 82 | -786/+2969 |
| |\ | | | | | | | Pull from upstream | ||||
| * \ | Merge branch 'master' of https://github.com/Skrymir/qmk_firmware | Josh Colbeck | 2016-07-06 | 2 | -0/+213 |
| |\ \ | |||||
| | * \ | Merge pull request #1 from Skrymir/patch-1 | Joshua Colbeck | 2016-07-06 | 12 | -244/+495 |
| | |\ \ | | | | | | | | | | | add ergodox layout | ||||
| | | * | | Changed layer switching to momentary | Josh Colbeck | 2016-07-06 | 1 | -6/+6 |
| | | | | | | | | | | | | | | | | | | | | corrected macro | ||||
| | | * | | 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 | 8 | -230/+268 |
| | | |\ \ \ | |||||
| | | * | | | | Added macro and readme | Josh Colbeck | 2016-07-04 | 2 | -18/+40 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | macros to for often used eclipse shortcuts | ||||
| | | * | | | | 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 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 8149924399cf3d31d80444a10477a29f53a4990e. | ||||
| | | * | | | | Changed layout of left hand main layer | Joshua Colbeck | 2016-07-03 | 1 | -12/+12 |
| | |/ / / / | |||||
* | | | | | | Merge pull request #515 from pvinis/reset-function | Jack Humbert | 2016-07-14 | 2 | -10/+16 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | extract reset keyboard into a function | ||||
| * | | | | | extract reset keyboard into a function | Pavlos Vinieratos | 2016-07-13 | 2 | -10/+16 |
|/ / / / / | | | | | | | | | | | | | | | | that makes it easy to call reset_keyboard() from a function in a keymap | ||||
* | | | | | Merge pull request #477 from Smilliam/master | Jack Humbert | 2016-07-11 | 3 | -1/+19 |
|\ \ \ \ \ | | | | | | | | | | | | | Canceling Space Cadet state with opposite shift key | ||||
| * | | | | | amended extraneous file edits | Smilliam | 2016-07-10 | 2 | -7/+1 |
| | | | | | | |||||
| * | | | | | Made rollover behavior for space cadet optional | Smilliam | 2016-07-10 | 4 | -10/+26 |
| | | | | | | |||||
| * | | | | | fixed indentation. | Smilliam | 2016-07-04 | 1 | -8/+8 |
| | | | | | | |||||
| * | | | | | Allow Space Cadet state to be canceled by alternate Shift key | Smilliam | 2016-07-04 | 1 | -0/+8 |
| | |_|_|/ | |/| | | | | | | | | | | | | | Allows you to press RSHIFT to cancel the insertion of a "(" when holding down LSHIFT. Alternatively, allows you to press LSHIFT to cancel the insertion of a ")" when holding down RSHIFT. This change enables you to renege from outputting a character should you press a shift key erroneously. | ||||
* | | | | | Merge pull request #506 from stanleylai/master | Jack Humbert | 2016-07-11 | 2 | -0/+104 |
|\ \ \ \ \ | | | | | | | | | | | | | Added my custom keymap for Satan | ||||
| * | | | | | Added my custom keymap for Satan | Stanley Lai | 2016-07-10 | 2 | -0/+104 |
| | | | | | | |||||
* | | | | | | Merge pull request #507 from ruiqimao/master | skullydazed | 2016-07-11 | 4 | -17/+33 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | fixed clueboard LED pin assignments and matrix documentation | ||||
| * | | | | | fixed clueboard LED pin assignments and matrix documentation | Ruiqi Mao | 2016-07-11 | 4 | -17/+33 |
|/ / / / / | |||||
* | | | | | Merge pull request #505 from fredizzimo/documentation_fix | Jack Humbert | 2016-07-10 | 1 | -3/+0 |
|\ \ \ \ \ | | | | | | | | | | | | | Remove out of place documentation, caused by ChibiOS merge | ||||
| * | | | | | Remove out of place documentation, caused by ChibiOS merge | Fred Sundvik | 2016-07-10 | 1 | -3/+0 |
| | | | | | | |||||
* | | | | | | Merge pull request #502 from robotmaxtron/master | Jack Humbert | 2016-07-09 | 5 | -0/+544 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Adding robotmaxtron's GH60 Keymap | ||||
| * | | | | | | 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 #500 from TerryMathews/master | Jack Humbert | 2016-07-09 | 1 | -0/+116 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Establish Poker clone keymap for Satan | ||||
| * \ \ \ \ \ | Merge pull request #1 from jackhumbert/master | TerryMathews | 2016-07-09 | 10 | -47/+267 |
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | | | Catch up with jack's master | ||||
* | | | | | | | Documents tap dance | Erez Zukerman | 2016-07-08 | 1 | -0/+75 |
| |/ / / / / |/| | | | | | |||||
* | | | | | | Merge pull request #498 from fredizzimo/fix_make_dependencies | Jack Humbert | 2016-07-08 | 1 | -10/+12 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Fix make dependencies | ||||
| * | | | | | | Use order only prerequisites to avoid re-linking | Fred Sundvik | 2016-07-08 | 1 | -9/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The prerequisites at the start of the build process are order-only so that the trget don't link again. Also added as a dependency to the compilation to force the messages to be printed at the start | ||||
| * | | | | | | Fix name of makefile dep files | Fred Sundvik | 2016-07-08 | 1 | -1/+1 |
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The files can't start with a .dot, as the wildcard function wont find them. So this is fixed by removing the BUILD_DIR from the name. | ||||
* | | | | | | Merge pull request #496 from fredizzimo/makefile_optimization | Jack Humbert | 2016-07-08 | 2 | -39/+22 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Makefile optimization | ||||
| * | | | | | | Fix the link target | Fred Sundvik | 2016-07-08 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Don't run git describe for ever file that is built | Fred Sundvik | 2016-07-08 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Speed up compilation by not using recusive make | Fred Sundvik | 2016-07-08 | 1 | -38/+21 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The cleaning is done outside the targets, by checking the requested target name. | ||||
* | | | | | | | Merge pull request #494 from robbiegill/master | Jack Humbert | 2016-07-08 | 7 | -1/+161 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Port support for hhkb-jp from tmk | ||||
| * | | | | | | | port missing support for hhkb-jp from tmk | Robbie Gill | 2016-07-07 | 7 | -1/+161 |
| | |_|_|/ / / | |/| | | | | | |||||
* | | | | | | | Merge pull request #493 from TerryMathews/master | Jack Humbert | 2016-07-08 | 12 | -595/+92 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | Create keycodes for RGB control functions | ||||
| | | * | | | | Establish Poker clone keymap for Satan | TerryMathews | 2016-07-09 | 1 | -0/+116 |
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | Maps all of the side-print legends on the stock Poker II keycaps that are feasible (doesn't support repeat rate toggling, Pmode recording). |