mindfulminun/qmk
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity
4,183 Commits 2 Branches 1,455 Tags
35edb382ee6390e1208806ce74d7dc1f4ab08f5d
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Erez Zukerman f0633f2540 Merge pull request #1063 from osamuaoki/master 
Typo fixes
 2017-02-02 18:33:04 -05:00
Erez Zukerman 404f79ef14 Merge pull request #1058 from edasque/master 
Reverted Dockerfile to put the CMD back
 2017-02-02 18:31:25 -05:00
Erez Zukerman 45e5b32781 Merge pull request #1049 from SjB/tap_dance_save_oneshot_mods 
race condition between oneshot_mods and tap_dance
 2017-02-01 20:12:44 -05:00
Erez Zukerman a5d10e8c2e Merge pull request #1054 from deadcyclo/master 
Adds support for ergodox shine and unicode and emoji support to the deadcyclo layout
 2017-02-01 20:11:37 -05:00
Erez Zukerman 748316fc43 Merge pull request #1039 from zabereer/albert_ergodox_keymap 
albert ergodox keymap
 2017-01-31 19:29:19 -05:00
Erez Zukerman 0081101c30 Merge pull request #1055 from matzebond/master 
update my neo2 keymap
 2017-01-31 19:25:46 -05:00
Erez Zukerman 0fde5a34e2 Merge pull request #1004 from jackhumbert/hf/scmd 
Adds SCMD and SCMD_T
 2017-01-13 21:16:10 -05:00
Erez Zukerman 3717cf5864 A shot at aliasing 2017-01-12 07:38:07 -05:00
Erez Zukerman 8459bb97c1 Adds SCMD and SCMD_T 2017-01-11 21:57:41 -05:00
Erez Zukerman 9675e1357f Update readme.md 2016-12-21 21:09:20 -05:00
Erez Zukerman a81279158b Update readme.md 2016-12-21 21:08:55 -05:00
Erez Zukerman 4e4f365c87 updates readme 2016-12-21 21:05:58 -05:00
Erez Zukerman 10864def46 New default firmware graphic 2016-12-21 21:03:53 -05:00
Erez Zukerman 29731588b7 Flips off MIDI and API_SYSEX 2016-12-19 08:27:05 -05:00
Erez Zukerman 8a65c640ec Adds a troubleshooting layout for resetting the EEPROM 2016-12-16 20:53:42 -05:00
Erez Zukerman df32d5b769 Removes alt/j dual function 2016-12-16 20:13:40 -05:00
Erez Zukerman cd41355069 Merge pull request #936 from jackhumbert/f/shine_default 
Official default factory firmware for ErgoDox EZ Shine
 2016-12-06 07:57:02 -05:00
Erez Zukerman 51ae6da99e Merge pull request #918 from jackhumbert/wu5y7 
Adds Ergodox EZ RGB lights (both sides using I2C) and implements API base, Midi SysEx API
 2016-11-29 08:16:04 -05:00
Erez Zukerman 7b219a7f60 Merge pull request #917 from gid0/master 
keyboards/ergodox/keymaps/bepo : merge from author
 2016-11-29 08:13:49 -05:00
Erez Zukerman f73a378f0f Merge pull request #870 from NoahAndrews/patch-1 
Add proper shortcode for KC_DELETE to keycode.txt
 2016-11-10 09:43:38 -05:00
Erez Zukerman 7a9be2562d Merge pull request #851 from J3RN/momentary 
Switched to momentary
 2016-10-31 21:41:19 -04:00
Erez Zukerman a6401076d5 Merge pull request #843 from lucwastiaux/master 
Adding Ergodox Dvorak Programmer layout
 2016-10-31 21:40:58 -04:00
Erez Zukerman bd40844e4e Merge pull request #836 from 20lives/master 
added new layout
 2016-10-31 21:39:40 -04:00
Erez Zukerman 2e2b9962cd Merge pull request #833 from h-parks/master 
Win10 Writer's Block - An ErgoDox Keymap
 2016-10-20 08:55:16 -04:00
Erez Zukerman c3dee2bb66 Merge pull request #832 from PhoenixRion/master 
Phoenix Layout
 2016-10-20 08:53:47 -04:00
Erez Zukerman 0d8844dcb8 Merge pull request #826 from algernon/ergodox-ez/algernon 
ergodox: Update algernon's keymap to v1.9
 2016-10-17 18:12:31 -04:00
Erez Zukerman 0a9ad8f335 Merge pull request #818 from pvinis/pvinis-keymap 
pvinis keymap
 2016-10-13 06:41:51 -04:00
Erez Zukerman 16e362cfc4 Merge pull request #822 from jackhumbert/hotfix/simplify_to 
[Jack & Erez] Simplifies and documents TO
 2016-10-13 06:41:07 -04:00
Jack & Erez e27a754b70 [Jack & Erez] Simplifies and documents TO 2016-10-12 22:18:27 -04:00
Erez Zukerman 698d02122b Merge pull request #803 from coderkun/coderkun_neo2 
Merge Unicode fixes for keymap “coderkun_neo2”
 2016-10-10 19:59:28 -04:00
Erez Zukerman be60c057dc Merge pull request #809 from nathanejohnson/osx_whiskey_tango_foxtrot_capslock 
Adding whiskey_tango_foxtrot_capslock ergodox keymap
 2016-10-10 19:58:59 -04:00
Erez Zukerman d465e3f0c3 Merge pull request #804 from algernon/ergodox-ez/algernon 
ergodox: Update algernon's keymap to v1.8
 2016-10-03 17:49:23 -04:00
Erez Zukerman 35e6870e5c Merge pull request #788 from chwilk/kastyle-refresh 
Kastyle refresh
 2016-09-30 08:59:59 -04:00
Erez Zukerman fede822fce Merge pull request #789 from cmclen/master 
Contributing new keymap to Ergodox
 2016-09-30 08:59:24 -04:00
Erez Zukerman 545f0ca00e Merge pull request #760 from algernon/ergodox-ez/algernon 
Update the ergodox/algernon keymap to v1.7
 2016-09-22 21:38:59 -04:00
Erez Zukerman a258358b6c Merge pull request #758 from absenth/development 
Absenth Ergodox Keymap Improvements
 2016-09-14 22:51:41 -04:00
Erez Zukerman 23faf9ec81 Merge pull request #734 from adiabatic/master 
Ergodox EZ: Zweihander keyboard layout updates
 2016-09-11 20:28:09 -04:00
Erez Zukerman 862d93e0cb Merge pull request #740 from absenth/development 
Absenth's Layout- QWERTY with additional Media Layer Functions.
 2016-09-11 20:27:12 -04:00
Erez Zukerman fe4b379287 Merge pull request #746 from DidierLoiseau/bépo 
Bépo with firmware remapping for software CSA layout
 2016-09-11 20:26:23 -04:00
Erez Zukerman 0f111182a6 Merge pull request #732 from romanzolotarev/master 
Change CTL_T(KC_ESC) to KC_LCTRL and update readme
 2016-09-06 21:35:15 -04:00
Erez Zukerman 74d72c724b Merge pull request #729 from joarau/master 
norwegian programmer-friendly layout
 2016-09-06 21:33:55 -04:00
Erez Zukerman 8b0769fe5a Merge pull request #728 from fitzsim/yoruian 
Add new ErgoDox EZ keymap, YORUIAN
 2016-09-06 07:07:25 -04:00
Erez Zukerman 5bb29136b1 Merge pull request #686 from coderkun/coderkun_neo2 
Merge Ergodox keymap “coderkun_neo2”
 2016-09-05 20:33:09 -04:00
Erez Zukerman 45d68486a2 Merge pull request #678 from algernon/ergodox-ez/algernon 
ergodox: Update algernon's keymap to v1.6
 2016-09-05 20:32:46 -04:00
Erez Zukerman 2c8f6557e6 Merge pull request #664 from linsomniac/infinity_readme 
Adding nicer Infinity build instructions.
 2016-08-26 07:32:24 -04:00
Erez Zukerman 17511870bc Merge pull request #685 from fredizzimo/windows10_instructions_typo 
Fix minor typo in the readme
 2016-08-26 07:29:12 -04:00
Erez Zukerman 6323f3d1e7 Merge pull request #623 from algernon/ergodox-ez/algernon 
ergodox: Update my keymap to v1.5
 2016-08-13 20:12:15 -04:00
Erez Zukerman 5ef3f05215 Merge pull request #626 from tenderlove/readme-link 
fix link to ErgoDox EZ
 2016-08-13 20:11:34 -04:00
Erez Zukerman 79a9e04706 Merge pull request #592 from sethbc/ez-sethbc 
Ez sethbc
 2016-08-02 08:03:09 -04:00
Erez Zukerman 8c52327aa6 Merge pull request #593 from J3RN/master 
Updated the J3RN ErgoDox keymap
 2016-08-02 08:02:27 -04:00
Erez Zukerman 6eab4ecd7e Merge pull request #600 from adiabatic/master 
zweihander-osx: add left-hand-thumb tab key
 2016-08-02 08:01:56 -04:00
Erez Zukerman 30003d48f9 Merge pull request #584 from algernon/ergodox-ez/algernon 
ergodox_ez: Upgrade my keymap to v1.4
 2016-07-29 08:11:37 -04:00
Erez Zukerman 64e76f6ed3 Merge pull request #583 from coderkun/coderkun_neo2 
Ergodox EZ: update keymap “coderkun_neo2”
 2016-07-29 08:10:46 -04:00
Erez Zukerman 3c235b4bf9 Merge pull request #580 from MatsLanGoH/patch-1 
Fixed a typo
 2016-07-29 08:09:05 -04:00
Erez Zukerman 93f366fa7d Merge pull request #562 from michaelklos/doc 
Added Tap Dance Example
 2016-07-26 21:54:10 -04:00
Erez Zukerman 685c8ba64c Merge pull request #533 from mazinbokhari/master 
Add my layout optimized for working in emacs, vim, command line, etc.
 2016-07-26 21:52:39 -04:00
Erez Zukerman 4885225159 Merge pull request #534 from willwm/teckinesis 
Teckinesis for ErgoDox EZ
 2016-07-24 18:04:59 -07:00
Erez Zukerman 1e944a4991 Merge pull request #542 from algernon/f/hold-the-dance 
Tap-dance: support for holding keys
 2016-07-24 11:36:05 -07:00
Erez Zukerman 36f2e22283 Merge pull request #535 from algernon/ergodox-ez/algernon 
ergodox_ez: Update my keymap to v1.3
 2016-07-24 11:34:33 -07:00
Erez Zukerman e9f5c87207 Merge pull request #447 from abperiasamy/ergo-browser-zoom 
zoom and undo keys for ab's beginners ergodox-ez keymap
 2016-06-27 09:01:51 -04:00
Erez Zukerman 40bfc7231e Merge pull request #440 from abperiasamy/ergo-ab-swap-up-down 
Swap up and down keys to match default layout
 2016-06-24 08:57:06 -04:00
Erez Zukerman d2fc24d2a0 Merge pull request #438 from tkuichooseyou/master 
Added tkuichooseyou keymap; for vim and macOS users
 2016-06-24 08:56:01 -04:00
Erez Zukerman 8c1bfdf0bd Merge pull request #433 from algernon/ergodox-ez/algernon 
ergodox_ez: Update the algernon keymap to v1.2
 2016-06-22 09:01:51 -04:00
Jack & Erez 76076db725 [Jack & Erez] Fixes Space Cadet right shift 2016-06-20 22:36:36 -04:00
Erez Zukerman a5d638ad30 Merge pull request #364 from techtomas/techtomas 
Rearranged the layer toggles and keys.
 2016-06-07 21:18:32 -04:00
Erez Zukerman 2fda55ba54 Merge pull request #384 from gid0/master 
Merge ErgoDox bepo layout changes.
 2016-06-06 23:22:52 -04:00
Erez Zukerman 0457ed4880 Merge pull request #297 from gid0/master 
Add an ErgoDox bépo layout.
 2016-06-01 08:21:04 -04:00
Erez Zukerman 56939b1518 Merge pull request #367 from waveform80/fix-unselect-rows-prototype 
Squash the prototype compiler warning
 2016-05-31 23:42:54 -04:00
Erez Zukerman 0c4085dd53 Merge pull request #368 from waveform80/daves-layout-readme 
Added a README and minor tweaks for "dave" KEYMAP
 2016-05-31 23:42:11 -04:00
Erez Zukerman bae92b2a10 Merge pull request #356 from johgh/master 
ergodox_ez: added dvorak_spanish layout
 2016-05-31 23:18:16 -04:00
Erez Zukerman 8ee9be11de Merge pull request #353 from algernon/ergodox-ez/algernon 
My layout for the ErgoDox EZ
 2016-05-29 13:53:29 -04:00
Erez Zukerman 89f0472b9e Merge pull request #352 from algernon/ergodox-ez/supercoder 
ergodox_ez: Add a SuperCoder keymap
 2016-05-26 08:40:20 -04:00
Erez Zukerman 5501f231d4 Merge pull request #351 from adiabatic/master 
Add KC_DQUO ("); update Zweihander
 2016-05-25 21:41:18 -04:00
Erez Zukerman ed349f0c3d Merge pull request #324 from Bubblepoint/master 
Add adnw/k_o_y layout
 2016-05-19 15:54:16 -04:00
Erez Zukerman 1a8c0dd22d Leader key implementation (#326) 
* implements leader key for planck experimental

* allows override of leader timeout

* adds ability to use the leader key in seq

* fixes leader keycode

* adds chording prototype

* fixes keycode detection

* moves music mode to quantum.c

* disables chording by default

* updates process_action functions to return bool
 2016-05-15 00:27:32 -04:00
Erez Zukerman 6e72586b6b Merge pull request #320 from Townk/townkmap 
Townkmap
 2016-05-13 21:54:23 -04:00
Erez Zukerman 9746cd5323 Merge pull request #317 from Twey/master 
Updates to `keymaps/twey` to the media layer and for Plover 3.0
 2016-05-13 21:51:03 -04:00
Erez Zukerman 7b2cdca744 Merge pull request #307 from sboesebeck/master 
minor change to default layouts
 2016-05-13 21:50:28 -04:00
Erez Zukerman 2ce9644caa Merge pull request #311 from adiabatic/ergodox-zweihander-osx 
Add KC_LABK and KC_RABK (< and >)
 2016-05-06 18:28:43 -04:00
Erez Zukerman 7566ac4241 Merge pull request #310 from nrrkeene/master 
Lock layers by pressing both shift keys
 2016-05-06 09:13:30 -04:00
Erez Zukerman dbb1c2f281 Merge pull request #305 from nrrkeene/master 
Custom handling for shift keys, improved media layer
 2016-05-04 22:31:00 -04:00
Erez Zukerman 31a697bc05 Merge pull request #304 from adiabatic/ergodox-zweihander-osx 
zweihander: comment out action_get_macro()
 2016-05-03 22:27:39 -04:00
Erez Zukerman 2c070163ff Merge pull request #300 from Twey/tweymap-momentary 
Swap steno/media layers to allow using media keys in the Plover layer…
 2016-05-02 21:04:13 -04:00
Erez Zukerman 1ce6da2605 Merge pull request #298 from adiabatic/ergodox-zweihander-osx 
ergodox-zweihander-osx: initial commit
 2016-05-02 08:30:34 -04:00
Erez Zukerman 98ed12843e Merge pull request #294 from sneako/master 
Add my Ergodox EZ config
 2016-05-02 08:24:26 -04:00
Erez Zukerman 84b736dc7f Merge pull request #258 from romanzolotarev/master 
Add Roman's single layer layout based on Norman
 2016-05-02 08:24:11 -04:00
Erez Zukerman c3aa0a23ed Merge pull request #292 from abperiasamy/ergo-ab 
Beginner's keymap for Ergodox-EZ
 2016-04-30 14:56:58 -04:00
Erez Zukerman e7d56215de Merge pull request #295 from techtomas/techtomas 
Add my layout to the list
 2016-04-30 07:42:20 -04:00
Erez Zukerman aabcfd5b4e Merge pull request #282 from jasontwong/master 
Add new keymap
 2016-04-25 06:57:00 -04:00
Erez Zukerman 68532ced24 Merge pull request #280 from Twey/master 
Add `quantum/keymap_extras/keymap_plover.h` and a keymap.
 2016-04-24 20:33:38 -04:00
Erez Zukerman a8fd65d86f Merge pull request #265 from sboesebeck/master 
ErgodoxLayoutGenerator used
 2016-04-21 08:10:39 +03:00
Erez Zukerman a9ef1c0a03 Merge pull request #267 from nrrkeene/master 
Improved modifier keys, code
 2016-04-20 07:48:54 +03:00
Erez Zukerman a0194d7e5f Merge pull request #249 from nrrkeene/master 
Version 3, Ordinary Perfected
 2016-04-12 09:04:29 +03:00
Erez Zukerman 98497e648d Merge pull request #248 from J3RN/master 
Vim-style navigation for j3rn layout
 2016-04-12 08:55:24 +03:00
Erez Zukerman 511c843829 Merge pull request #246 from romanzolotarev/master 
Add a new layout with arrows in the home row
 2016-04-11 23:02:08 +03:00
Erez Zukerman 58f2c6fcf2 Merge pull request #246 from romanzolotarev/master 
Add a new layout with arrows in the home row
 2016-04-11 23:02:08 +03:00
Erez Zukerman 153a6fb0d3 Merge pull request #182 from Vifon/modifier-release-fix 
Fix the layer-dependent modifiers handling
 2016-04-06 22:47:31 +03:00
Erez Zukerman 27ee47d0bd Merge pull request #239 from DidierLoiseau/issue-221 
Fix issue #221: LGUI(KC_LSFT) does not work
 2016-04-06 22:37:02 +03:00
Erez Zukerman d07a1257b3 Merge pull request #215 from nrrkeene/master 
Added proper documentation
 2016-04-06 22:35:17 +03:00
Erez Zukerman 04e4428e8c Merge pull request #238 from alexjj/master 
Submitting my ergodox EZ layout
 2016-04-06 22:34:46 +03:00