Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware into ↵ | Lucas Hecht | 2016-02-25 | 4 | -1505/+1547 |
|\ | | | | | | | jackhumbert-master | ||||
| * | Merge pull request #157 from DidierLoiseau/typematrix | Jack Humbert | 2016-02-21 | 3 | -1505/+1483 |
| |\ | | | | | | | Small fixes and improvements to tm2030 layout | ||||
| | * | Updated tm2030 keymap.hex | Didier Loiseau | 2016-02-21 | 1 | -1482/+1476 |
| | | | |||||
| | * | Fixed compilation warnings due to missing return statements | Didier Loiseau | 2016-02-21 | 1 | -1/+2 |
| | | | |||||
| | * | FN macro: use layer_invert() instead of modifying layer_state directly | Didier Loiseau | 2016-02-07 | 1 | -20/+3 |
| | | | | | | | | | | | | | | | | | | - fixes stuck keys from the temporary layers (see also jackhumbert/qmk_firmware#78) - removed the workaround for jackhumbert/qmk_firmware#81 (using layer_invert() fixes the problem) | ||||
| | * | Fixed inconsistency between comment and actual numeric layer | Didier Loiseau | 2016-02-07 | 1 | -1/+1 |
| | | | | | | | | | - KC_INS should only be present on Fn layer | ||||
| | * | Fixed link to Magic doc in Dvorak section | DidierLoiseau | 2016-02-07 | 1 | -1/+1 |
| | | | |||||
| * | | Merge pull request #153 from spydon/xmonad_keymap | Jack Humbert | 2016-02-21 | 1 | -0/+64 |
| |\ \ | | | | | | | | | Keymap optimized for xmonad | ||||
| | * | | Added a keymap optimized for xmonad | Lukas Klingsbo | 2016-02-18 | 1 | -0/+64 |
| | | | | | | | | | | | | | | | | | | | | | | | | The M(1) function changes layer temporarily (so that numbers can be used) and holds LGUI which makes it possible to easily change virtual screens and swap windows inbetween them. | ||||
* | | | | delete old keymap (keymap_eigen.c) | Lucas Hecht | 2016-02-25 | 1 | -37/+2 |
| | | | | |||||
* | | | | Added keymap "lucas.c" | Lucas Hecht | 2016-02-24 | 4 | -0/+382 |
|/ / / | |||||
* | | | Merge pull request #145 from gerbercj/feature/atreus_astar | Jack Humbert | 2016-02-17 | 5 | -19/+103 |
|\ \ \ | | | | | | | | | Add support for Atreus running on A-Star | ||||
| * | | | Change default controller for Atreus from Teensy2 to A-Star | Chris Gerber | 2016-02-17 | 3 | -10/+10 |
| | | | | |||||
| * | | | Add support for Atreus running on A-Star | Chris Gerber | 2016-02-15 | 5 | -19/+103 |
| | | | | |||||
* | | | | Merge pull request #141 from XenoBits/master | Erez Zukerman | 2016-02-12 | 5 | -0/+1489 |
|\ \ \ \ | | | | | | | | | | | Ergodox EZ new keymap for C# developers | ||||
| * | | | | Another readme.md improvement | Maxime Millet | 2016-02-12 | 1 | -9/+9 |
| | | | | | |||||
| * | | | | Improved readme | Maxime Millet | 2016-02-12 | 1 | -10/+10 |
| | | | | | |||||
| * | | | | Added C# developer keymap | Maxime Millet | 2016-02-12 | 5 | -0/+1489 |
| | | | | | |||||
* | | | | | Added pageup, pagedown, home, and end keys | Lasko Height | 2016-02-11 | 1 | -6/+6 |
| | | | | | |||||
* | | | | | Added a Tenkey layer and moved the del key | Lasko Height | 2016-02-11 | 1 | -5/+25 |
| | | | | | |||||
* | | | | | Adding my initial layout | Lasko Height | 2016-02-11 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Adding my initial layout | Lasko Height | 2016-02-11 | 1 | -0/+114 |
| | | | | | |||||
* | | | | | Merge pull request #139 from ↵ | Erez Zukerman | 2016-02-11 | 4 | -0/+1429 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | joarau/norwegian-colemak-ergodox-with-norwegian-definitions Norwegian Colemak Ergodox and Norwegian key definitions | ||||
| * | | | | | Norwegian Colemak Ergodox and Norwegian key definitions | joar | 2016-02-11 | 4 | -0/+1429 |
| | | | | | | |||||
* | | | | | | More tweaks to experimental layout | Erez Zukerman | 2016-02-11 | 3 | -18/+19 |
| | | | | | | |||||
* | | | | | | Merge branch 'master' of github.com:jackhumbert/qmk_firmware | Erez Zukerman | 2016-02-11 | 14 | -148/+4903 |
|\| | | | | | |||||
| * | | | | | Merge pull request #138 from Willyfrog/master | Erez Zukerman | 2016-02-10 | 4 | -0/+1666 |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | ergodox_ez for emacs + mac + altgr users | ||||
| | * | | | | add image | Guillermo Vayá | 2016-02-10 | 1 | -0/+0 |
| | | | | | | |||||
| | * | | | | added .hex file | Guillermo Vayá | 2016-02-10 | 1 | -0/+1472 |
| | | | | | | |||||
| | * | | | | new emacs + osx + deadkeys layout | Guillermo Vayá | 2016-01-31 | 2 | -0/+194 |
| | | | | | | |||||
| * | | | | | Add mpiechotka ergodox ez keymap | Maciej Piechotka | 2016-02-09 | 3 | -0/+1770 |
| | |/ / / | |/| | | | |||||
| * | | | | Eliminate switch statement by using contiguous character ranges | Christopher Browne | 2016-02-08 | 1 | -152/+12 |
| | | | | | |||||
| * | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | Christopher Browne | 2016-02-08 | 18 | -3256/+3689 |
| |\ \ \ \ | |||||
| | * \ \ \ | Merge pull request #130 from jacobono/jacobono | Erez Zukerman | 2016-02-08 | 6 | -0/+1449 |
| | |\ \ \ \ | | | | | | | | | | | | | | | Jacobono | ||||
| | | * | | | | add hex file | Daniel Mijares | 2016-02-06 | 1 | -0/+1142 |
| | | | | | | | |||||
| | | * | | | | my personal ergodox keymap layout | Daniel Mijares | 2016-02-06 | 5 | -0/+307 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | with pngs of layout and readme | ||||
| * | | | | | | Add in XOR of lowest 8 bits of system timer to encourage more randomness of ↵ | Christopher Browne | 2016-02-06 | 1 | -147/+157 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | the digits/letters chosen | ||||
* | | | | | | | Corrects typo | Erez Zukerman | 2016-02-08 | 1 | -1/+1 |
| |/ / / / / |/| | | | | | |||||
* | | | | | | Updates documentation, adds Cmd/Win dual-function key | Erez Zukerman | 2016-02-08 | 5 | -1443/+1098 |
| |_|_|/ / |/| | | | | |||||
* | | | | | README changes | Jack Humbert | 2016-02-07 | 2 | -179/+2 |
| | | | | | |||||
* | | | | | Merge branch 'master' of https://github.com/jackhumbert/tmk_keyboard | Jack Humbert | 2016-02-07 | 20 | -4259/+5127 |
|\ \ \ \ \ | | |/ / / | |/| | | | |||||
| * | | | | Merge pull request #129 from cbbrowne/master | Jack Humbert | 2016-02-05 | 1 | -57/+217 |
| |\| | | | | | | | | | | | | | Example of some "Random Keys" | ||||
| | * | | | Remove obsolete comments | Christopher Browne | 2016-02-03 | 1 | -9/+0 |
| | | | | | |||||
| | * | | | Comment things more | Christopher Browne | 2016-02-03 | 1 | -1/+2 |
| | | | | | |||||
| | * | | | Random characters now working AOK | Christopher Browne | 2016-02-03 | 1 | -14/+157 |
| | | | | | |||||
| | * | | | Merge branch 'master' of github.com:cbbrowne/qmk_firmware | Christopher Browne | 2016-02-03 | 1 | -48/+60 |
| | |\ \ \ | |||||
| | | * | | | More experiments with mapping, notably adding in the random bits | Christopher Browne | 2016-02-03 | 1 | -48/+60 |
| | | | | | | |||||
| | | * | | | Merge branch 'master' of github.com:cbbrowne/qmk_firmware | Christopher Browne | 2016-02-01 | 2 | -32/+68 |
| | | |\ \ \ | |||||
| | | * \ \ \ | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | Christopher Browne | 2016-01-31 | 2 | -29/+163 |
| | | |\ \ \ \ | |||||
| | * | \ \ \ \ | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | Christopher Browne | 2016-02-03 | 5 | -1315/+1453 |
| | |\ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | | |