tusooa
c80096522c
Merge branch 'develop' into 'from/develop/tusooa/emit-move'
...
# Conflicts:
# CHANGELOG.md
# test/pleroma/user_test.exs
2022-07-31 21:32:49 +00:00
Ilja
f88ed1df75
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into fine_grained_moderation_privileges
2022-07-05 12:05:19 +02:00
Ilja
8303af84ce
Rename the Exiftool module
...
No migrations or checks yet
2022-07-01 12:15:02 +02:00
Ilja
0d697bc15a
Add docs and CHANGELOG entries
2022-07-01 10:50:32 +02:00
Ilja
5a65e2dac5
Remove privileged_staff
...
Everything that was done through this setting, can now be set by giving the proper privileges to the roles.
2022-06-21 12:10:27 +02:00
Haelwenn
4605efe272
Merge branch 'improve_anti_followbot_policy' into 'develop'
...
Also use actor_type to determine if an account is a bot in antiFollowbotPolicy
Closes #2561
See merge request pleroma/pleroma!3498
2022-05-08 18:10:40 +00:00
Ilja
a8093732bd
Also use actor_type to determine if an account is a bot in antiFollowbotPolicy
2022-05-08 18:10:40 +00:00
Haelwenn (lanodan) Monnier
f9943b2065
mix: Bump to 2.4.52 for 2.4.3 mergeback
2022-05-06 10:23:43 +02:00
Haelwenn (lanodan) Monnier
57c486014c
Release 2.4.3
2022-05-06 09:01:33 +02:00
Tusooa Zhu
1a917cfeec
Add changelog
2022-03-02 09:51:46 -05:00
marcin mikołajczak
0266bc3c96
Birthdays: hide_birthday -> show_birthday
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-01-23 09:13:33 +01:00
Alex Gleason
aaa9314f4c
Merge remote-tracking branch 'origin/develop' into birth-dates
2022-01-22 14:24:50 -06:00
Alex Gleason
66e8c6f90f
Birthdays: birth_date --> birthday
2022-01-22 13:21:55 -06:00
marcin mikołajczak
74cf0f0355
Update changelog
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-01-19 23:52:46 +01:00
rinpatch
a02cfd7f52
Add ForceMentionsInContentPolicy
...
Even though latest PleromaFE supports displaying these properly, mobile
apps still exist, so I think we should offer a workaround to those who
want it.
2022-01-19 21:04:57 +03:00
Alex Gleason
cd8f1aac47
CHANGELOG: hashtags markdown fix
2022-01-15 12:36:33 -06:00
Alex Gleason
a4436bcc3f
Merge remote-tracking branch 'origin/stable' into mergeback
2022-01-14 12:37:00 -06:00
rinpatch
f4bc2f5975
Add 2.4.2 changelog entry and bump mix version
2022-01-11 13:39:23 +03:00
Alex Gleason
5f87472cdf
Update CHANGELOG.md
2021-12-28 15:14:09 -06:00
Tusooa Zhu
3092558bc1
Add changelog
2021-12-28 01:11:06 -05:00
Alex Gleason
326575d5b7
Merge remote-tracking branch 'origin/develop' into finch
2021-12-27 11:31:15 -06:00
Alibek Omarov
cd1041c3a4
API: optionally restrict moderators from accessing sensitive data
2021-12-27 02:27:48 +03:00
Lain Soykaf
7ed2258979
Update changelog
2021-12-26 17:00:09 +01:00
Alex Gleason
db2bf55e9b
Merge remote-tracking branch 'origin/develop' into notice-routes
2021-12-25 19:57:53 -06:00
Alex Gleason
d9746ae4cb
Merge branch 'from/develop/tusooa/2802-propagate-reject' into 'develop'
...
Handle Reject for already-accepted Follows properly
Closes #2766 and #2802
See merge request pleroma/pleroma!3568
2021-12-23 16:00:16 +00:00
Alex Gleason
3f8fc34593
Merge remote-tracking branch 'origin/develop' into moderators
2021-12-19 12:55:36 -06:00
Tusooa Zhu
538d5ac210
Add changelog for https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3568
2021-12-17 16:47:48 -05:00
Alibek Omarov
efc28812b8
Add changelog entry
2021-11-17 00:39:10 +01:00
lain
e2772d6bf1
Merge branch 'block-behavior' into 'develop'
...
Configurable block visibility, fixes #2123
Closes #2123
See merge request pleroma/pleroma!3242
2021-11-15 14:27:59 +00:00
lain
6e3df11693
Merge branch 'instance-deletion' into 'develop'
...
AdminAPI: endpoint to delete all content from a remote instance
See merge request pleroma/pleroma!3483
2021-11-15 14:24:13 +00:00
lain
6aff3d3204
Merge branch 'fix-object-deletion-timeout' into 'develop'
...
Fix Activity.delete_all_by_object_ap_id/1 timeout so users can be deleted
Closes #2704
See merge request pleroma/pleroma!3479
2021-11-15 13:21:42 +00:00
Haelwenn
92a8ff59aa
Merge branch 'from/develop/tusooa/add-remove-emails' into 'develop'
...
Allow users to remove their emails if instance does not need email to register
See merge request pleroma/pleroma!3522
2021-10-06 05:44:44 +00:00
Haelwenn
6b3842cf50
Merge branch 'remove/mastofe' into 'develop'
...
Remove MastoFE from Pleroma, fixes #2625
Closes #2625
See merge request pleroma/pleroma!3392
2021-09-07 16:41:53 +00:00
Tusooa Zhu
198250dcef
Allow users to remove their emails if instance does not need email to register
2021-09-05 21:27:02 -04:00
Haelwenn (lanodan) Monnier
28a17c2dc7
Merge branch 'release/2.4.1' into chores/2.4.1-develop
2021-08-28 18:49:04 +02:00
Haelwenn (lanodan) Monnier
7372609c5b
Release 2.4.1
2021-08-28 18:32:21 +02:00
someone
cc4f20b130
mix pleroma.database set_text_search_config now runs concurrently and infinitely
...
Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3514
2021-08-28 18:29:43 +02:00
Ilja
20084329ea
Selecting MRF policies didn't work as intended any more
...
* Policies were put under a new module (Pleroma.Web.ActivityPub.MRF.Policy instead of Pleroma.Web.ActivityPub.MRF), but this wasn't changed in the Pleroma.Web.ActivityPub.MRF @mrf_config_descriptions
* I don't have a unit test to prevent similar problems in the future because I don't find a proper way to do it
* The descriptions in the unit tests are defined in the unit tests, so if someone changes module names in the code, the tests wont see it
* The list is generated in Pleroma.Docs.Generator.list_behaviour_implementations, but I can't do a check in the when clause of the function to see if the provided module is a behaviour or not.
Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3509
2021-08-28 18:27:58 +02:00
Tusooa Zhu
bd0eb1c675
Make activity search properly use GIN indexes
...
The original approach to search in GIN indexes is to use
`to_tsvector(text)` in the WHERE clause of the query. According to
postgres docs [pdoc], this method does not make use of the index,
while `to_tsvector(config, text)` does. This commit changed the
query to use the two-argument `to_tsvector()`.
[pdoc]: https://www.postgresql.org/docs/12/textsearch-tables.html
To obtain the search config in use, we make a query to the db first.
The `::regconfig::oid` hack is needed because Postgrex does not support
regconfig type directly [postgrexbug]. I use the conversion from and to
`oid` instead of `text` because I tested in the actual DB and querying
using the conversion via `text` is slow just as the one-argument
`to_tsvector()` variant.
[postgrexbug]: https://github.com/elixir-ecto/postgrex/issues/502
Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3519
Closes: https://git.pleroma.social/pleroma/pleroma/-/issues/2758
2021-08-28 18:26:04 +02:00
Ilja
53b0dd4ecc
List available frontends also when no static/frontends folder is present yet
...
* To see what front ends are installed, it ls static/frontends. When this folder doesn't exists yet, it will return an empty array.
* Installing still works since the folder is created during installation already
Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3510
2021-08-28 18:23:49 +02:00
Sam Therapy
09c42ce13e
Add Admin-FE menu for StealEmojiPolicy
...
Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3512
2021-08-28 18:21:59 +02:00
Tusooa Zhu
a80cb58ac1
Add changelog for !3519
2021-08-27 22:31:22 -04:00
Alex Gleason
01175ef498
Streamer: fix crash in MastodonAPI.StatusView
...
Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3508
2021-08-13 17:58:03 +02:00
Haelwenn (lanodan) Monnier
27e1e4c742
Activity.Search: fallback on status resolution on DB Timeout
...
Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3507
2021-08-13 17:57:50 +02:00
Alex Gleason
e117551169
AdminAPI: hotfix for nil report objects
...
Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3504
2021-08-13 17:57:39 +02:00
Haelwenn (lanodan) Monnier
bb2d5879cc
maybe_notify_subscribers: Don't create notifications from ingested replies
...
Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3505
2021-08-13 17:57:19 +02:00
Haelwenn (lanodan) Monnier
0e2aebd036
TwitterAPI: Make change_email require body params instead of query
...
Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3503
2021-08-13 17:57:11 +02:00
Haelwenn (lanodan) Monnier
3961422f85
TwitterAPI: Make change_password require body params instead of query
...
Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3503
2021-08-13 17:56:59 +02:00
Haelwenn (lanodan) Monnier
8baaa36a16
ObjectAgePolicy: Fix pattern matching on published
...
Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3500
2021-08-13 17:56:46 +02:00
kPherox
34606d609d
fix: stream out Create Activity
...
Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3499
2021-08-13 17:54:51 +02:00
rinpatch
7afabe1cc6
Merge branch 'bugfix/status-search-fallback' into 'develop'
...
Activity.Search: resolve status on DB Timeout
Closes #2566
See merge request pleroma/pleroma!3507
2021-08-13 12:09:39 +00:00
Haelwenn (lanodan) Monnier
6455b967ec
Activity.Search: fallback on status resolution on DB Timeout
2021-08-12 10:35:32 +02:00
Haelwenn
3ca39ccf69
Merge branch 'bugfix/subscriptions-replies' into 'develop'
...
maybe_notify_subscribers: Normalize Object to check inReplyTo presence
Closes #2732
See merge request pleroma/pleroma!3505
2021-08-11 18:50:39 +00:00
Haelwenn (lanodan) Monnier
436fac3bac
maybe_notify_subscribers: Don't create notifications from ingested messages
2021-08-11 20:49:38 +02:00
Haelwenn
901204df22
Merge branch 'poll-notification' into 'develop'
...
MastodonAPI: Support poll notification
See merge request pleroma/pleroma!3484
2021-08-09 10:02:37 +00:00
Haelwenn
6384d78035
Merge branch 'simple_policy_reasons_for_instance_specific_policies' into 'develop'
...
Simple policy reasons for instance specific policies
See merge request pleroma/pleroma!3314
2021-08-09 09:37:59 +00:00
Sean King
1841bd8383
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remove/mastofe
2021-08-06 08:08:20 -06:00
matildepark
469405b7b2
CHANGELOG.md: Fix instances of 2020 being actually 2021
2021-08-06 08:42:27 +02:00
Ilja
cd706c0335
improve changelog entry
2021-08-06 07:59:54 +02:00
Ilja
9418424048
Add transparency_exclusions also to the breaking changes
2021-08-06 07:59:53 +02:00
Ilja
506bf16363
Change docs
...
* ./configuration/mrf.md
* Change example
* ./configuration/cheatsheet.md
* Change descriptions to include that a reason is given
* CHANGELOG.md
* Add as breaking change
2021-08-06 07:59:53 +02:00
Alex Gleason
e311c60923
CHANGELOG: moderator abilities
2021-08-05 11:11:27 -05:00
Haelwenn (lanodan) Monnier
79e993cae5
Release 2.4.0
2021-08-01 08:26:39 +02:00
Alex Gleason
3d8ce61fe5
CHANGELOG: fixed JSON error rendering
2021-07-27 08:30:38 -05:00
Alex Gleason
85d71d4f1d
CHANGELOG: Support `poll` notification type
2021-07-18 11:49:25 -05:00
Alex Gleason
c4efe0d2d6
CHANGELOG: instance deletion
2021-07-17 15:05:20 -05: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
Alex Gleason
117b3edf54
CHANGELOG: AdminAPI return date with users
2021-07-14 09:03:44 -05:00
Alex Gleason
5681a007d7
CHANGELOG: AdminAPI users sort
2021-07-13 22:48:32 -05:00
Alex Gleason
65514484cc
CHANGELOG: fixed user deletion database timeout
2021-07-12 16:59:54 -05:00
Haelwenn (lanodan) Monnier
6dc78f5f6f
AP C2S: Remove restrictions and make it go through pipeline
2021-07-12 06:49:41 +02:00
Sean King
5d279a22b1
Merge develop branch upstream
2021-07-10 11:04:16 -06: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
Alex Gleason
310ef6b70d
Deletions: change User.purge/1 to defp, add CHANGELOG entry
2021-06-30 12:25:20 -05:00
Mark Felder
d12e62c0b6
Add new Twittercard/OGP changes
2021-06-09 11:56:54 -05:00
Mark Felder
8443f82247
Update scope of AnalyzeMetadata features
2021-06-08 12:56:03 -05:00
feld
9a357d63f0
Update CHANGELOG.md
2021-06-07 20:07:59 +00:00
feld
10abbf13ba
Update CHANGELOG.md
2021-06-07 20:07:27 +00:00
feld
84f42b92f0
Merge branch 'develop' into 'fix/prune-hashtags'
...
# Conflicts:
# CHANGELOG.md
2021-06-07 20:06:36 +00:00
feld
4ca380490f
Update CHANGELOG.md
2021-06-07 20:05:18 +00:00
feld
c31338abe6
Update CHANGELOG.md
2021-06-07 20:04:27 +00:00
Mark Felder
eb150e7d88
Document OTP 24 support so we remember to add it to the official release notes / announcement
2021-06-04 15:50:10 -05:00
Sean King
dc4814f0cd
Fix merge conflicts with upstream
2021-06-04 14:42:44 -06:00
Haelwenn
0c56f9de0d
Merge branch 'tests/openapi-everywhere' into 'develop'
...
Put OpenAPI ~everywhere in tests
See merge request pleroma/pleroma!3324
2021-06-04 18:53:09 +00:00
Mark Felder
d6432a65da
Move shout configuration from :instance, update docs and changelog
2021-06-01 11:49:46 -05:00
Mark Felder
ff00b354fa
Rename the non-federating Chat feature to Shout
2021-06-01 11:49:14 -05:00
feld
359ded086c
Merge branch 'simplepolicy-announce-leak' into 'develop'
...
SimplePolicy: filter nested objects, fixes #2582
Closes #2582
See merge request pleroma/pleroma!3376
2021-05-28 19:05:13 +00:00
Mark Felder
cd4352a86f
Missing entry for pinned posts federation from MR !3312
2021-05-27 12:20:21 -05:00
Mark Felder
05d678c070
Expose user email address to user/owner; not publicly.
2021-05-20 12:50:43 -05:00
Mark Felder
2d7f6ce6fb
Clarify AttachmentMetadata changes
2021-05-18 16:46:51 -05:00
Mark Felder
c64cbee26c
Fixed checking for Upload Filter required commands
2021-05-18 16:28:21 -05:00
Mark Felder
9b6b5ac196
Rename upload filter to AnalyzeMetadata
2021-05-18 15:33:33 -05:00
Alex Gleason
5a57b025c7
Changelog: attachment meta
2021-05-12 20:15:33 -05:00
Alex Gleason
cea44b6b3e
Merge remote-tracking branch 'upstream/develop' into simplepolicy-announce-leak
2021-05-07 12:40:45 -05:00
Alex Gleason
b15c4629ff
CHANGELOG: notice routes
2021-05-05 14:51:29 -05:00
feld
745375bdcf
Merge branch 'dont-crash-email-settings' into 'develop'
...
Don't crash so hard when email settings are invalid
Closes #2606
See merge request pleroma/pleroma!3400
2021-05-04 13:30:00 +00:00
Alex Gleason
90770e0841
CHANGELOG: don't crash so hard when email settings are invalid
2021-05-03 14:43:34 -05:00
Alex Gleason
dca87c5e7b
CHANGELOG: markdown
2021-05-01 11:28:06 -05:00
Alex Gleason
20878c7f99
CHANGELOG: SimplePolicy embedded objects are now checked
2021-04-30 14:22:02 -05:00
Alex Gleason
8c1d6e8839
CHANGELOG: Return OAuth token `id`
2021-04-29 12:20:46 -05:00