Ilja
e0c7d77197
Deprecate and rewrite settings for quarentine settings
...
* This is for the settings, not yet a DB migration
2021-08-06 07:59:52 +02:00
Ilja
27fe7b0274
Make quarentine work with list of tuples instead of strings
2021-08-06 07:59:52 +02:00
Ilja
dd947d9bc8
Add tests for setting :instance, :quarantined_instances
...
No test was done for quarantined instances yet. I added a factory for followers_only notes and checked
* That no followers only post is send when the target server is quarantined
* That a followers only post is send when the target server is not quarantined
2021-08-06 07:59:52 +02:00
Ilja
4ba0beb60c
Make mrfSimple work with tuples
...
* Changed SimplePolicy
* I also grepped in test/ for ':mrf_simple' to see what other things could be affected
2021-08-06 07:58:58 +02:00
Ilja
647087d7fd
Deprectate strings for SimplePolicy
...
When strings are detected in the simplepolicy, a warning will be given and the config will be changed to use tuples instead
2021-08-06 05:01:44 +02:00
Haelwenn
5f5dc24027
Merge branch 'staff-plug' into 'develop'
...
Moderators: add UserIsStaffPlug
See merge request pleroma/pleroma!3495
2021-08-05 05:51:22 +00:00
Alex Gleason
44ede0657f
Merge remote-tracking branch 'pleroma/develop' into staff-plug
2021-08-04 11:48:57 -05:00
feld
d8a986c9e8
Merge branch 'object-tombstone-visibility' into 'develop'
...
Visibility: check Tombstone objects in visible_for_user?/2
See merge request pleroma/pleroma!3490
2021-07-27 16:25:34 +00:00
feld
7495beeb40
Merge branch 'errorview-json-fix' into 'develop'
...
Fix errors in ErrorView
See merge request pleroma/pleroma!3489
2021-07-27 16:24:53 +00:00
Alex Gleason
7f23dd6cc8
Merge remote-tracking branch 'pleroma/develop' into object-tombstone-visibility
2021-07-27 08:54:26 -05:00
Alex Gleason
9cc8642b80
Visibility: check Tombstone objects in visible_for_user?/2
2021-07-27 08:54:01 -05:00
Alex Gleason
3d8ce61fe5
CHANGELOG: fixed JSON error rendering
2021-07-27 08:30:38 -05:00
Alex Gleason
33a19c002a
Merge remote-tracking branch 'pleroma/develop' into errorview-json-fix
2021-07-27 08:29:53 -05:00
Alex Gleason
94db0b7cd6
Add activity+json to Phoenix :format_encoders
...
Fixes ErrorView rendering
2021-07-27 08:28:52 -05:00
Haelwenn
7acdab1f30
Merge branch 'mkljczk-develop-patch-60115' into 'develop'
...
MastodonAPI: Fix list timelines
Closes mastofe#89 and #2693
See merge request pleroma/pleroma!3477
2021-07-22 18:41:11 +00:00
feld
3f58213646
Merge branch 'admin-api-users-sort' into 'develop'
...
AdminAPI: sort new users at the top
Closes #2709
See merge request pleroma/pleroma!3481
2021-07-14 14:39:14 +00:00
feld
17d79f3484
Merge branch 'admin-api-users-date' into 'develop'
...
AdminAPI: add created_at date to users
See merge request pleroma/pleroma!3482
2021-07-14 14:35:21 +00:00
Alex Gleason
117b3edf54
CHANGELOG: AdminAPI return date with users
2021-07-14 09:03:44 -05:00
Alex Gleason
1a2fe96d56
Merge remote-tracking branch 'pleroma/develop' into admin-api-users-date
2021-07-14 09:02:55 -05:00
Alex Gleason
167e14416b
AdminAPI: add date to users
2021-07-14 08:54:59 -05:00
Alex Gleason
5681a007d7
CHANGELOG: AdminAPI users sort
2021-07-13 22:48:32 -05:00
Alex Gleason
deb3f91136
Merge remote-tracking branch 'pleroma/develop' into admin-api-users-sort
2021-07-13 22:47:47 -05:00
Alex Gleason
5e88796784
AdminAPI: sort user results by ID descending
2021-07-13 22:47:02 -05:00
Alex Gleason
1f093cb216
Moderators: reorganize :admin_api pipeline in Router
2021-07-12 22:11:32 -05:00
Alex Gleason
9bc1e79c56
Moderators: add UserIsStaffPlug
2021-07-12 21:57:52 -05:00
Haelwenn
173e977e28
Merge branch 'features/ingestion-page' into 'develop'
...
Pipeline Ingestion: Page
See merge request pleroma/pleroma!3097
2021-07-12 05:05:49 +00:00
Haelwenn
ebcc28fef0
Merge branch 'features/validators-apc2s' into 'develop'
...
AP C2S: Remove restrictions and make it go through pipeline
See merge request pleroma/pleroma!3203
2021-07-12 05:01:36 +00:00
Haelwenn (lanodan) Monnier
6dc78f5f6f
AP C2S: Remove restrictions and make it go through pipeline
2021-07-12 06:49:41 +02:00
feld
aa9a6c3c05
Merge branch 'update/linkify' into 'develop'
...
Update Linkify
See merge request pleroma/pleroma!3478
2021-07-08 17:44:52 +00:00
Mark Felder
64d009693e
Update Linkify to fix crash on posts with a URL we failed to parse correctly
2021-07-08 12:33:17 -05:00
feld
9e1da4bf58
Merge branch 'remote-deletions' into 'develop'
...
Fix user deletion problems
See merge request pleroma/pleroma!3476
2021-07-06 20:05:05 +00:00
marcin mikołajczak
6ef8e1776d
fix the fucking list timelines on mastofe/soapbox-fe
2021-07-02 13:03:41 +00:00
Alex Gleason
310ef6b70d
Deletions: change User.purge/1 to defp, add CHANGELOG entry
2021-06-30 12:25:20 -05:00
Alex Gleason
99cc26bb02
Merge remote-tracking branch 'pleroma/develop' into remote-deletions
2021-06-30 02:02:30 -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
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
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
