Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'qmk/master' | Josh Colbeck | 2017-02-21 | 1 | -13/+21 |
| | |||||
* | remove more warnings | Jack Humbert | 2017-02-16 | 2 | -0/+3 |
| | |||||
* | Merge pull request #1105 from nrrkeene/master | Jack Humbert | 2017-02-16 | 8 | -80/+165 |
|\ | | | | | The Ordinary Layout v5 | ||||
| * | The Ordinary Layout has all the keys in the right places. | Nicholas Keene | 2017-02-15 | 1 | -1/+1 |
| | | |||||
| * | This is the best layout, really, come look | Nicholas Keene | 2017-02-15 | 1 | -4/+4 |
| | | |||||
| * | The Ordinary Layout is the best one, the one you are looking for. Really. ↵ | Nicholas Keene | 2017-02-15 | 4 | -29/+43 |
| | | | | | | | | Check it out. | ||||
| * | The Ordinary Layout is boring, normal, typical, expected. | Nicholas Keene | 2017-02-14 | 2 | -54/+125 |
| | | |||||
| * | The Ordinary Layout has a feature for one-handed chorded typing | Nicholas Keene | 2017-02-14 | 2 | -3/+3 |
| | | |||||
| * | All my friends us The Ordinary Layout because it doesn't force you to change ↵ | Nicholas Keene | 2017-02-14 | 2 | -4/+4 |
| | | | | | | | | you typing habits | ||||
| * | The Ordinary Layout now has more symbols on the Symbols layer! So useful! | Nicholas Keene | 2017-02-14 | 2 | -11/+11 |
| | | |||||
* | | updated readme | luc wastiaux | 2017-02-13 | 1 | -1/+1 |
| | | |||||
* | | Merge remote-tracking branch 'upstream/master' | luc wastiaux | 2017-02-13 | 22 | -146/+1298 |
|\| | |||||
| * | [Typo] correct link to default keymap in readme. | Rob Rogers | 2017-02-09 | 1 | -1/+1 |
| | | |||||
| * | Add missing header to ergodox ordinary keymap | Nikolaus Wittenstein | 2017-02-03 | 1 | -0/+1 |
| | | |||||
| * | Fix compile warnings in egodox robot_test_layout | Nikolaus Wittenstein | 2017-02-03 | 1 | -4/+4 |
| | | | | | | | | | | Fixes the warning "right shift count >= width of type" by adding UL to the end of constants. | ||||
| * | Merge remote-tracking branch 'upstream/master' | Brendan Johan Lee | 2017-02-01 | 5 | -30/+900 |
| |\ | |||||
| | * | Merge pull request #1039 from zabereer/albert_ergodox_keymap | Erez Zukerman | 2017-01-31 | 4 | -0/+866 |
| | |\ | | | | | | | | | albert ergodox keymap | ||||
| | | * | albert ergodox keymap | Albert Pretorius | 2017-01-26 | 4 | -0/+866 |
| | | | | |||||
| | * | | update my neo2 keymap | Matthias Schmitt | 2017-01-30 | 1 | -30/+34 |
| | | | | |||||
| * | | | [deadcyclo layout] Refactoring. Use custom functions and macros | Brendan Johan Lee | 2017-01-30 | 1 | -237/+266 |
| | | | | |||||
| * | | | [deadcyclo layout] fixed failing tests | Brendan Johan Lee | 2017-01-30 | 1 | -16/+1 |
| | | | | |||||
| * | | | Merge remote-tracking branch 'upstream/master' | Brendan Johan Lee | 2017-01-27 | 8 | -9/+9 |
| |\| | | |||||
| | * | | replace jackhumbert with qmk | Jack Humbert | 2017-01-26 | 8 | -9/+9 |
| | |/ | |||||
| * | | [deadcyclo layout] Added more unicode keys and ibus unicode compose trigger keys | Brendan Johan Lee | 2017-01-27 | 4 | -23/+26 |
| | | | |||||
| * | | [deadcyclo layout] Added lotsof new emojis and some new unicode keys | Brendan Johan Lee | 2017-01-25 | 3 | -11/+178 |
| | | | |||||
| * | | Merge remote-tracking branch 'upstream/master' | Brendan Johan Lee | 2017-01-24 | 2 | -5/+5 |
| |\| | |||||
| * | | [deadcyclo layout] Added unicode layer | Brendan Johan Lee | 2017-01-24 | 5 | -27/+98 |
| | | | |||||
| * | | [deadcyclo layout] Added support for ergodox ez shine | Brendan Johan Lee | 2017-01-24 | 4 | -14/+40 |
| | | | |||||
* | | | change thumb cluster key to be shift | luc wastiaux | 2017-02-13 | 1 | -2/+2 |
| | | | |||||
* | | | made left shift an MO for SHELL_NAV | luc wastiaux | 2017-02-10 | 3 | -45/+9 |
| | | | |||||
* | | | increase timeout for dual mode caps key | lucwastiaux | 2017-02-01 | 1 | -1/+1 |
| | | | |||||
* | | | eliminate references to shell_layer | lucwastiaux | 2017-01-28 | 1 | -1/+1 |
| | | | |||||
* | | | documented dual mode capslock | lucwastiaux | 2017-01-28 | 2 | -27/+3 |
| | | | |||||
* | | | dual capslock functionality, activating shell nav or brackets | lucwastiaux | 2017-01-27 | 1 | -3/+20 |
| |/ |/| | |||||
* | | turn off rgb_midi in ez | Jack Humbert | 2017-01-23 | 2 | -5/+5 |
|/ | |||||
* | Merge pull request #1020 from remigius42/master | Jack Humbert | 2017-01-22 | 6 | -0/+1157 |
|\ | | | | | Swiss German layout for Ergodox EZ & Infinity | ||||
| * | SG Ergodox layout: Updated layout documentation | Andreas Schmidt | 2017-01-22 | 3 | -4/+12 |
| | | | | | | | | | | | | - Swiss German Ergodox layout: Updated layout documentation based on previous layout changes. | ||||
| * | SG Ergodox layout: Fixed ENTER key mapping | Andreas Schmidt | 2017-01-22 | 1 | -2/+2 |
| | | | | | | | | | | | | - Swiss German Ergodox layout: Additional ENTER key was mapped to wrong layer and keyboard half. | ||||
| * | SG Ergodox layout: Minor code formatting changes | Andreas Schmidt | 2017-01-22 | 1 | -1/+1 |
| | | | | | | | | | | - Swiss German Ergodox layout: Removed unnecessary spaces. | ||||
| * | SG Ergodox layout: Add ENTER to left keyboard | Andreas Schmidt | 2017-01-22 | 1 | -2/+2 |
| | | | | | | | | | | | | | | - Swiss German Ergodox layout: Added ENTER key to left keyboard half on media layer such that the enter key is available on both halves to be able to flash both halves without an additional keyboard. | ||||
| * | SG Ergodox layout: Add <br/> macro to media layer | Andreas Schmidt | 2017-01-22 | 1 | -2/+14 |
| | | | | | | | | | | - Added <br/> macro to media layer of Swiss German layout for Ergodox | ||||
| * | Renamed JSON source of Ergodox Swiss German | Andreas Schmidt | 2017-01-21 | 2 | -1/+1 |
| | | | | | | | | | | - Renamed the JSON source files for the layout description of the Ergodox Swiss German keymap | ||||
| * | Correct layout description of ergodox swissgerman | Andreas Schmidt | 2017-01-21 | 2 | -15/+16 |
| | | | | | | | | - Added missing HTML macros to media layer. | ||||
| * | Removed Ergodox EZ & Infinity specific keymaps | Andreas Schmidt | 2017-01-21 | 12 | -2233/+0 |
| | | | | | | | | | | - Removed the keymaps for Swiss German spefic for Ergodox EZ and Infinity after previously merging them. | ||||
| * | Merged keymap for Ergodox EZ & Infinity | Andreas Schmidt | 2017-01-21 | 6 | -0/+1136 |
| | | | | | | | | | | - Merged keymap for Ergodox EZ & Infinity into one single keymap using pre-processor macros. | ||||
| * | Add Swiss German layout for Ergodox Infinity | Andreas Schmidt | 2017-01-21 | 6 | -0/+1112 |
| | | | | | | | | | | | | | | - Add Swiss German layout for Ergodox Infinity based on default layout for Ergodox EZ. - Minor changes in the event loop to prevent flashing display background lights. | ||||
| * | Add Swiss German layout for Ergodox EZ | Andreas Schmidt | 2017-01-21 | 6 | -0/+1121 |
| | | | | | | | | | | | | - Add Swiss German layout for Ergodox EZ based on default layout for Ergodox EZ. - Minor changes in the event loop to prevent flashing of leds. | ||||
* | | Merge pull request #1022 from lucwastiaux/master | Jack Humbert | 2017-01-22 | 2 | -13/+48 |
|\ \ | |/ |/| | Improvements to Dvorak Programmer Ergodox keymap | ||||
| * | document BRACKETS and SHELL_LAYER | lucwastiaux | 2017-01-22 | 1 | -1/+6 |
| | | |||||
| * | make shell layer more compatible with default layer | lucwastiaux | 2017-01-21 | 1 | -15/+16 |
| | |