Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Sol rework #7317

Merged
merged 100 commits into from
Nov 11, 2019
Merged

Sol rework #7317

Changes from 1 commit
Commits
Show all changes
100 commits
Select commit Hold shift + click to select a range
6419122
Added WOW layer
Xyverz Oct 9, 2018
16cd4f6
Initial commit for this branch. Still a work in progress.
Xyverz Oct 20, 2018
030649b
Added Rorschach keyboard layout.
Xyverz Oct 22, 2018
c4de050
Merge branch 'minidox-edits'
Xyverz Oct 22, 2018
47bd243
Merge remote-tracking branch 'upstream/master'
Xyverz Nov 14, 2018
668e025
Merge remote-tracking branch 'upstream/master'
Xyverz Nov 21, 2018
35bca79
Merge remote-tracking branch 'upstream/master'
Nov 29, 2018
f90be6a
Merge remote-tracking branch 'upstream/master'
Xyverz Dec 2, 2018
e49d966
Merge remote-tracking branch 'upstream/master'
Xyverz Dec 5, 2018
405d9ee
Simplified keymap
Xyverz Dec 8, 2018
6de8564
Added ErgoTravel keymap.
Dec 18, 2018
80eb33d
reverted to previous layout.
Dec 19, 2018
b9b8601
Added Sol keyboard layout.
Dec 21, 2018
73d88d0
Minor changes to keymap.
Dec 21, 2018
b3a58c7
more changes
Dec 22, 2018
bba1cf9
Added sol graphic by Kagerufu and Cardiactuna
Dec 22, 2018
f3c6d23
Merge branch 'master' of https://github.com/Xyverz/qmk_firmware
Dec 22, 2018
935df2d
Added colemak layer because I can.
Dec 24, 2018
bc0ab75
more changes to sol layout
Xyverz Dec 26, 2018
f77dd3d
Streamlined Sol layout
Dec 26, 2018
e45fd71
minor tweaks to sol layout
Dec 27, 2018
8e4291d
further revisions to sol keymap.
Xyverz Jan 4, 2019
c082a32
Merge remote-tracking branch 'upstream/master'
Xyverz Jan 4, 2019
0596ba0
Merge remote-tracking branch 'upstream/master'
Xyverz Jan 10, 2019
b2d6ad2
Merge remote-tracking branch 'upstream/master'
Jan 23, 2019
0390a06
Removing deprecated #include statements from my keymaps
Jan 24, 2019
9cba699
Standardizing keymap `include` lines.
Jan 24, 2019
c6caa33
Merge remote-tracking branch 'upstream/master'
Xyverz Jan 28, 2019
d5afc1f
Merge remote-tracking branch 'upstream/master'
Feb 5, 2019
2e761a1
Minor change to keymap.
Feb 7, 2019
ef85883
Merge remote-tracking branch 'upstream/master'
Xyverz Feb 12, 2019
2e5da52
Tweaks to Atreus62 Keymap
Feb 27, 2019
e557bd9
Merge remote-tracking branch 'upstream/master'
Feb 27, 2019
edccace
Merge remote-tracking branch 'upstream/master'
Mar 2, 2019
8f2aefa
Merge remote-tracking branch 'upstream/master'
Xyverz Mar 20, 2019
be39d64
Fixed readme.md for Atreus keymap.
Mar 20, 2019
059f340
More readme.md clean-up
Mar 20, 2019
56224b7
Next verse, same as the first.
Mar 20, 2019
c871247
Changes to Sol layout
Xyverz Mar 21, 2019
af485c7
Merge remote-tracking branch 'upstream/master'
Xyverz Apr 2, 2019
bb5521a
Fixed keymap GUI.
Xyverz Apr 22, 2019
2df6feb
Merge remote-tracking branch 'upstream/master'
Xyverz Apr 22, 2019
8d63486
Merge remote-tracking branch 'upstream/master'
Xyverz Apr 29, 2019
7a1aa00
Added ALPS64 keymap
Jun 13, 2019
c25c8aa
Formatting corrections
Jun 13, 2019
37932c1
Merge remote-tracking branch 'upstream/master'
Jun 25, 2019
5a4ba40
fixes to config.h and keymap.c
Jun 25, 2019
db3e2c0
Fixed errors
Jun 25, 2019
ed3124f
Fixed orthodox keymap config.h file
Jun 25, 2019
fc5faa1
Making suggested changes for PR#6192
Jun 28, 2019
0aa7cce
Merge branch 'master' of https://github.com/Xyverz/qmk_firmware
Jun 28, 2019
9305189
Fixing build errors
Jun 28, 2019
7568b30
More fixes and corrections
Jun 28, 2019
773efb5
More Fixes.
Jun 28, 2019
6652ce1
Removing unneeded code snippet.
Jun 28, 2019
52fc461
fixed omitted semicolons
Jun 28, 2019
40e9036
Code updates to my keymaps
Jun 28, 2019
6b502bc
Fixed Atreus62 Keymap
Jun 28, 2019
e267c53
Added userspace
Jun 29, 2019
21cd022
Fixing code that disables LEDs on ProMicros
Jul 1, 2019
760cc59
Moving userspace to new branch
Jul 1, 2019
1e0b705
Added F13-F15 to Atreus62 Layout.
Jul 9, 2019
340aba9
Merge remote-tracking branch 'upstream/master'
Xyverz Jul 29, 2019
b3dee44
Update readme.md.
Xyverz Jul 29, 2019
f2e2c5c
Merge remote-tracking branch 'upstream/master'
Xyverz Aug 27, 2019
dfac86e
Merge remote-tracking branch 'upstream/master'
Xyverz Aug 29, 2019
97acf9c
Merge remote-tracking branch 'upstream/master'
Xyverz Sep 3, 2019
c685061
Merge remote-tracking branch 'upstream/master'
Sep 9, 2019
113cc3b
Merge remote-tracking branch 'upstream/master'
Sep 16, 2019
8f6d363
Merge remote-tracking branch 'upstream/master'
Sep 23, 2019
9411e0f
Merge remote-tracking branch 'upstream/master'
Xyverz Oct 1, 2019
ab05068
Merge remote-tracking branch 'upstream/master'
Xyverz Oct 3, 2019
d7cbb61
Merge remote-tracking branch 'upstream/master'
Xyverz Oct 8, 2019
9cdc53f
Merge remote-tracking branch 'upstream/master'
Xyverz Oct 9, 2019
6c49a2e
Merge remote-tracking branch 'upstream/master'
Xyverz Oct 11, 2019
fc7d893
Updated Phantom keymap to current keymap standards
Xyverz Oct 16, 2019
2b182d0
Phantom keymap updates
Xyverz Oct 16, 2019
754162c
Standards Updates
Xyverz Oct 20, 2019
ef7492d
Adding a readme
Xyverz Oct 20, 2019
f827d81
Bring GH60 code to standard
Xyverz Oct 21, 2019
d74d11a
Utilizing layouts for 60_ansi and tkl_ansi
Xyverz Oct 21, 2019
3a3b3d0
Alps64 layout removal
Xyverz Oct 21, 2019
d03b83f
Merge remote-tracking branch 'upstream/master'
Xyverz Oct 21, 2019
51c0869
Moved Clueboard layout to community/66_ansi.
Oct 23, 2019
f1dc7dd
Additions to 66_ansi config.h
Oct 23, 2019
2981ced
Bringing keymaps up to standard.
Xyverz Oct 23, 2019
7f62db8
More updates to keymaps.
Xyverz Oct 24, 2019
499726b
Merge remote-tracking branch 'upstream/master'
Xyverz Oct 25, 2019
a892b2d
Syntax updates
Xyverz Oct 25, 2019
983fd4a
Revert "Syntax updates"
Xyverz Oct 25, 2019
22355e8
Moved WIP keymaps
Oct 26, 2019
9cbda4d
Merge remote-tracking branch 'upstream/master'
Oct 26, 2019
51bc80f
Updates requested by @noroadsleft
Oct 27, 2019
a36c4cb
more changes per @noroadsleft
Xyverz Oct 27, 2019
a7456a7
Merge remote-tracking branch 'upstream/master'
Xyverz Oct 28, 2019
9677885
Merge remote-tracking branch 'upstream/master'
Xyverz Oct 28, 2019
fbff0c4
Merge branch 'master' of https://github.com/qmk/qmk_firmware
Xyverz Nov 3, 2019
d632b3c
Merge branch 'master' of https://github.com/qmk/qmk_firmware
Xyverz Nov 6, 2019
31f21f0
Reworked Sol Keymap
Xyverz Nov 10, 2019
c56d56c
Final tweaks to sol keymap
Xyverz Nov 10, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge remote-tracking branch 'upstream/master'
  • Loading branch information
@Xyverz
Xyverz committed Dec 2, 2018
commit f90be6a325d4e8f1fe2e7a225ec1897deb612df5

This merge commit was added into this branch cleanly.

There are no new changes to show, but you can still view the diff.