Commit Graph

410 Commits (90abe70586a3d36bae4d2e3a1f1a02cc64d8925e)

Author SHA1 Message Date
cbbrowne 90abe70586 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 8 years ago
Kyle Berry 30de8663a9 Fixing Dvorak
Updating with proper Dvorak layout.
8 years ago
Jack Humbert a3f726174c Merge pull request #665 from linsomniac/keymap_jafo
Adding jafo layout.
8 years ago
Jack Humbert a592c9dcf4 Merge pull request #658 from Xyverz/master
Got rid of all the kludge in my ErgoDox keymap.
8 years ago
Jack Humbert 7cef0f56e9 Merge pull request #630 from nrrkeene/master
The Ordinary Layout is the unsurprising layout
8 years ago
Xyverz 70d4ea7904 Merge remote-tracking branch 'upstream/master' 8 years ago
Xyverz e4984f65de Changed the Ergodox keymap to use the KEYMAP() macro, updated readme.md. 8 years ago
Xyverz aff792545d Changed my keymap to match normal keymaps. 8 years ago
Nicholas Keene 6a9a6b9477 The Ordinary Layout is boring because all the keys are where you expect them to be 8 years ago
Nicholas Keene 8f78ba1f73 The Ordinary Layout is boring because all the keys are where you expect them to be 8 years ago
Sean Reifschneider a25480b3b5 Bringing over changes from default map. 8 years ago
Jack Humbert a3a312f8f4 Merge pull request #662 from toneman77/iso_satan
Satan Cleanup
8 years ago
Jack Humbert 47b670bced Merge pull request #663 from tomb0y/kc60_workman_dead
Add the workman-dead layout for kc60
8 years ago
Sean Reifschneider 50531068b3 Adding jafo layout. 8 years ago
zs a1da23d827 Add the workman-dead layout for kc60 8 years ago
Toni bc0bd11430 forgot media keys 8 years ago
Toni 225c73ed30 Merge remote-tracking branch 'origin/master' into amj60
merge with upstream
8 years ago
Xyverz ed1291bfbd Added compatibility for the Infinity ErgoDox to my Ergodox keymap.
Updated readme.md to reflect this change.
8 years ago
Damien a5e6da7aa8 Added dbroqua layout for planck keyboard 8 years ago
Jack Humbert 6c359cabbf Merge pull request #652 from iFreilicht/master
Added S60-X keyboard
8 years ago
Jack Humbert 8f32595820 Merge pull request #650 from Xyverz/master
Minor changes to keymaps and other files
8 years ago
Toni 21dc8381d1 made a correct default KEYMAP. moved the old one to KEYMAP_ANSI
fixed all layouts that were referencing KEYMAP to KEYMAP_ANSI
whitespace prettyfying
8 years ago
Toni fe90653886 smyll typo fixed 8 years ago
Toni 0e86c85241 amj60 variant of the readme 8 years ago
Toni 0edf7c7cad first attempt at documentation for the amj60 board 8 years ago
Gergely Nagy 0d9d4b8658 planck/circuit: Update after the latest tap-dance change
Fixes #653.

Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
8 years ago
Toni 068e76bbf0 uniform whitespace 8 years ago
Toni 387bd772e1 initial commit for the AMJ60 PCB 8 years ago
Felix Uhl dbfb27326b Added info to docs 8 years ago
Felix Uhl ed6ecff292 Merge pull request #1 from jackhumbert/master
Merging from base Repo
8 years ago
Felix Uhl 73f13c8f26 Bugfixes 8 years ago
Felix Uhl a72dc6da70 Final link fix 8 years ago
Felix Uhl 406ae1a2eb More link fixing 8 years ago
Felix Uhl aa71ebfbba Fixed links again
Note to self: check before commiting.
8 years ago
Felix Uhl d34c0a2fc1 Fixed dead link 8 years ago
Felix Uhl 738151d12a Minor documentation changes 8 years ago
Felix Uhl c5f13e5836 Fixed links again 8 years ago
Felix Uhl a865995595 Fixed pictures and links 8 years ago
Felix Uhl 2618260b34 Documentation overhaul. 8 years ago
Toni 864e26f439 cleanup, readability , shift swap in ISO_SPLIT_RSHIFT 8 years ago
Felix Uhl 07924511f3 Small changes, renamed keymap
Added MicMute
Revived all dead keys
Removed OS Shift
8 years ago
Toni 64ecb15310 corrected the split rshift key to reality
fixed my keymap in the process to adjust to that
8 years ago
Xyverz aa37a57e0f One last change to the readme. 8 years ago
Xyverz eb81978ecb One last formatting change 8 years ago
Xyverz 118ad691c4 more formatting changes 8 years ago
Xyverz 4dd641a128 Hopefully this fixes the layout diagrams. 8 years ago
Xyverz 035290b7d8 Added a readme, tidied up comments in the keymap. 8 years ago
Xyverz 47beb763e8 Returned RAISE and LOWER buttons to their original functions - too many inopportune ENTER inputs. :-( 8 years ago
Xyverz 67227e4c71 Merge branch 'master' of https://github.com/Xyverz/qmk_firmware 8 years ago
Xyverz 385b827c85 Merge remote-tracking branch 'upstream/master'
this merge is necessary,
8 years ago