Dessalines
aeec25838a
Cleaning up nodeinfo.
2020-01-12 12:52:19 -05:00
Dessalines
dff8b947bb
Trying to add r2d2 connection pooling to websockets.
2020-01-12 10:31:51 -05:00
Dessalines
677d716ae6
Version v0.5.18
2020-01-11 19:43:30 -05:00
Dessalines
c2b236f5a0
Merge branch 'db_indexes' into dev
2020-01-11 19:19:46 -05:00
Dessalines
253f4aa6a1
Back to just indexes.
2020-01-11 17:30:44 -05:00
Felix
4361f48b98
Make various functions async
2020-01-11 13:50:07 +01:00
Dessalines
5f31900375
Trying some DB indexes.
2020-01-10 23:09:38 -05:00
Felix
d8c84e2541
Upgrade actix to 2.0 ( fixes #392 )
2020-01-10 23:41:08 +01:00
Dessalines
f67436792a
Version v0.5.17
2020-01-06 11:29:25 -05:00
Dessalines
8c4e973409
Merge branch 'master' into dev
2020-01-04 17:22:59 -05:00
Dessalines
206d9160de
Adding cargo checking to husky pre-commit. Fixes #402
2020-01-04 17:21:33 -05:00
Dessalines
a68fd4f2aa
Updating cargo deps.
2020-01-03 23:41:44 -05:00
Dessalines
13cd2e82de
Adding cargo outdated to clean script.
2020-01-03 23:39:31 -05:00
Dessalines
345cfcaedd
Adding a clean script for cargo. (No husky hook yet)
2020-01-03 22:58:43 -05:00
Dessalines
29e6e47ef6
Version v0.5.16
2020-01-03 14:19:36 -05:00
Dessalines
c252785632
Don't send email notification for self replies.
...
- Fixes #401
2020-01-03 13:12:19 -05:00
Dessalines
aa59906e91
Version v0.5.15
2020-01-02 17:45:03 -05:00
Dessalines
5b42dc3393
Adding show_avatar user setting, and option to send notifications to inbox.
...
- Fixes #254
- Fixes #394
2020-01-02 16:55:54 -05:00
Felix Ableitner
e09a035373
Merge branch 'master' into federation
2020-01-02 19:22:23 +01:00
Dessalines
576980bf64
Version v0.5.14
2020-01-02 10:47:18 -05:00
Dessalines
dc331d5293
Fixing deploy and version for clippy.
2020-01-02 10:34:40 -05:00
Dessalines
f0db3084d8
Merge branch 'master' into lint
2020-01-02 10:03:38 -05:00
Felix Ableitner
d08e09fbdc
Apply changes suggested by cargo clippy ( fixes #395 )
2020-01-02 12:30:00 +01:00
Dessalines
730e2b7f09
Version v0.5.13
2020-01-01 22:12:24 -05:00
Dessalines
081d8ddd12
Version v0.5.12
2020-01-01 17:57:39 -05:00
Dessalines
0f8965fac9
Adding some fixes to new docs system.
2020-01-01 17:47:00 -05:00
Dessalines
f5a13717ea
Adding change password and email address from user settings.
...
- Fixes #384
- Fixes #385
2020-01-01 15:46:14 -05:00
Dessalines
6058e837fc
Version v0.5.11
2020-01-01 11:32:58 -05:00
Dessalines
a74d92af3d
Version v0.5.10
2020-01-01 11:28:18 -05:00
Dessalines
cd9df4455e
Adding open_registration to nodeinfo.
2019-12-31 10:44:30 -05:00
Felix Ableitner
80f76f2efd
Use actix config to handle routes in seperate folders ( #378 )
2019-12-31 14:17:24 +01:00
Felix Ableitner
581f36d6ef
Implementing very basic federation including test setup
2019-12-30 13:31:54 +01:00
Dessalines
47d55d9d2b
Version v0.5.9
2019-12-29 20:30:23 -05:00
Dessalines
4ad836d690
Adding case insensitivity to slur filter.
...
- Fixes #388
2019-12-29 20:29:07 -05:00
Dessalines
020a7cd8cf
Version v0.5.0.8
2019-12-29 17:03:36 -05:00
Dessalines
dfd27ea85c
Version v0.5.0.7
2019-12-29 16:06:36 -05:00
Dessalines
a4428528e3
Adding user avatars / icons. Requires pictshare.
...
- Fixes #188
2019-12-29 15:39:48 -05:00
Dessalines
106aaf4f28
Version v0.5.0.6
2019-12-28 21:10:16 -05:00
Dessalines
ecf792af3b
Version v0.5.0.5
2019-12-28 21:01:05 -05:00
Dessalines
d57b2d4865
Fixing non-existent user profile viewing.
...
- Fixes #381
2019-12-28 20:58:01 -05:00
Dessalines
bb3dbe041d
Version v0.5.0.4
2019-12-28 19:08:06 -05:00
Dessalines
786be3fa66
Config fixes.
...
- Adding front_end_dir to settings.
- Adding unit test for PasswordResetRequest encryption.
- Readme points to lemmy.hjson
- Fixing docker prod, dev, and ansible builds.
- Removing redundant env files, as all config is now in a single file.
- Some formatting fixes.
2019-12-28 16:11:03 -05:00
Felix Ableitner
a3065ed39f
Fix overriding config vars with underscore from environment
2019-12-28 12:11:06 +01:00
Felix Ableitner
b7c24a372b
Fix review comments
2019-12-27 17:30:46 +01:00
Felix Ableitner
4e952af00c
Replace rust-crypto with sha2 crate ( fixes #372 )
2019-12-27 17:30:46 +01:00
Felix Ableitner
cdbf260803
Added option to enable/disable federation
2019-12-27 17:30:45 +01:00
Felix Ableitner
3d9f7d28d6
Implement webfinger ( fixes #149 )
2019-12-27 17:29:50 +01:00
Felix Ableitner
1f7546789a
update documentation, docker and ansible files
2019-12-27 17:28:46 +01:00
Felix Ableitner
ddc913ba7c
Added documentation comments in default config
2019-12-27 17:28:45 +01:00
Felix Ableitner
8589b6c0bd
Implement SQL connection pool
2019-12-27 17:28:45 +01:00
Felix Ableitner
cf3ae15ee9
Implement config ( fixes #351 )
2019-12-27 17:28:44 +01:00
Lyra
34def84d43
Add correct ActivityPub types conversion for Community and Post.
2019-12-27 17:25:20 +01:00
Dessalines
104ac9b950
Version v0.5.0.3
2019-12-15 11:30:14 -08:00
Dessalines
2346f30e0e
Version v0.5.0.2
2019-12-14 16:19:32 -08:00
Dessalines
cffbb7cd58
Version v0.5.0.1
2019-12-12 09:57:18 -08:00
Dessalines
665dca80d0
Moving front end routes from nginx to actix
...
- Fixes #363
2019-12-11 21:28:33 -08:00
Dessalines
fca8e6a0a9
Adding some site oriented settings.
...
- Adding option to close registration. Fixes #350
- Adding option to disable showing NSFW buttons. Fixes #364
- Adding option to disable downvotes. Fixes #239
2019-12-11 12:21:47 -08:00
Lyra
c19ace7e6a
Introduce the "MaybeOptional" trait.
...
This trait is a generic type that allows us to get an Option from any type and from another option. It can be used to remove the ugly "do_something", "do_something_optional" that we previously had.
2019-12-11 00:10:39 +01:00
Dessalines
b7d05c18a1
Version v0.5.0
2019-12-09 11:13:15 -08:00
Dessalines
faef62e073
Switching to shorthands for rust params.
2019-12-09 11:08:19 -08:00
Dessalines
f0808a1116
Adding custom language setting.
...
- Fixes #319
2019-12-09 00:24:53 -08:00
Dessalines
4c7da003a2
Merge branch 'dev'
2019-12-08 13:06:55 -08:00
Dessalines
a128258fe0
Fixing unit test.
2019-12-08 12:56:10 -08:00
Dessalines
d18f2c9eb1
Use builder pattern for views
...
- Fixes #360
2019-12-08 12:39:54 -08:00
Dessalines
7880e5272a
Version v0.4.0.10
2019-12-07 18:33:28 -08:00
Dessalines
9185a31945
Removing feeds orig.
2019-12-07 18:03:21 -08:00
Dessalines
3158c9d710
Running cargo fmt
2019-12-07 18:02:23 -08:00
Dessalines
a51b7d95b2
show_nsfw is now default for postquery.
2019-12-07 18:01:54 -08:00
Dessalines
2325690cb6
Merge branch 'teromene-config_dif_addr' into config_dif_addr_merge
2019-12-07 17:57:30 -08:00
Dessalines
a29af98e4b
Adding RSS feeds for inbox and subscribed. Refactored RSS code.
...
- Fixes #349
2019-12-07 16:39:43 -08:00
Lyra
9fc8aacc2d
Add default options for all parameters and move them out of the constructor. Rename structure to PostQueryBuilder
2019-12-07 23:54:42 +01:00
Lyra
3123d308d0
Resolved conflict with master
2019-12-07 13:10:10 +01:00
Lyra
bff3183a27
Use a dedicated structure in order to search posts
2019-12-07 13:03:03 +01:00
Dessalines
43d32d516b
Show removed posts in users history.
...
- Fixes #354
2019-12-06 22:43:20 -08:00
Lyra
0ceed8fd9b
Import the Settings struct instead of prefixing the namespace
2019-12-06 23:47:30 +01:00
Lyra
279a901e4a
Add configuration variables in order to allow binding lemmy to a different adress/port
2019-12-06 20:36:56 +01:00
Dessalines
9363be0f19
Version v0.4.0.9
2019-12-05 18:49:55 -08:00
Dessalines
143f191887
Version v0.4.0.8
2019-12-02 13:11:22 -08:00
Dessalines
52ea7a32db
Some RSS work.
...
- Display rss buttons on front end for user, /c/all, and community
pages. Fixes #348 .
- Some clean up and additions to RSS feeds.
2019-12-01 17:23:52 -08:00
Felix Ableitner
8e5c02f967
Add feed for all
2019-12-01 20:01:38 +01:00
Felix Ableitner
cfbe8ac926
fix sort parameter handling, handle errors
2019-12-01 19:09:10 +01:00
Felix Ableitner
f47bdbc37a
wip
2019-11-23 23:25:59 +01:00
Felix Ableitner
4b036bbeba
other sort options, sort by hot by default, adjust rss fields
2019-11-23 23:24:50 +01:00
Felix Ableitner
942f6a05af
basic, working rss feeds
2019-11-23 23:24:50 +01:00
Felix Ableitner
de313fc977
Implement RSS feeds ( fixes #118 )
2019-11-23 23:24:10 +01:00
Dessalines
bf601b0458
Fixing issue with missing community.
...
- Fixes #339
2019-11-22 16:18:10 -08:00
Dessalines
b29f578e31
Fixing deploy script.
2019-11-22 16:17:20 -08:00
Dessalines
c237b06f90
Version v0.4.0.7
2019-11-22 12:30:00 -08:00
Dessalines
c6b854bfa1
Version v0.4.0.7
2019-11-21 20:12:10 -08:00
Dessalines
9b01520462
Version v0.4.0.7
2019-11-21 18:36:26 -08:00
Dessalines
eebe5913aa
Version v0.4.0.6
2019-11-21 17:46:08 -08:00
Dessalines
002e8b9db9
Version v0.4.0.5
2019-11-21 17:43:39 -08:00
Dessalines
9b75cfe519
Version v0.4.0.5
2019-11-21 15:48:37 -08:00
Dessalines
9df278319d
Version v0.4.0.4
2019-11-21 11:34:48 -08:00
Dessalines
dcad96170e
Running cargo fmt
2019-11-21 11:27:52 -08:00
Felix Ableitner
39565fecfb
use camelcase for json keys
2019-11-21 15:51:57 +01:00
Felix Ableitner
9ac1beae82
rebase
2019-11-16 01:32:45 +01:00
Felix Ableitner
7b5884b664
change version numbering command
2019-11-16 01:32:21 +01:00
Felix Ableitner
20966e085a
preserve json order
2019-11-16 01:31:41 +01:00
Felix Ableitner
2666ba6adf
rewrite
2019-11-16 01:31:41 +01:00
Felix Ableitner
10976bd656
nicer string handling
2019-11-16 01:31:41 +01:00
Felix Ableitner
4f116dc758
got it working
2019-11-16 01:31:41 +01:00
Felix Ableitner
fcf3252292
Implement nodeinfo support ( fixes #144 )
2019-11-16 01:31:41 +01:00
Dessalines
3021d19e1f
Fixing ansible build, and email link.
2019-11-02 13:07:19 -07:00
Dessalines
3350599901
Running cargo fmt.
2019-11-01 23:43:21 -07:00
Dessalines
68e4b61808
Password reset mostly working.
2019-11-01 23:41:57 -07:00
Dessalines
9f35b33dc7
Halfway done with email, not fully working yet.
2019-10-29 20:35:39 -07:00
Dessalines
90ce1f1a3f
Adding default sort / filter into user settings.
...
- Fixes #295
2019-10-20 21:21:54 -07:00
Dessalines
02dd9ac32a
Adding username mentions / tagging from comments.
...
- Fixes #293
2019-10-19 17:46:29 -07:00
Dessalines
f7c9dc0b21
Make delete account require password.
...
- Fixes #301
2019-10-17 21:25:23 -07:00
Dessalines
536313889d
Running cargo fmt.
2019-10-15 15:10:42 -07:00
Dessalines
903d73d665
Adding permanently delete account comments and posts.
...
- Fixes #285
- Fixes #58
2019-10-15 15:09:01 -07:00
Dessalines
c0821fcaa5
Adding 8 different themes.
...
- Fixes #276
2019-10-15 12:21:27 -07:00
Dessalines
663a601e11
Adding admin abilities on user pages.
...
- Fixes #280
2019-10-13 17:36:35 -07:00
Dessalines
35dfe31a39
Externalizing rate limits. Upgrading to Rust 1.38
...
- Fixes #290
2019-10-13 12:06:18 -07:00
Dessalines
a0bc840c7a
Adding to slur filter.
2019-09-19 15:49:20 -07:00
Dessalines
53773e650f
Adding to slur filter.
2019-09-18 12:00:41 -07:00
Dessalines
e24f4a2d33
Adding an online user count to main page.
...
- Fixes #274
2019-09-13 09:09:01 -07:00
Dessalines
b52e27a953
Fix rate limit on signup fail.
...
- Fixes #273
2019-09-10 18:26:33 -07:00
Dessalines
3f6b2be2cc
Adding stickied posts.
...
- Fixes #245
2019-09-08 23:14:13 -07:00
Dessalines
3eda1244e6
Upping post timeout.
2019-09-08 10:15:30 -07:00
Dessalines
44442565aa
Running cargo fmt on server code.
...
- Adding a .rustfmt.toml for the 2 space indent.
2019-09-07 08:35:05 -07:00
Dessalines
565fc0abdb
Adding ability to do mod action on post creator
...
- Fixes #248
- Show banned on user comment and user overview. Fixes #264
2019-09-05 17:18:48 -07:00
Dessalines
8c961dfd80
Adding a separate Post limit timeout.
...
- Fixes #262
2019-09-03 13:18:07 -07:00
Dessalines
ed5043cd84
Fixing crash on unknown op type.
...
- Fixes #251
2019-08-30 13:33:20 -07:00
Dessalines
8d1db3c395
Allow admins to add mods and transfer communities
...
- Fixes #238
2019-08-29 15:18:50 -07:00
Dessalines
b50ae1dafc
Showing community count on main sidebar
...
- Fixes #232
2019-08-28 21:28:06 -07:00
Dessalines
3561ef93a0
Adding Community and Site transfer
...
- Fixes #139
2019-08-23 19:40:41 -07:00
Dessalines
b7e73a5559
View where a URL has been cross-posted to in the past
...
- This shows when creating a post, or when viewing a post.
- Fixes #131
2019-08-21 22:17:15 -07:00
Dessalines
7c3ac0c85d
Fix bug when changing main community name.
2019-08-17 14:39:20 -07:00
Dessalines
d6046982e0
Fixing nsfw unit tests
2019-08-13 20:15:52 -07:00
Dessalines
d7ab85ab70
Squashed commit of the following:
...
commit ecd6c5a2f4
Author: Dessalines <happydooby@gmail.com>
Date: Tue Aug 13 19:49:38 2019 -0700
Adding some docs
commit 3babd09aff
Author: Dessalines <happydooby@gmail.com>
Date: Tue Aug 13 19:28:46 2019 -0700
Adding save user settings
commit 6e8da9cc9e
Merge: 3246d5d
c148eef
Author: Dessalines <happydooby@gmail.com>
Date: Tue Aug 13 17:26:25 2019 -0700
Merge branch 'dev' into nsfw
commit b3d4a5c4ce
Author: Dessalines <happydooby@gmail.com>
Date: Sun Aug 11 20:55:09 2019 -0700
nsfw mostly done, except for settings page.
2019-08-13 19:52:43 -07:00
Dessalines
d0d429a627
Adding support for community and user searching.
...
- Fixes #130
2019-08-10 10:32:06 -07:00
Dessalines
c494fe8e9b
Making a few internationalization fixes.
2019-08-09 17:15:27 -07:00
Dessalines
e702618e25
Adding back end translations.
2019-08-09 16:51:47 -07:00
Dessalines
5204b96d2f
Cargo lock updates.
2019-07-22 23:34:52 -07:00
Dessalines
9bf561b7c2
Formatting fixes.
2019-07-19 20:00:38 -07:00
jonnnh
eea27088d2
upgrade
2019-07-19 11:05:17 +08:00
jonnnh
28b69fb1fc
upgrade
2019-07-17 19:11:01 +08:00
Dessalines
c6dacb485c
Remove Kubernetes build, not supported.
2019-07-15 08:24:43 -07:00
Dessalines
026af39053
Formatting fixes.
2019-07-13 14:14:59 -07:00
Dessalines
6280c99862
Fixing trending
2019-07-03 18:58:24 -07:00
Dessalines
49b5667167
Fixing trending sorting.
2019-07-03 18:53:44 -07:00
Dessalines
8955633a3b
Ordering by date second.
...
- Fixes #175
2019-06-19 16:10:05 -07:00
Dessalines
f4fd06aa5b
Fixing GetSite
...
- Fixes #171
2019-06-11 18:41:01 -07:00
Dessalines
8348399f60
Using Rust 2018 now.
...
- Fixes #170
2019-06-03 10:47:12 -07:00
Dessalines
4ec2a00239
Revert "Adding Rust 2018 edition"
...
This reverts commit 2365c005f6
.
2019-06-03 10:15:24 -07:00
Dessalines
7a2014bb57
Adding Rust 2018 edition
2019-06-03 10:14:06 -07:00
Dessalines
525c570568
Creating the default community and signing people up for it if it doesnt exist.
2019-06-02 09:34:45 -07:00
Dessalines
6f98ac033c
Fix new user create, no more default community
2019-06-01 22:16:31 -07:00
Dessalines
8c85f0cb62
Removing the placeholder admin user.
...
- Fixes #165
2019-06-01 15:32:06 -07:00
Dessalines
b1490ef51a
Enforce -1 or 1 like scores
2019-05-15 09:46:39 -07:00
Dessalines
8820eac129
Removing need for spam_timer
2019-05-15 09:32:33 -07:00
Dessalines
5e1fcd318a
Adding API docs for app developers.
...
- Fixes #99 .
2019-05-15 09:04:05 -07:00
Dessalines
780817840f
A better login cooldown.
2019-05-07 12:59:36 -07:00
Dessalines
f8615b6178
Done with reorg
2019-05-05 09:20:30 -07:00
Dessalines
7fb6a0b138
Mostly done with reorg.
2019-05-04 22:20:38 -07:00
Dessalines
1a884a8353
Merge branch 'dev' into reorg
2019-05-04 09:02:57 -07:00
Dessalines
eaa96f178f
Merge branch 'master' into dev
2019-05-04 09:02:49 -07:00
Dessalines
779e5964fa
More reorg
2019-05-04 08:53:29 -07:00
Felix Pojtinger
45dd106c13
Merge branch 'master' into master
2019-05-04 14:23:37 +02:00
Dessalines
cbec13eecc
Reorganizing files before splitting out API
2019-05-02 18:34:21 -07:00
Dessalines
820af56387
Externalizing JWT token
2019-05-02 09:55:29 -07:00
Dessalines
2e487214ff
Reworking some UI. Adding proper trending communities with hot rank.
...
- Breaking out subscribed and all into radios. Fixes #142
2019-05-01 22:26:31 -07:00
Dessalines
40d5d7979e
Fixing ip
2019-05-01 16:00:26 -07:00
Dessalines
c69af0cc16
Adding a register, community, and forum rate limit, based on IP.
...
- Fixes #124
2019-05-01 15:44:39 -07:00
Dessalines
8e0cc3498e
Getting your votes on a user details page.
2019-04-29 14:19:00 -07:00
Dessalines
f57004d7fa
Adding proper deletes for Post, Community, and Comments.
...
- Fixes #132
- Fixes #108
2019-04-29 12:14:54 -07:00
Dessalines
85ed895c5f
Adding mark all as read
...
- Fixes #107
2019-04-29 09:51:13 -07:00
Felix Pojtinger
075df62be1
build: Minimize build time with multi-stage build, add Ingress and production versions
2019-04-27 15:49:50 +02:00
Felix Pojtinger
574393f485
build: Improve server compile time with cache
2019-04-27 10:51:08 +02:00
Felix Pojtinger
8fbef6a541
build: Fix hot reloading of UI, improve docs
2019-04-27 03:39:06 +02:00
Felix Pojtinger
c0ab071f78
build: Add basic sync features and better architecture
2019-04-27 02:56:33 +02:00
Dessalines
4625aa3060
Spam
2019-04-26 09:21:20 -07:00
Dessalines
be943f7b72
Fixing rust warning.
...
- Fixes #111
2019-04-26 07:34:04 -07:00
Dessalines
fba4d372fc
Spamtimer
2019-04-25 22:50:42 -07:00
Dessalines
9374aefa56
Temp
2019-04-25 20:14:52 -07:00
Dessalines
e4532aa1cb
Adding /f/ and /u/ in links now.
...
- Fixes #102
2019-04-25 14:52:18 -07:00
Dessalines
fdc5a23f2a
New signups now are subbed to main by default.
2019-04-25 11:34:58 -07:00
Dessalines
f914c4862c
Fixes for login screen, server
2019-04-25 08:51:23 -07:00
Dessalines
5683cd3987
Fix for marking a comment as read.
2019-04-25 08:33:25 -07:00
Dessalines
73c409fd0f
Bugfix - Only update the modified time on the comment if its not mark as read
2019-04-24 10:11:55 -07:00
Dessalines
7cba618587
Adding a search page
...
- Fixes # 70
2019-04-23 15:05:50 -07:00
Dessalines
bd3302317e
Comment actions from inbox and user pages working.
...
- Fixes #93
2019-04-22 11:32:50 -07:00
Dessalines
016920aeb7
Community moderation fixes.
...
- Don't show banned communities on main post list. Fixes #95
- Add back in community moderation and editing. Fixes #92
2019-04-21 13:52:55 -07:00
Dessalines
93957c781e
Fixing ranking algorithm.
2019-04-21 10:15:40 -07:00
Dessalines
811607f81a
Cleaning up error handling on server.rs
...
- Fixes #83
2019-04-21 00:26:26 -07:00
Dessalines
a05f53dae9
Adding negative score fix
...
- Fixes #84 .
- Fixing unit tests.
2019-04-20 16:47:23 -07:00
Dessalines
682413613e
Mostly working, before merge
2019-04-20 11:17:00 -07:00
Dessalines
e14e6e53cd
More moderation fixed
2019-04-20 00:24:59 -07:00
Dessalines
9afadfb9c4
Saving replies, the actual fixes will be in the merge to dev.
2019-04-19 21:06:25 -07:00
Dessalines
4ce0d2576c
Fixing some community sorting.
2019-04-18 08:28:24 -07:00
Dessalines
fdf547354f
Fixing community sort.
...
Fixes #71
2019-04-18 08:03:08 -07:00
Dessalines
6219e29b3c
Fixing issue with not getting back more than 10 communities
...
Fixes #72
2019-04-18 07:43:59 -07:00
Dessalines
c725b7a09b
Fixing a bug with follower view
2019-04-17 16:42:29 -07:00
Dessalines
04f64184f6
Adding modlog paging.
2019-04-17 12:40:41 -07:00
Dessalines
69bc53e33c
Adding post and user details paging.
...
- Fixes #52
- Fixes #34
2019-04-17 11:30:13 -07:00
Dessalines
f17b181ea9
Community modlog doesn't show non-community actions.
...
Fixes #65
2019-04-17 08:50:44 -07:00
Dessalines
3f33cf8dcb
Before big moderation merge
2019-04-16 16:04:23 -07:00
Dessalines
e94885eb97
Commiting before I lose everything. I'll do this properly in a merge
2019-04-15 16:12:06 -07:00