Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | Merge pull request #73 from dragon788/dragon_mod | Erez Zukerman | 2016-01-18 | 8 | -1/+645 | |
|\ \ \ | | | | | | | | | Requesting some comments and review on my changes | |||||
| * | | | Command line programming not default, enable by reading quickstart and ↵ | dragon788 | 2016-01-17 | 2 | -7/+11 | |
| | | | | | | | | | | | | | | | | comments in Vagrantfile | |||||
| * | | | Allow passthru of Teensy to Virtualbox for programming | dragon788 | 2016-01-17 | 1 | -5/+11 | |
| | | | | ||||||
| * | | | Fixing Debian/Ubuntu updates to be completely non-interactive | dragon788 | 2016-01-17 | 1 | -1/+9 | |
| | | | | ||||||
| * | | | Note about Virtualbox incompatibilities | dragon788 | 2016-01-17 | 1 | -0/+2 | |
| | | | | ||||||
| * | | | Update README.md | dragon788 | 2016-01-16 | 1 | -0/+1 | |
| | | | | ||||||
| * | | | Create QUICK_START.md describing Vagrantfile usage | dragon788 | 2016-01-16 | 1 | -0/+21 | |
| | | | | | | | | | | | | Provides links to software required to use the Vagrantfile. | |||||
| * | | | Having media layer defined causes toggles to 'stick' rather than be ↵ | dragon788 | 2016-01-16 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | momentary in my experience | |||||
| * | | | Resetting keymap_default.c to origin/master not just my fork's master | dragon788 | 2016-01-16 | 1 | -23/+23 | |
| | | | | ||||||
| * | | | Moving my layout to its own file, made plover layout file, restoring default ↵ | dragon788 | 2016-01-16 | 3 | -89/+501 | |
| | | | | | | | | | | | | | | | | keymap to its default status | |||||
| * | | | Updated avr script and added notes to Vagrantfile | dragon788 | 2016-01-16 | 2 | -7/+18 | |
| | | | | ||||||
| * | | | All dfu dependencies in place, multi-line syntax to make it easy to add/read | dragon788 | 2016-01-12 | 1 | -4/+37 | |
| | | | | ||||||
| * | | | Adding update of vagrant VM every time it is booted | dragon788 | 2016-01-05 | 2 | -14/+46 | |
| | | | | ||||||
| * | | | Adding Vagrantfile for easier compile environment setup | dragon788 | 2016-01-03 | 3 | -0/+69 | |
| | | | | ||||||
| * | | | Added calculator shortcut button to numpad/symbol layer | dragon788 | 2016-01-02 | 1 | -2/+2 | |
| | | | | ||||||
| * | | | Fixed Plover layer label and updated keymap | dragon788 | 2016-01-02 | 1 | -4/+4 | |
| | | | | ||||||
| * | | | Added proper link back to Plover layout source | dragon788 | 2016-01-02 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | Added plover layer | dragon788 | 2016-01-02 | 1 | -4/+49 | |
| | | | | ||||||
| * | | | Fixed button conflicts on mouse/media layer | dragon788 | 2015-12-30 | 1 | -18/+18 | |
| | | | | ||||||
| * | | | Added note about avr-libc also being required at least for arch | dragon788 | 2015-12-30 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | Moving everything around, tap delays driving me nuts | dragon788 | 2015-12-30 | 1 | -27/+27 | |
| | | | | ||||||
| * | | | Merge branch 'master' of github.com:dragon788/qmk_firmware_ez | dragon788 | 2015-12-28 | 0 | -0/+0 | |
| |\ \ \ | ||||||
| | * \ \ | Merge branch 'master' of github.com:dragon788/qmk_firmware_ez | dragon788 | 2015-12-27 | 1 | -21/+21 | |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: keyboard/ergodox_ez/keymaps/keymap_default.c | |||||
| * | | | | | Merge branch 'master' of github.com:jackhumbert/qmk_firmware | dragon788 | 2015-12-28 | 21 | -4/+6076 | |
| |\| | | | | | |/ / / | |/| | | | | | | | | | | | | | Conflicts: keyboard/ergodox_ez/keymaps/keymap_default.c | |||||
| * | | | | Updated keymap ascii art and made thumb cluster more standard ↵ | dragon788 | 2015-12-23 | 1 | -20/+20 | |
| | | | | | | | | | | | | | | | | | | | | ErgoDox/Kinesis-like | |||||
| * | | | | add left click and vim keys | Josh McCall | 2015-12-16 | 1 | -2/+2 | |
| | | | | | ||||||
* | | | | | Merge pull request #93 from petereichinger/master | Jack Humbert | 2016-01-18 | 2 | -0/+24 | |
|\ \ \ \ \ | | | | | | | | | | | | | LCAG modifier combo and AutoHotkey international characters | |||||
| * | | | | | Fix code formatting in international characters readme entry | Peter Eichinger | 2016-01-18 | 1 | -2/+2 | |
| | | | | | | ||||||
| * | | | | | Readme for LCAG modifier combo and international characters with AutoHotkey | Peter Eichinger | 2016-01-18 | 1 | -0/+22 | |
| | | | | | | ||||||
| * | | | | | Add defines for CtrlAltGui modifiers | Peter Eichinger | 2016-01-18 | 1 | -0/+2 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #88 from J3RN/j3rn-keymap | Erez Zukerman | 2016-01-16 | 2 | -0/+214 | |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | Add J3RN's Mac-centric Ergodox EZ keymap | |||||
| * | | | | Merge branch 'master' into j3rn-keymap | Jonathan Arnett | 2016-01-16 | 37 | -2773/+10290 | |
| |\ \ \ \ | |/ / / / |/| | | | | ||||||
* | | | | | Merge pull request #89 from coderkun/master | Erez Zukerman | 2016-01-15 | 1 | -0/+137 | |
|\ \ \ \ \ | | | | | | | | | | | | | add coderkun’s ErgodoxEZ keymap (Neo2) | |||||
| * \ \ \ \ | merge upstream | coderkun | 2016-01-15 | 0 | -0/+0 | |
| |\ \ \ \ \ | ||||||
| * | | | | | | merge upstream | coderkun | 2016-01-15 | 16 | -2460/+3838 | |
| | | | | | | | ||||||
| * | | | | | | add basic layer 2 | coderkun | 2016-01-15 | 2 | -16/+16 | |
| | | | | | | | ||||||
| * | | | | | | add basic layer 1 | coderkun | 2016-01-12 | 1 | -2/+45 | |
| | | | | | | | ||||||
| * | | | | | | add neo2 keymap for ergodoxEZ | coderkun | 2016-01-12 | 1 | -0/+94 | |
| | | | | | | | ||||||
* | | | | | | | Merge pull request #87 from sboesebeck/master | Erez Zukerman | 2016-01-15 | 4 | -1519/+1672 | |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | added some macros, create full de_osx include file | |||||
| * | | | | | | updated cheat sheet, hex file | Stephan Bösebeck | 2016-01-15 | 2 | -1494/+1508 | |
| | | | | | | | ||||||
| * | | | | | | using keymap_german_osx.h more, adding macros for CTRL/CMD-V combination | Stephan Bösebeck | 2016-01-15 | 2 | -25/+164 | |
| | | | | | | | ||||||
| * | | | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | Stephan Bösebeck | 2016-01-13 | 9 | -0/+1108 | |
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | | | ||||||
* | | | | | | | Merge pull request #84 from sboesebeck/master | Erez Zukerman | 2016-01-13 | 5 | -1239/+1504 | |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | new alternative layout ADNW_Koy | |||||
* \ \ \ \ \ \ \ | Merge pull request #83 from lxol/feature/hhkb-qmk | Jack Humbert | 2016-01-13 | 9 | -0/+1108 | |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | migrate hhkb to QMK firmware | |||||
| * | | | | | | | | migrate hhkb to QMK firmware | Alex Olkhovskiy | 2016-01-13 | 9 | -0/+1108 | |
| | |_|/ / / / / | |/| | | | | | | ||||||
| | | * | | | | | Merge branch 'master' of https://github.com/sboesebeck/qmk_firmware | Stephan Bösebeck | 2016-01-13 | 5 | -13/+272 | |
| | | |\ \ \ \ \ | | | |/ / / / / | | |/| | | | | | ||||||
| | * | | | | | | updating layout png | Stephan Bösebeck | 2016-01-13 | 1 | -0/+0 | |
| | | | | | | | | ||||||
| | * | | | | | | adding fixed hex file | Stephan Bösebeck | 2016-01-13 | 1 | -9/+9 | |
| | | | | | | | | ||||||
| | * | | | | | | typo fix | Stephan Bösebeck | 2016-01-13 | 1 | -1/+1 | |
| | | | | | | | | ||||||
| | * | | | | | | added adnw layout | Stephan Bösebeck | 2016-01-13 | 1 | -0/+262 | |
| | | | | | | | |