Commit graph

13365 commits

Author SHA1 Message Date
Alex Gleason
2498c34e82
Merge remote-tracking branch 'origin/develop' into fix-object-deletion-timeout 2021-07-12 16:20:58 -05:00
Alex Gleason
9a0cb34c8c
Fix Activity.delete_all_by_object_ap_id/1 timeout so users can be deleted 2021-07-12 16:20:15 -05:00
Alex Gleason
bde6670a06 Merge branch 'fix-list-timelines' into 'develop'
Add Link header to list timelines

See merge request soapbox-pub/soapbox!37
2021-07-02 15:31:17 +00:00
marcin mikołajczak
baf28515d7 Add Link header to list timelines
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2021-07-02 17:12:34 +02:00
Alex Gleason
c972c7a6be Merge branch 'remote-deletions' into 'develop'
Purge instead of delete a remote user. Purge immediately.

See merge request soapbox-pub/soapbox!36
2021-06-30 07:15:38 +00:00
Alex Gleason
a423cebcb4
Merge remote-tracking branch 'origin/develop' into remote-deletions 2021-06-30 02:03:05 -05:00
Alex Gleason
beb1c98ab5
Deletions: don't purge keys so Delete/Undo activities can be signed 2021-06-30 02:02:24 -05:00
Alex Gleason
43800d83f4
Deletions: allow deactivated users to be deleted 2021-06-30 01:32:28 -05:00
Alex Gleason
a7929c4d89
Deletions: preserve account status fields during purge, fix checks 2021-06-29 23:56:19 -05:00
Alex Gleason
01c2d2a296
Also purge the user in User.perform/2 2021-06-29 22:53:33 -05:00
Alex Gleason
c6d4133727
Deletions: purge the user immediately 2021-06-29 22:30:48 -05:00
Alex Gleason
be2da95c36
Correctly purge a remote user 2021-06-29 21:45:38 -05:00
Alex Gleason
a4a4d86563 Merge branch 'nsfw-api-mrf' into 'develop'
NSFW API MRF

See merge request soapbox-pub/soapbox!35
2021-06-17 21:08:53 +00:00
Alex Gleason
04ab689653
Merge remote-tracking branch 'origin/develop' into nsfw-api-mrf 2021-06-17 15:32:59 -05:00
Alex Gleason
a704d5499c
NsfwApiPolicy: Fall back more generously when functions don't match 2021-06-17 15:32:42 -05:00
Alex Gleason
c802c3055e
NsfwApiPolicy: add systemd example file 2021-06-17 15:04:40 -05:00
Alex Gleason
b293c14a1b
NsfwApiPolicy: add describe/0 and config_description/0 2021-06-17 14:52:07 -05:00
Alex Gleason
2b3dfbb42f
NsfwApiPolicy: add tests 2021-06-17 14:36:51 -05:00
Alex Gleason
f15d419062
NsfwApiPolicy: raise if can't fetch user 2021-06-16 22:35:09 -05:00
Alex Gleason
718e8e1edb
Create NsfwApiPolicy 2021-06-16 22:35:04 -05:00
Alex Gleason
307f03b97b Merge branch 'frontend-enable' into 'develop'
Refactor Pleroma.Frontend, enable a frontend through the CLI, fixes #16

Closes #16

See merge request soapbox-pub/soapbox!34
2021-06-16 16:21:05 +00:00
Alex Gleason
66bc582a29 Merge branch 'email-list' into 'develop'
Let users opt-in to email list

Closes #1

See merge request soapbox-pub/soapbox!33
2021-06-15 22:05:43 +00:00
Alex Gleason
a39ada9bbf
Merge remote-tracking branch 'origin/develop' into email-list 2021-06-15 13:21:40 -05:00
Alex Gleason
31a510d6a4
EmailList: ensure that deactivated, unapproved, and unconfirmed users aren't subscribers 2021-06-15 13:19:24 -05:00
Alex Gleason
8c62cc95e6
EmailList: add combined.csv view to display all candidates with subscription status 2021-06-15 12:27:34 -05:00
Alex Gleason
73ed23e2fd
EmailList: add Subscribed? column 2021-06-15 12:16:14 -05:00
Alex Gleason
385d432ce7
EmailList: export user nickname 2021-06-15 12:09:50 -05:00
Alex Gleason
53796b6344
Return email_list as a nodeinfo feature 2021-06-15 11:48:42 -05:00
Alex Gleason
723fd67b26
Merge remote-tracking branch 'origin/develop' into frontend-enable 2021-06-14 21:26:43 -05:00
Alex Gleason
6e7b220549
EmailList: add unsubscribers csv, fix query 2021-06-14 21:07:12 -05:00
Alex Gleason
1f3dd2115c
EmailList: fix tests 2021-06-14 20:29:49 -05:00
Alex Gleason
98502836f5
EmailList: ApiSpec typofix 2021-06-14 20:23:25 -05:00
Alex Gleason
2f40a92647
accepts_newsletter --> accepts_email_list 2021-06-14 20:20:08 -05:00
Alex Gleason
9ec3865725
MailingList --> EmailList 2021-06-14 20:18:57 -05:00
Alex Gleason
90df530dec
AdminAPI: get email list subscribers 2021-06-14 20:08:13 -05:00
Alex Gleason
784b8b5f83
Build CSV from subscriber list 2021-06-14 19:24:41 -05:00
Alex Gleason
6109532083
Return accepts_newsletter to account owner only 2021-06-14 19:24:41 -05:00
Alex Gleason
a0f2cba0d8
Add accepts_newsletter field to User, set during registration or account updates 2021-06-14 19:24:36 -05:00
Alex Gleason
811dcc1928
Fix FrontendController 2021-06-14 19:02:13 -05:00
Alex Gleason
d9a45175c0
Set soapbox-fe ref to develop 2021-06-14 17:56:19 -05:00
Alex Gleason
8527faecf5
Enable a frontend automatically with --primary arg 2021-06-14 17:55:21 -05:00
Alex Gleason
9a768429a3
Frontend: enable CLI task 2021-06-14 17:27:29 -05:00
Alex Gleason
a9106e4f13
Frontends: refactor with %Frontend{} struct 2021-06-14 15:00:00 -05:00
Alex Gleason
b327666f67 Merge branch 'cycles-phase-2' into 'develop'
Cycles phase 2

See merge request soapbox-pub/soapbox!32
2021-06-02 22:19:19 +00:00
Alex Gleason
1b73ff5ec0
Fix apparent Web.base_url() calls
For some reason these weren't changed in this branch
2021-06-02 16:57:14 -05:00
Alex Gleason
854b6ce816
Merge remote-tracking branch 'origin/develop' into cycles-phase-2 2021-06-02 16:12:45 -05:00
Alex Gleason
15c00f51be
Merge commit '10dfe814795f16d6c32f5b6a7421e3e7c597f1ad' into cycles-phase-2 2021-06-02 14:45:21 -05:00
Alex Gleason
ce7bc185a1
Merge commit '721c966842c2f9b4f4d6f227ecf3de69d2e66346'; commit 'a744c47e9a43a751438973a66b7201b006c6b944'; commit '8a5ceb7e53f1817f83a72b997f6b9daa7070972b'; commit '9879c18548c1b9f37df724259f65d5cd098f44c5' into cycles-phase-2 2021-06-02 14:44:22 -05:00
Alex Gleason
9879c18548
Avoid use Phoenix.Swoosh to prevent recompiling the Endpoint
Speeds up recompilation by fixing cycles in UserEmail
2021-06-01 16:17:03 -05:00
Alex Gleason
8a5ceb7e53
Remove deps from Uploader behaviour
Speeds up recompilation by limiting compile-time deps
2021-06-01 14:19:45 -05:00