Mirrors/dioxus
2
0
Fork 0
mirror of https://github.com/DioxusLabs/dioxus synced 2024-12-24 11:33:08 +00:00
Code Issues Projects Releases Packages Wiki Activity
614 commits 7 branches 26 tags 95 MiB
Commit graph

500 commits

Author SHA1 Message Date
Jonathan Kelley
b43a964f98 polish: clean up to web 2021-09-24 20:47:59 -04:00
Jonathan Kelley
823adc0834 polish: clean up the web module 2021-09-24 20:11:30 -04:00
Jonathan Kelley
04d16b41dc polish: exampels 2021-09-24 02:37:51 -04:00
Jonathan Kelley
f07e345eb2 examples: slightly simplify crm 2021-09-24 01:26:16 -04:00
Jonathan Kelley
718fa14b45 feat: a cute crm 2021-09-24 01:24:03 -04:00
Jonathan Kelley
1a2f91ed91 polish: examples 2021-09-24 00:05:56 -04:00
Jonathan Kelley
4b6ca05f2c wip: performance looks good, needs more testing 2021-09-22 04:11:27 -04:00
Jonathan Kelley
84b5ddded5 feat: select figured out 2021-09-22 03:22:15 -04:00
Jonathan Kelley
d7940aa2ac feat: proper handling of events 2021-09-22 02:44:01 -04:00
Jonathan Kelley
c7d2d9d050 wip: fix invalid is_empty bug 2021-09-22 01:37:45 -04:00
Jonathan Kelley
f15e1fa892 wip: broken diff 2021-09-22 01:29:14 -04:00
Jonathan Kelley
098d3821ed wip: changes to scheduler 2021-09-22 01:25:28 -04:00
Jonathan Kelley
b32e2611e3 polish: clean up warnings 2021-09-21 18:13:09 -04:00
Jonathan Kelley
a2c7d17b05 feat: mvoe away from compound context 2021-09-21 13:42:52 -04:00
Jonathan Kelley
bfdcb20437 feat: transition to cx, props 2021-09-21 13:13:15 -04:00
Jonathan Kelley
f1cff845ce wip: examples 2021-09-21 12:11:04 -04:00
Jonathan Kelley
adf202eab9 wip: more doc 2021-09-20 17:36:39 -04:00
Jonathan Kelley
34c3107418 wip: more docs 2021-09-20 16:49:36 -04:00
Jonathan Kelley
7978a17419 wip: bubbling 2021-09-20 12:32:21 -04:00
Jonathan Kelley
c16b92ee7e wip: before scheduler simplify 2021-09-19 22:10:00 -04:00
Jonathan Kelley
9971ff215d polish: change in cx to cx 2021-09-16 13:20:04 -04:00
Jonathan Kelley
0ded32e184 wip: reduce warnings 2021-09-14 00:58:33 -04:00
Jonathan Kelley
12afd2b0f2 wip: more polish on display 2021-09-13 19:07:15 -04:00
Jonathan Kelley
238677208e wip: more polish on scopes 2021-09-13 18:59:07 -04:00
Jonathan Kelley
ff1398b943 wip: polish up some safety stuff and add suspense support in 2021-09-13 18:55:43 -04:00
Jonathan Kelley
79e8df26f5 wip: fix props update 2021-09-13 12:42:38 -04:00
Jonathan Kelley
5a09ec1610 wip: more clean up 2021-09-13 01:14:09 -04:00
Jonathan Kelley
8b3ac0b57c perf: remove global allocation for props 2021-09-13 00:59:08 -04:00
Jonathan Kelley
369b36b2c6 wip: change around how deadline works 2021-09-09 21:01:38 -04:00
Jonathan Kelley
da8159190b polish: tests and documentation 2021-09-09 20:58:48 -04:00
Jonathan Kelley
3f68be79ae wip: documentation and badges 2021-09-07 18:25:57 -04:00
Jonathan Kelley
1a6b238829 wip: naming 2021-09-03 11:28:09 -04:00
Jonathan Kelley
725b4a1d7f wip: fix some event stuff for web and core 2021-09-02 00:37:57 -04:00
Jonathan Kelley
dfe9f86bff wip: garbage collection 2021-09-02 00:16:49 -04:00
Jonathan Kelley
958c02a26e wip: working down warnings 2021-09-02 00:10:09 -04:00
Jonathan Kelley
a652090dc5 wip: add test_dom 2021-09-01 23:57:34 -04:00
Jonathan Kelley
44b4384961 wip: more scheduler work 2021-09-01 23:33:25 -04:00
Jonathan Kelley
1cd5e69712 wip: more work on scheduler 2021-09-01 23:22:34 -04:00
Jonathan Kelley
5c3dc0a874 wip: more work on rebuild 2021-09-01 15:52:38 -04:00
Jonathan Kelley
fac2e56ed6 feat: update root props 2021-09-01 15:45:53 -04:00
Jonathan Kelley
c321532a6c feat: some docs, cleaning 2021-09-01 00:57:04 -04:00
Jonathan Kelley
acad9ca622 wip: web stuff 2021-08-31 12:28:57 -04:00
Jonathan Kelley
5cbdc571e3 more cleanup 2021-08-31 12:28:44 -04:00
Jonathan Kelley
9f99f46cfd wip: more cleanup in scheduler 2021-08-27 09:56:49 -04:00
Jonathan Kelley
31702dbf87 feat: wire up resource pool 2021-08-27 09:53:26 -04:00
Jonathan Kelley
927b05f358 wip: cleanup public apis 2021-08-27 09:40:04 -04:00
Jonathan Kelley
8b0eb87c72 wip: refactor 2021-08-26 22:05:09 -04:00
Jonathan Kelley
9ad5e49654 wip: algo for scheduler finished 2021-08-26 17:05:28 -04:00
Jonathan Kelley
5f63eda294 wip: feeling goodish about scheduler 2021-08-26 03:33:38 -04:00
Jonathan Kelley
bcaa76a37f wip: some structure 2021-08-26 02:41:30 -04:00
Jonathan Kelley
ac3a7b1fbc wip: considering making vdom passed verywehre 2021-08-26 01:52:50 -04:00
Jonathan Kelley
d4d7114beb wip: more work on scheduler 2021-08-25 17:17:44 -04:00
Jonathan Kelley
07efb6a1b6 wip: it compiles again 2021-08-25 17:09:16 -04:00
Jonathan Kelley
41cc42919d wip: more overhaul on virtualevents 2021-08-25 16:40:18 -04:00
Jonathan Kelley
cef116aa3a wip: more work on priority 2021-08-25 15:54:33 -04:00
Jonathan Kelley
05e960b6b0 wip: refactor to fix some ownership quirks 2021-08-25 12:42:50 -04:00
Jonathan Kelley
3bf19d8106 wip: more work on web 
this commit adds complete event support for web-sys but with a few hole
 2021-08-25 10:49:18 -04:00
Jonathan Kelley
59219b9ef2 wip: ricraf polyfill 2021-08-24 16:36:00 -04:00
Jonathan Kelley
8b0d04ce58 wip: ric_raf wired up 2021-08-24 16:29:10 -04:00
Jonathan Kelley
f457b71131 feat: rebuild doesn't return errors 2021-08-24 15:12:20 -04:00
Jonathan Kelley
df8aa77198 fix: append isnt backwards 2021-08-24 12:51:53 -04:00
Jonathan Kelley
cdcd8611e8 wip: it works but the page is backwards 2021-08-24 12:43:46 -04:00
Jonathan Kelley
a0a977a12d wip: more test 2021-08-24 11:03:19 -04:00
Jonathan Kelley
0479252a5f feat: keyed diffing 2021-08-24 10:01:01 -04:00
Jonathan Kelley
778baffb10 wip: it works? 2021-08-23 15:35:26 -04:00
Jonathan Kelley
082765f687 wip: refactor non_keyed diff 2021-08-23 13:41:47 -04:00
Jonathan Kelley
e6f56563bc feat: tests and benchmarks 2021-08-23 13:15:57 -04:00
Jonathan Kelley
2d541eca64 wip: structure coming together and tests 2021-08-23 12:11:45 -04:00
Jonathan Kelley
16bfc6d248 wip: compiles again 2021-08-23 10:43:49 -04:00
Jonathan Kelley
db6d0184aa feat: dedicated mutations module 2021-08-22 17:08:25 -04:00
Jonathan Kelley
1622f484b3 wip: basic creates working properly 2021-08-21 23:04:34 -04:00
Jonathan Kelley
24572b63de wip: tests added for new iterative 2021-08-21 13:24:47 -04:00
Jonathan Kelley
2ce0752a9c feat: fix compiling 2021-08-21 11:29:29 -04:00
Jonathan Kelley
0987760958 wip: moving over instructions 2021-08-20 11:39:13 -04:00
Jonathan Kelley
7b068202ce wip: remove old create 2021-08-20 10:44:58 -04:00
Jonathan Kelley
64f289a61c wip: back to vnode enum 2021-08-20 10:34:41 -04:00
Jonathan Kelley
9652ccdcf1 wip: move from recursive to iterative 2021-08-19 02:50:35 -04:00
Jonathan Kelley
f41cff571f wip: working on async diff 2021-08-17 22:25:09 -04:00
Jonathan Kelley
882d69571d wip: more work on scheduler 2021-08-15 10:13:03 -04:00
Jonathan Kelley
9d14faf62c wip: scheduler skeleton 2021-08-10 12:16:49 -04:00
Jonathan Kelley
5965bee1d1 wip: more work on deadline, support immediates 2021-08-10 01:38:58 -04:00
Jonathan Kelley
97745c6a7f wip: got the structure figured out! 2021-08-10 01:21:13 -04:00
Jonathan Kelley
85e2dc259a wip: close on putting it all together 
just gotta tie a bow
 2021-08-10 00:29:53 -04:00
Jonathan Kelley
c1afeba1ef wip: groundwork for noderefs 2021-08-09 17:09:33 -04:00
Jonathan Kelley
a44e9fcffa wip: more work on jank free 2021-08-09 13:17:19 -04:00
Jonathan Kelley
1a323835c8 wip: on collaborative scheduling 2021-08-09 02:37:11 -04:00
Jonathan Kelley
fac42339c2 feat: mutations 2021-08-08 15:15:16 -04:00
Jonathan Kelley
f2334c17be wip: bottom up dropping 2021-08-05 22:23:41 -04:00
Jonathan Kelley
687cda1b6d feat: re-enable suspense 2021-07-30 22:14:06 -04:00
Jonathan Kelley
cfa0247cbb wip: websys dom working properly 2021-07-30 17:04:04 -04:00
Jonathan Kelley
d717c22d9c feat: keyed diffing!! 2021-07-30 16:07:42 -04:00
Jonathan Kelley
0a0be95c3e wip: get keyed diffing compiling 2021-07-30 10:35:47 -04:00
Jonathan Kelley
1749eba8eb feat: more and more sophisticated diff 2021-07-29 18:56:09 -04:00
Jonathan Kelley
d618092e9d feat: a new vnode type for anchors 2021-07-29 18:04:09 -04:00
Jonathan Kelley
63a85e4865 wip: more work on bumpframe 2021-07-29 00:04:59 -04:00
Jonathan Kelley
49856ccd68 wip: making progress on diffing and hydration 2021-07-28 21:46:53 -04:00
Jonathan Kelley
e5c88fe3a4 feat: make hooks free-functions 2021-07-27 11:28:05 -04:00
Jonathan Kelley
f782e14211 feat: omg what a dumb mistake 2021-07-27 00:27:07 -04:00
Jonathan Kelley
4a0068f099 feat: bless up, no more segfaults 2021-07-26 12:14:48 -04:00
Jonathan Kelley
7dfe89c958 feat: wire up event delegator for webview 2021-07-24 02:52:05 -04:00
Jonathan Kelley
0a907b35c6 feat: fix some lifetime issues 2021-07-24 00:40:34 -04:00
Jonathan Kelley
dfaf5adee1 Feat: solve some issues regarding listeners 2021-07-24 00:29:23 -04:00
Jonathan Kelley
6084fbcd11 wip: move to slab 2021-07-23 17:03:51 -04:00
Jonathan Kelley
f644d7c441 wip: move things into a "shared" object 2021-07-23 10:27:43 -04:00
Jonathan Kelley
22f894e6b9 wip: more upgades to html parser 2021-07-22 02:06:49 -04:00
Jonathan Kelley
160d86abbe wip: serious refactor with const generics 2021-07-21 22:55:04 -04:00
Jonathan Kelley
1745a44d94 wip: cleanup 2021-07-21 17:05:48 -04:00
Jonathan Kelley
6051b0ec86 wip: fill out the snippets 2021-07-20 19:03:49 -04:00
Jonathan Kelley
4a72b3140b feat: amazingly awesome error handling 2021-07-18 12:39:32 -04:00
Jonathan Kelley
05c909f320 wip: some ideas 2021-07-18 03:54:42 -04:00
Jonathan Kelley
583fdfa561 docs: big updates to the reference 2021-07-16 16:11:25 -04:00
Jonathan Kelley
caf772cf24 wip: docs, html! macro, more 2021-07-16 00:27:06 -04:00
Jonathan Kelley
8f0bb5dc5b chore: cleanup workspace 2021-07-15 18:40:12 -04:00
Jonathan Kelley
3bedcb93ca feat: svgs working in webview 2021-07-15 12:18:11 -04:00
Jonathan Kelley
f14d4ef7c2 wip: fix styling for ssr 2021-07-15 11:06:52 -04:00
Jonathan Kelley
6aaad1c9ef wip: heuristics engine 2021-07-15 04:17:45 -04:00
Jonathan Kelley
00231adfa2 feat: code quality improvements for core 2021-07-15 04:09:28 -04:00
Jonathan Kelley
37ed4bed8c wip: more work on suspense and documentation 2021-07-15 03:38:09 -04:00
Jonathan Kelley
4837d8e741 feat: suspense! 2021-07-15 00:40:37 -04:00
Jonathan Kelley
de9f61bcf4 feat: more suspended nodes! 2021-07-14 23:18:02 -04:00
Jonathan Kelley
c52af221f7 wip: basic support for scheduled rendering 2021-07-14 18:19:51 -04:00
Jonathan Kelley
80e6c25698 feat: move over to push based mechanism 2021-07-14 17:39:26 -04:00
Jonathan Kelley
e7238762ae feat: architecture document and edit list 2021-07-14 17:04:58 -04:00
Jonathan Kelley
abf47596bc feat: it loads the doggos 2021-07-14 02:30:41 -04:00
Jonathan Kelley
3a57b94262 feat: task system works 
but I broke the other things :(
 2021-07-14 02:04:19 -04:00
Jonathan Kelley
84c3e9fcb1 wip: cargo fix 2021-07-13 16:54:07 -04:00
Jonathan Kelley
beceda511c wip: cargo fix 2021-07-13 16:52:25 -04:00
Jonathan Kelley
fd03b9d252 wip: cargo fix 2021-07-13 16:49:22 -04:00
Jonathan Kelley
c7ca7c2273 wip: cargo fix 2021-07-13 16:48:47 -04:00
Jonathan Kelley
775e9e29b8 wip: cut down on errors 2021-07-13 16:48:11 -04:00
Jonathan Kelley
996247a164 wip 2021-07-13 15:34:12 -04:00
Jonathan Kelley
4091846934 feat: add aria 2021-07-13 00:56:39 -04:00
Jonathan Kelley
c79d9ae674 feat: buff up html allowed attributes 2021-07-12 23:44:20 -04:00
Jonathan Kelley
a05047d01e wip: use the new structure 2021-07-12 18:19:27 -04:00
Jonathan Kelley
a85b8c4b6b wip: apply formatting 2021-07-12 13:03:24 -04:00
Jonathan Kelley
fb0c6d2ea4 chore: remove unnecessary import 2021-07-12 11:03:35 -04:00
Jonathan Kelley
63bbc38f3f wip: edit some css 2021-07-12 09:40:13 -04:00
Jonathan Kelley
68ed1c04e7 wip: ....sigh..... so the diffing algorithm is robust 
but it's still not finished.

We need to re-enable the fancier keyed diffing versions some point (soon!).
 2021-07-12 03:58:46 -04:00
Jonathan Kelley
ff0a3d1c83 wip: lots of changes to diffing 2021-07-12 02:23:46 -04:00
Jonathan Kelley
56e7eb83a9 wip: more examples 2021-07-11 19:31:07 -04:00
Jonathan Kelley
304259d818 wip: move examples around 2021-07-11 18:39:45 -04:00
Jonathan Kelley
269e81b0fd example: ssr + tide 2021-07-11 17:24:47 -04:00
Jonathan Kelley
bbcb5a0234 feat: enable components in ssr 2021-07-11 15:17:55 -04:00
Jonathan Kelley
9abb0470b7 feat: static node infrastructure and ssr changes 2021-07-11 14:49:52 -04:00
Jonathan Kelley
975fa566f9 wip: more refactor for async 2021-07-09 12:47:41 -04:00
Jonathan Kelley
8cfc437bfe wip: some project refactor 2021-07-09 11:54:07 -04:00
Jonathan Kelley
feab50f24a wip: some work 2021-07-09 03:39:45 -04:00
Jonathan Kelley
58ab51a4e4 wip: more refactor 2021-07-09 01:42:26 -04:00
Jonathan Kelley
c811a8982c wip: more refactor 2021-07-09 01:37:34 -04:00
Jonathan Kelley
9276fd7db7 wip: refactor 2021-07-09 01:36:18 -04:00
Jonathan Kelley
1cc1679a6b feat: refactor out the hooks implementation 2021-07-09 01:26:15 -04:00
Jonathan Kelley
eb82051000 examples: webview and async 2021-07-08 23:25:27 -04:00
Jonathan Kelley
99d94b69ab feat: move webview to wry 2021-07-08 12:01:31 -04:00
Jonathan Kelley
2547da36a0 wip: more examples 2021-07-08 10:17:51 -04:00
Jonathan Kelley
e4cdb645aa feat: beaf up the use_state hook 2021-07-08 09:29:12 -04:00
Jonathan Kelley
7aec40d57e feat: enable arbitrary body in rsx! macro 2021-07-07 18:17:00 -04:00
Jonathan Kelley
fd7933561f chore: move CLI into its own "studio" app 2021-07-07 16:58:23 -04:00
Jonathan Kelley
98a09339fd wip: move some examples around 2021-07-07 16:19:10 -04:00
Jonathan Kelley
cca7c5fc3a wip: remove the scoped trait 2021-07-07 15:07:46 -04:00
Jonathan Kelley
36542b482f wip: move the functions around a bit 2021-07-07 14:37:31 -04:00
Jonathan Kelley
a38a81e129 wip: fix issues with lifetimes 
this commit fixes some lifetime issues regarding having to "move" data into the IntoVNode closure.
 2021-07-07 13:51:55 -04:00
Jonathan Kelley
22e659c2bd feat: namespaced attributes 
this commit adds namespaced attributes. This lets us support attribute groups, and thus, inline styles.

This namespaced attribute stuff is only available for styles at the moment, though it theoretically could be enabled for any other attributes.
 2021-07-06 23:04:33 -04:00
Jonathan Kelley
11f89e5d33 wip: more examples 2021-07-06 12:13:00 -04:00
Jonathan Kelley
904b26f711 feat: add edits back! and more webview support! 
This commit adds a new type - the DomEdit - for serializing the changes made by the diffing machine. The architecture of how DomEdits fit into the cooperative scheduling is still TBD but it will allow us to build change lists without applying them immediately. This is more performant  and allows us to only render parts of the page at a time.

This commit also adds more infrastructure around webview. Dioxus can now run on the web, generate static pages, run in the desktop, and run on mobile, with a large part of thanks to webview.
 2021-07-05 18:37:15 -04:00
Jonathan Kelley
e8f29a8f8a wip: enable more diffing 2021-07-05 01:11:49 -04:00
Jonathan Kelley
b5e5ef171a feat: two calculator examples 2021-07-02 15:48:19 -04:00
Jonathan Kelley
d9e6d0925b docs: examples 2021-07-02 01:30:52 -04:00
Jonathan Kelley
eb39b000d7 wip: example 2021-07-01 16:03:27 -04:00
Jonathan Kelley
952a91d540 wip 2021-07-01 14:14:59 -04:00
Jonathan Kelley
93900aac44 concept: integrate signals 2021-06-30 14:08:12 -04:00
Jonathan Kelley
7665f2c6cf feat: move to slotmap 2021-06-29 22:44:21 -04:00
Jonathan Kelley
21685fbb16 wip: more work on diffing 2021-06-28 22:22:11 -04:00
Jonathan Kelley
f4fb5bb454 feat: integrate serialization and string borrowing 
This commit adds lifetimes to the diff and realdom methods so consumers may borrow the contents of the DOM for serialization or asynchronous modifications.
 2021-06-28 12:05:17 -04:00
Jonathan Kelley
9813f23cdf wip: more work on diffing machine 2021-06-26 22:13:57 -04:00
Jonathan Kelley
ca3b80f069 wip: more work on diffing. 
This commit is working on the diffing algorithm. We're *mostly* there but need to get fragments wired in and then keyed elements need to be re-implemented. For Dioxus core, this is the last major technical hurdle barring "fibers" (suspense) and attribute groups (inline styles).
 2021-06-26 03:15:20 -04:00
Jonathan Kelley
895cc0142b wip: stack-based "real child iterator" 2021-06-26 03:06:29 -04:00
Jonathan Kelley
0826fdfee1 docs: more docs 2021-06-26 02:05:20 -04:00
Jonathan Kelley
ea91fc984d perf: refcell to cell for hookidx 2021-06-26 01:29:51 -04:00
Jonathan Kelley
81382e7044 chore: rename ctx to cx 2021-06-25 21:15:33 -04:00
Jonathan Kelley
daa9bd82c3 docs: more work on docs 2021-06-25 09:31:13 -04:00
Jonathan Kelley
7fbaf69cab Docs: more examples and docs 2021-06-24 11:09:38 -04:00
Jonathan Kelley
f5683a2346 wip: docs 
Worked a bit on adding more examples. Trying out a new "antipattern" example to show how *not* to use Dioxus.
 2021-06-23 22:32:54 -04:00
Jonathan Kelley
9d7ee79826 feat: events work again! 2021-06-23 01:44:48 -04:00
Jonathan Kelley
73047fe956 feat: props memoization is more powerful 
This commit solves the memoization , properly memoizing properties that don't have any generic parameters. This is a rough heuristic to prevent non-static lifetimes from creeping into props and breaking our minual lifetime management.

Props that have a generic parameter are opted-out of the `partialeq` requirement and props *without* lifetimes must implement partialeq. We're going to leave manual disabling of memoization for future work.
 2021-06-22 17:20:54 -04:00
Jonathan Kelley
7102fe5f98 docs: add some more sources in the core implementation 2021-06-21 01:35:12 -04:00
Jonathan Kelley
cff0547f1a wip: get diff compiling 
Currently working through the normalization process. Occasionally, we want to iterate through all the nodes that we know have a real image in the dom. However, fragments and components don't directly have a mirror in the dom. This commit is exploring the concept of a custom iterator that explores every node in an array of nodes, returning only valid nodes which may be mounted to the dom. A big issue we're working through is heavily nested rootless nodes - something not terribly common but important nonetheless.

Inferno, React, and Preact all perform a mutative-form of normalization which alter the children list before comparing to the previous. Mostly, we're concerned about fragments in lists and heavily nested components that do not render real elements.
 2021-06-21 00:52:37 -04:00
Jonathan Kelley
79127ea6cd wip: moving to IDs 2021-06-20 02:16:42 -04:00
Jonathan Kelley
45ee803609 wip: moving to imperative method of dom 2021-06-20 01:52:32 -04:00
Jonathan Kelley
62ae5d3bb9 wip: rethinking stack machine 2021-06-19 20:31:25 -04:00
Jonathan Kelley
70cd46dbb2 docs: move around examples 2021-06-17 18:00:32 -04:00
Jonathan Kelley
b9ff95fa12 wip: start moving events to rc<event> 2021-06-16 23:37:55 -04:00
Jonathan Kelley
9222d8ece3 docs: more docs on recoil 2021-06-16 13:47:41 -04:00
Jonathan Kelley
318cac9767 Feat: tweak docs for atoms 2021-06-16 13:42:12 -04:00
Jonathan Kelley
3bc02ee7c4 Feat: more docs 2021-06-16 11:25:47 -04:00
Jonathan Kelley
36ea39ae30 Feat: rename recoil to atoms 2021-06-16 11:19:37 -04:00
Jonathan Kelley
47e896038e wip: more work on updating syntad 2021-06-15 10:02:46 -04:00
Jonathan Kelley
517d7f1495 Chore: some cleanup and documentation 2021-06-10 01:01:53 -04:00
Jonathan Kelley
fe6938ceb3 wip: pre vnodes instead of vnode 2021-06-08 14:00:29 -04:00
Jonathan Kelley
e3d9db0847 wip: successfully building 2021-06-07 14:14:49 -04:00
Jonathan Kelley
7790750349 wip: merge in some code from the other branch 2021-06-05 23:47:54 -04:00