Haelwenn
7c1243178b
Merge branch 'bugfix/change_password' into 'develop'
...
TwitterAPI: Make change_password require body params instead of query
Closes #2740
See merge request pleroma/pleroma!3503
3 years ago
Haelwenn (lanodan) Monnier
197cdebca9
TwitterAPI: Make change_email require body params instead of query
3 years ago
Haelwenn
8679a57a71
Merge branch 'bugfix/object-age-create' into 'develop'
...
ObjectAgePolicy: Fix pattern matching on published
See merge request pleroma/pleroma!3500
3 years ago
Haelwenn (lanodan) Monnier
09dcb2b522
TwitterAPI: Make change_password require body params instead of query
...
Closes: https://git.pleroma.social/pleroma/pleroma/-/issues/2740
3 years ago
Haelwenn (lanodan) Monnier
c64eae40a2
ObjectAgePolicy: Fix pattern matching on published
3 years ago
Haelwenn
f4af74b0fc
Merge branch 'fix/streaming-api-for-create-activity' into 'develop'
...
fix: stream out Create Activity
Closes #2691
See merge request pleroma/pleroma!3499
3 years ago
Haelwenn
901204df22
Merge branch 'poll-notification' into 'develop'
...
MastodonAPI: Support poll notification
See merge request pleroma/pleroma!3484
3 years ago
kPherox
ee5def34da
fix: stream out Create Activity
3 years ago
Egor Kislitsyn
ad09bdb376
Improve readability
3 years ago
Ilja
b0926a71b2
Make transparency_exclusions use tuples in admin-fe
...
* Make it use tuples
* I also changed the keys for key_placeholder and value_placeholder to use snake_case instead of camelCase
3 years ago
Ilja
f4028c908c
Add key- and valuePlaceholders for quarantined_instances and mrf_simple
...
* I also added for keywordpolicy as well now. It was done in the admin-fe, but is better to be done here
* I also added comments to explain why we did the _info keys (backwards compatibility)
3 years ago
Ilja
03030b47c2
quarantine instances info
...
Added a new field in the nodeinfo called quarantined_instances_info
This holds an object like `"quarantined_instances_info":{"quarantined_instances":{"quar.inst":{"reason":"whatever reason"}}}}`
3 years ago
Ilja
47fc57bbcc
Change what nodeinfo returns without breaking backwards compatibility
...
* Only for SimplePolicy for now
* I added an extra mrf_simple_info key that has an object as value. The object contains only relevant extra info
3 years ago
Ilja
7fdc3cde06
Return maps in node_info
...
It's easiest (and imo most proper) to use tuples {"instance, "reason"} in BE,
but for FE maps like %{"instance": "instance", "reason", "reason"} are better.
I changed it so that node_info returns maps now for simple_policy and quarantined instances.
3 years ago
Ilja
c0489f9fac
Fixed deprecation warning checks
...
When a setting was deprecated, the code would stop checking for the rest of the possible deprications. This also meant that the settings weren't rewritten to the new settings for deprecated settings besides the first one.
3 years ago
Ilja
3c5a497b19
Deprecate transparency_exclusions
...
* Give deprecation message
* Rewrite configs
3 years ago
Ilja
dfeb3862da
config :mrf, :transparency_exclusions works with tumples now
3 years ago
Ilja
e0c7d77197
Deprecate and rewrite settings for quarentine settings
...
* This is for the settings, not yet a DB migration
3 years ago
Ilja
27fe7b0274
Make quarentine work with list of tuples instead of strings
3 years ago
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
3 years ago
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
3 years ago
Alex Gleason
44ede0657f
Merge remote-tracking branch 'pleroma/develop' into staff-plug
3 years ago
Alex Gleason
7f23dd6cc8
Merge remote-tracking branch 'pleroma/develop' into object-tombstone-visibility
3 years ago
Alex Gleason
9cc8642b80
Visibility: check Tombstone objects in visible_for_user?/2
3 years ago
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
3 years ago
Alex Gleason
62bf6d67e3
Merge remote-tracking branch 'pleroma/develop' into poll-notification-fixes
3 years ago
Alex Gleason
70f1496eb8
Poll notification: only notify local users
3 years ago
Alex Gleason
0b1c05ca1e
Poll notification: trigger PollWorker through common_pipeline
3 years ago
Alex Gleason
6a6e42c9bf
PollWorker defensive checks
3 years ago
Alex Gleason
cbd1a10c16
Poll notification: notify for polls even when block_from_strangers is set
3 years ago
Alex Gleason
0114754db2
MastodonAPI: Support poll notification
3 years ago
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
3 years ago
Alex Gleason
1a2fe96d56
Merge remote-tracking branch 'pleroma/develop' into admin-api-users-date
3 years ago
Alex Gleason
167e14416b
AdminAPI: add date to users
3 years ago
Alex Gleason
deb3f91136
Merge remote-tracking branch 'pleroma/develop' into admin-api-users-sort
3 years ago
Alex Gleason
5e88796784
AdminAPI: sort user results by ID descending
3 years ago
Alex Gleason
1f093cb216
Moderators: reorganize :admin_api pipeline in Router
3 years ago
Alex Gleason
9bc1e79c56
Moderators: add UserIsStaffPlug
3 years ago
Haelwenn
173e977e28
Merge branch 'features/ingestion-page' into 'develop'
...
Pipeline Ingestion: Page
See merge request pleroma/pleroma!3097
3 years ago
Haelwenn (lanodan) Monnier
6dc78f5f6f
AP C2S: Remove restrictions and make it go through pipeline
3 years ago
marcin mikołajczak
6ef8e1776d
fix the fucking list timelines on mastofe/soapbox-fe
3 years ago
Alex Gleason
310ef6b70d
Deletions: change User.purge/1 to defp, add CHANGELOG entry
3 years ago
Alex Gleason
99cc26bb02
Merge remote-tracking branch 'pleroma/develop' into remote-deletions
3 years ago
Alex Gleason
beb1c98ab5
Deletions: don't purge keys so Delete/Undo activities can be signed
3 years ago
Alex Gleason
43800d83f4
Deletions: allow deactivated users to be deleted
3 years ago
Alex Gleason
a7929c4d89
Deletions: preserve account status fields during purge, fix checks
3 years ago
Alex Gleason
01c2d2a296
Also purge the user in User.perform/2
3 years ago
Alex Gleason
c6d4133727
Deletions: purge the user immediately
3 years ago
Alex Gleason
be2da95c36
Correctly purge a remote user
3 years ago
Alex Gleason
281806de75
Activity deletion: fix FunctionClauseError #2686
3 years ago