Commit graph

1988 commits

Author SHA1 Message Date
Mouse Reeve 657dff7e95 Merge branch 'main' into production 2021-01-30 11:53:00 -08:00
Mouse Reeve 38e7eb8c14
Merge pull request #571 from mouse-reeve/tempalte-bug
Fixes incorrect template path in threaded status page
2021-01-30 11:50:47 -08:00
Mouse Reeve cd65ac7290 Fixes incorrect tempalte path in threaded status page 2021-01-30 11:46:15 -08:00
Mouse Reeve 9b7c10ce6c
Merge pull request #570 from mouse-reeve/progress-display
Fixes incorrect display of reading progress
2021-01-30 09:26:42 -08:00
Mouse Reeve bfdfb846da Merge branch 'main' into production 2021-01-30 09:20:19 -08:00
Mouse Reeve 8add05d7fd Fixes incorrect display of reading progress 2021-01-29 18:06:17 -08:00
Mouse Reeve 314eddf6d4
Merge pull request #569 from mouse-reeve/admin-settings
Admin settings
2021-01-29 17:19:45 -08:00
Mouse Reeve 9d3f48a1a9 Settings views tests 2021-01-29 17:06:10 -08:00
Mouse Reeve d1ee26e282 list of federated servers for admin panel 2021-01-29 16:02:59 -08:00
Mouse Reeve 9db327a69e Edit view for site settings 2021-01-29 15:50:46 -08:00
Mouse Reeve 21aadf2920 Adds site settings view 2021-01-29 15:38:42 -08:00
Mouse Reeve 02c466e04a
Merge pull request #568 from mouse-reeve/send-dms
Compose window for dms
2021-01-29 14:23:06 -08:00
Mouse Reeve 93ef9e31ad Send message to a particular user 2021-01-29 11:44:04 -08:00
Mouse Reeve 94974d9f73
Merge pull request #567 from mouse-reeve/organize-templates
Organize templates
2021-01-29 11:14:47 -08:00
Mouse Reeve 779a5e0cbf Compose window for dms 2021-01-29 11:14:18 -08:00
Mouse Reeve 640db7e9e3 Fixes more tests for moved-around views 2021-01-29 10:47:47 -08:00
Mouse Reeve bae54b6847 Shuffles tests around for feed views 2021-01-29 10:33:44 -08:00
Mouse Reeve cc5fedb1d1 Fixes template paths in views 2021-01-29 10:29:21 -08:00
Mouse Reeve b53ef73faf Feed templates 2021-01-29 10:25:31 -08:00
Mouse Reeve 932acc961f Fixes template paths in tests 2021-01-29 09:41:32 -08:00
Mouse Reeve 60721fd41e Fixes user layout 2021-01-29 09:29:59 -08:00
Mouse Reeve 9fa8ee3940 Groups profile settings templates 2021-01-29 09:28:00 -08:00
Mouse Reeve 24af288c52 Refactors user pages 2021-01-29 09:05:53 -08:00
Mouse Reeve 6ccf7841e1 Moves components out of snippets 2021-01-29 08:51:36 -08:00
Mouse Reeve 65db2e63ac
Merge pull request #566 from mouse-reeve/blockquote
Allows blockquote markdown
2021-01-29 08:18:05 -08:00
Mouse Reeve e6a0e5f96c
Merge pull request #554 from bibliotechy/430-add-rss-support
First attempt at adding rss support
2021-01-29 08:09:32 -08:00
Mouse Reeve 68d00d590c Allows blockquote markdown 2021-01-29 08:00:19 -08:00
Chad Nelson 4274bf0508 Patch site settings so this can pass 2021-01-27 22:13:35 -05:00
Chad Nelson 9c2813545c Closer to some passing tests 2021-01-27 21:23:20 -05:00
Mouse Reeve 5e885e7bda
Merge pull request #561 from mouse-reeve/views-tests
Views tests
2021-01-27 11:10:34 -08:00
Mouse Reeve 7d1c5fb0f2 Patches broadcast call in reading test 2021-01-27 11:01:36 -08:00
Mouse Reeve c2d0c4b022 Adds missing init file for views tests
this is important!!
2021-01-27 09:31:11 -08:00
Mouse Reeve b52aa5bee9 Fixes status tests 2021-01-27 09:31:01 -08:00
Mouse Reeve 1a54ed875b easier way to get user statuses queryset 2021-01-27 09:30:03 -08:00
Mouse Reeve 5377a8f187 Fixes reading view 2021-01-27 09:29:34 -08:00
Mouse Reeve e2935b6364 Fixes shelve tests 2021-01-27 09:27:29 -08:00
Mouse Reeve 00c8fab365 Merge branch 'main' into production 2021-01-27 07:38:58 -08:00
Mouse Reeve 662cbf2da9
Merge pull request #555 from mouse-reeve/blocking
Blocking
2021-01-26 14:43:01 -08:00
Mouse Reeve 36486ca731 block/unblock view tests 2021-01-26 13:02:14 -08:00
Mouse Reeve 369b24f9ec null state for block page 2021-01-26 13:02:04 -08:00
Mouse Reeve 22e4138555 unblock 2021-01-26 13:00:36 -08:00
Mouse Reeve acfc865d4e Adds blocked users view
also refactors the setting view
2021-01-26 10:01:50 -08:00
Mouse Reeve 3f011445e2 Hide user pages to blocked users 2021-01-26 08:31:55 -08:00
Mouse Reeve 12b95c6cd4
Merge pull request #558 from mouse-reeve/image-crop
Moves avatar crop into function and adds test
2021-01-26 08:24:52 -08:00
Mouse Reeve 681f5482fd Don't allow blocked users to access user page 2021-01-26 08:07:38 -08:00
Mouse Reeve 2a6a000e05 Moves avatar crop into function and adds test 2021-01-26 08:03:16 -08:00
Mouse Reeve ac2ab2981f ui path to iniate blocks 2021-01-25 14:03:18 -08:00
Mouse Reeve d994d8d3c8 Moves blocking side effects to model 2021-01-24 17:07:19 -08:00
Mouse Reeve 3a303448bc
Merge pull request #557 from cincodenada/fix-email-migration
Fix migration for if db has multiple empty emails
2021-01-24 16:49:03 -08:00
Joel Bradshaw ed83032330 Fix migration for if db has multiple empty emails
If the database has multiple users with an empty email column, this
migration will fail because multiple empty strings break the unique
constraint.

A fresh database won't have this problem because it won't have any
legacy users with empty strings instead of NULL, but for existing
databases we need to convert the empty strings to NULL so they don't run
awry of the unique constraint.
2021-01-24 16:39:26 -08:00