summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* merge upstreamLior Haim2016-10-2323-21/+1360
|\
| * Merge pull request #833 from h-parks/masterErez Zukerman2016-10-208-0/+482
| |\ | | | | | | Win10 Writer's Block - An ErgoDox Keymap
| | * Win10 Writer's Block - An ErgoDox Keymaph-parks2016-10-192-9/+12
| | | | | | | | | | | | | | | | | | fix for compiling on infinity: replaced `_delay_ms()' with `wait_ms()' included "wait.h"
| | * Win10 Writer's Block - An ErgoDox Keymaph-parks2016-10-188-0/+479
| | | | | | | | | This is a QWERTY layout for ErgoDox on QMK. It's designed to work well in MS Office-like environments. It's tested on Windows 7 and 10.
| * | Merge pull request #832 from PhoenixRion/masterErez Zukerman2016-10-202-0/+194
| |\ \ | | |/ | |/| Phoenix Layout
| | * update header fileRyan Ascheman2016-10-181-1/+1
| | |
| | * didn't read PR comment close enough, correcting folderRyan Ascheman2016-10-182-0/+0
| | |
| | * moving keymap to new locationRyan Ascheman2016-10-182-0/+0
| | |
| | * Merge remote-tracking branch 'upstream/master'Ryan Ascheman2016-10-186939-2419915/+106820
| | |\ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (1239 commits) Update ez.c removes planck/rev3 temporarily Move hand_swap_config to ez.c, removes error for infinity Update Makefile ergodox: Update algernon's keymap to v1.9 Added VS Code dir to .gitignore Support the Pegasus Hoof controller. [Jack & Erez] Simplifies and documents TO add readme use wait_ms instead of _delay_ms add messenger init keymap Add example keymap Adding whiskey_tango_foxtrot_capslock ergodox keymap Unicode map framework. Allow unicode up to 0xFFFFF using separate mapping table CIE 1931 dim curve Apply the dim curve to the RGB output Update the Cluecard readme files Tune snake and knight intervals for Cluecard Tunable RGB light intervals ...
| * | Merge pull request #829 from r2d2rogers/masterJack Humbert2016-10-182-21/+22
| |\ \ | | | | | | | | Move hand_swap_config to ez.c, removes error for infinity
| | * | Update ez.cRob Rogers2016-10-181-1/+0
| | | |
| | * | Move hand_swap_config to ez.c, removes error for infinityRob Rogers2016-10-172-20/+22
| | | |
| * | | Merge pull request #824 from dsvensson/pegasushoofJack Humbert2016-10-1811-0/+662
| |\ \ \ | | | | | | | | | | Support the Pegasus Hoof controller.
| | * | | Support the Pegasus Hoof controller.Daniel Svensson2016-10-1311-0/+662
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replacement controller for Filco Majestouch TKL keyboards. matrix.c ported from: https://github.com/BathroomEpiphanies/epiphanies_tmk_keyboard More details: http://bathroomepiphanies.com/controllers/
| | | | * update volume control to match arrow changeRyan Ascheman2016-05-121-2/+2
| | | | |
| | | | * update readmeRyan Ascheman2016-04-253-6/+6
| | | | |
| | | | * initial changes, no doc changesRyan Ascheman2016-04-194-0/+194
| | | | |
* | | | | fixed copy-cut-paste buttonstwentylives2016-10-211-5/+5
| | | | |
* | | | | Merge branch 'master' of https://github.com/20lives/qmk_firmwaretwentylives2016-10-201-2/+2
|\ \ \ \ \
| * | | | | fix readme20lives2016-10-191-2/+2
| | | | | |
* | | | | | fixed base layer = keytwentylives2016-10-201-1/+1
|/ / / / /
* | | | | update pics and readmetwentylives2016-10-195-133/+122
| | | | |
* | | | | Update readme.md20lives2016-10-181-3/+5
| | | | |
* | | | | Update readme.md20lives2016-10-181-1/+3
| | | | |
* | | | | adding dvorak hebrew layouttwentylives2016-10-183-0/+230
|/ / / /
* | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareJack Humbert2016-10-189-103/+189
|\ \ \ \
| * \ \ \ Merge pull request #826 from algernon/ergodox-ez/algernonErez Zukerman2016-10-179-103/+189
| |\ \ \ \ | | |_|/ / | |/| | | ergodox: Update algernon's keymap to v1.9
| | * | | ergodox: Update algernon's keymap to v1.9Gergely Nagy2016-10-169-103/+189
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Overall changes =============== * `F12` was replaced by an `Fx` key, that activate the **Media** layer as a one-shot layer, and also `Alt` as a one-shot modifier. Base layer changes ================== * The `Media Stop` key is now a tap-dance key, and resets the device for programming on the fourth tap. Miscellaneous ============= * `π` can now be entered with UCIS. * `🐁` can now be entered with UCIS. Tools ===== * The `tools/layer-notify` tool was removed, it was an example, which I don't use. `tools/hid-commands` -------------------- * Now looks at the `DISABLE_APPSEL_START` environment value, and does not display an AppSel notification if it is non-empty. * Will attempt to re-program the keyboard when receiving a `reflash` command. * No longer tries to select Emacs 24 on `APPSEL_EMACS`, rather, it goes for any Emacs. * The `APPSEL_MUSIC` command now includes Kodi in the list too, as the last choice. Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
* | / / removes planck/rev3 temporarilyJack Humbert2016-10-181-3/+0
|/ / /
* | | Update MakefileJack Humbert2016-10-161-72/+1
| | |
* | | Merge pull request #815 from priyadi/unicode_mapJack Humbert2016-10-169-0/+495
|\ \ \ | | | | | | | | Allow unicode up to 0xFFFFF using separate mapping table
| * | | Add example keymapPriyadi Iman Nurcahyo2016-10-103-0/+444
| | | |
| * | | Unicode map framework. Allow unicode up to 0xFFFFF using separatePriyadi Iman Nurcahyo2016-10-106-0/+51
| | | | | | | | | | | | | | | | mapping table
* | | | Merge pull request #825 from replicaJunction/pr-vscodeJack Humbert2016-10-161-0/+1
|\ \ \ \ | |_|/ / |/| | | Added VS Code dir to .gitignore
| * | | Added VS Code dir to .gitignoreJoshua T2016-10-151-0/+1
|/ / /
* | | Merge pull request #818 from pvinis/pvinis-keymapErez Zukerman2016-10-134-0/+511
|\ \ \ | | | | | | | | pvinis keymap
| * | | add readmePavlos Vinieratos2016-10-112-0/+72
| | | |
| * | | use wait_ms instead of _delay_msPavlos Vinieratos2016-10-111-7/+7
| | | |
| * | | add messengerPavlos Vinieratos2016-10-111-2/+3
| | | |
| * | | init keymapPavlos Vinieratos2016-10-112-0/+438
| | | |
* | | | Merge pull request #822 from jackhumbert/hotfix/simplify_toErez Zukerman2016-10-133-7/+12
|\ \ \ \ | |/ / / |/| | | [Jack & Erez] Simplifies and documents TO
| * | | [Jack & Erez] Simplifies and documents TOJack & Erez2016-10-123-7/+12
|/ / /
* | | Merge pull request #803 from coderkun/coderkun_neo2Erez Zukerman2016-10-101-2/+27
|\ \ \ | | | | | | | | Merge Unicode fixes for keymap “coderkun_neo2”
| * | | Overwrite method hex_to_unicode() for make it compatible with Neocoderkun2016-10-031-0/+25
| | | |
| * | | Merge branch 'master' into coderkun_neo2coderkun2016-10-031-0/+1
| |\ \ \
| * \ \ \ Merge branch 'master' into coderkun_neo2coderkun2016-10-02346-12401/+20510
| |\ \ \ \
| * | | | | Add double arrow Unicode characters to FMU layercoderkun2016-10-021-2/+2
| | | | | |
* | | | | | Merge pull request #809 from nathanejohnson/osx_whiskey_tango_foxtrot_capslockErez Zukerman2016-10-103-0/+269
|\ \ \ \ \ \ | | | | | | | | | | | | | | Adding whiskey_tango_foxtrot_capslock ergodox keymap
| * | | | | | Adding whiskey_tango_foxtrot_capslock ergodox keymapNathan Johnson2016-10-093-0/+269
| | |_|_|/ / | |/| | | |
* | | | | | Merge pull request #808 from npoirey/masterJack Humbert2016-10-102-0/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | Altgr quick combination and updated readme
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-18 16:49:32 +0000