Alex Gleason
|
be2da95c36
|
Correctly purge a remote user
|
2021-06-29 21:45:38 -05:00 |
|
Haelwenn
|
5717256eba
|
Merge branch 'fix-2686' into 'develop'
Activity deletion: fix FunctionClauseError, fixes #2686
Closes #2686
See merge request pleroma/pleroma!3475
|
2021-06-25 04:52:19 +00:00 |
|
Alex Gleason
|
281806de75
|
Activity deletion: fix FunctionClauseError #2686
|
2021-06-24 21:03:31 -05:00 |
|
feld
|
f97f305d00
|
Merge branch 'ecto-upgrade' into 'develop'
Upgrade Ecto to v3.6.2, remove deprecated ecto_explain
See merge request pleroma/pleroma!3473
|
2021-06-23 20:17:01 +00:00 |
|
Alex Gleason
|
54af527759
|
Upgrade Ecto to v3.6.2, remove deprecated ecto_explain
|
2021-06-23 13:22:32 -05:00 |
|
Haelwenn
|
f9ae7e72e9
|
Merge branch 'bugfix/upload-limit-plug' into 'develop'
Downgrade Plug to 1.10.x, revert upload_limit tuple to function change
See merge request pleroma/pleroma!3472
|
2021-06-22 23:27:32 +00:00 |
|
feld
|
a814671e85
|
Merge branch 'docs/dependencies-rewrite' into 'develop'
Rewrite docs related to dependencies
See merge request pleroma/pleroma!3466
|
2021-06-22 16:52:19 +00:00 |
|
Haelwenn (lanodan) Monnier
|
fc6ab78a84
|
Add test on changing [:instance, :upload_limit]
|
2021-06-22 12:25:25 +02:00 |
|
Haelwenn (lanodan) Monnier
|
a851a24036
|
Downgrade Plug to 1.10.x, revert upload_limit tuple to function change
This should fix setting the upload limit in the database as found in:
https://queer.hacktivis.me/notice/A8XUZp74Cg7eYNEMxU
This reverts commit 7d350b73f5.
|
2021-06-22 11:19:13 +02: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 |
|
Haelwenn
|
a8adc300d4
|
Merge branch 'cycles-ci-skip' into 'develop'
Cycles CI: skip unless Elixir code is modified
See merge request pleroma/pleroma!3467
|
2021-06-11 22:25:41 +00:00 |
|
Alex Gleason
|
640e1cf09d
|
Cycles CI: skip unless Elixir code is modified
|
2021-06-11 08:45:19 -05:00 |
|
Haelwenn (lanodan) Monnier
|
822196f393
|
docs/…/opt_en.md: Reuse /main/ repository url for the /community/ repo
|
2021-06-11 08:48:35 +02:00 |
|
Haelwenn (lanodan) Monnier
|
17f980e9ab
|
docs: Remove Erlang Solutions repository
|
2021-06-11 08:48:35 +02:00 |
|
Haelwenn (lanodan) Monnier
|
6b1f7f2f52
|
docs: Use one file to describe dependencies
|
2021-06-11 08:48:35 +02:00 |
|
feld
|
406dadb56b
|
Merge branch 'fix/twittercard-video-dimensions' into 'develop'
Generate Twittercard/OGP metadata with correct dimensions
See merge request pleroma/pleroma!3456
|
2021-06-10 15:03:58 +00:00 |
|
Mark Felder
|
202ee5fd77
|
Add note about video thumbnails for code spelunkers unfamiliar with Media Preview Proxy
|
2021-06-10 09:56:43 -05:00 |
|
feld
|
b84873d3df
|
Merge branch 'cycles-ci' into 'develop'
Prevent compile-time cycles in CI
See merge request pleroma/pleroma!3420
|
2021-06-09 19:04:40 +00:00 |
|
Alex Gleason
|
15e2aaa9f6
|
Fix compile cycle in Pleroma.Tests.AuthTestController
|
2021-06-09 13:30:19 -05:00 |
|
Alex Gleason
|
87cd04fe0c
|
Cycles CI: disable cache
|
2021-06-09 13:12:33 -05:00 |
|