Ivan Tashkinov
2f155fb89f
Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy-nostream
4 years ago
Maksim Pechnikov
f879d07fa1
fixed tests
4 years ago
lain
cfad4f46b2
Merge branch 'reply-visibility-user-guard' into 'develop'
...
Mastodon API: fix the public timeline returning an error when the `reply_visibility` parameter is set to `self` for an unauthenticated user
See merge request pleroma/pleroma!2999
4 years ago
eugenijm
3ab59a6f3c
Mastodon API: fix the public timeline returning an error when the `reply_visibility` parameter is set to `self` for an unauthenticated user
4 years ago
Haelwenn
5c4ff5c73c
Merge branch 'fix/mrf-simple-welcome-chats' into 'develop'
...
Ensure we only apply media_nsfw simple policy on parsable objects
Closes #2133
See merge request pleroma/pleroma!2992
4 years ago
Mark Felder
0b66e806e3
Move changelog entry to next patch
4 years ago
Mark Felder
709723182d
Ensure SimplePolicy's tags in string representation don't trip up the object validator
4 years ago
stwf
f900a40d5d
fix credo warning
4 years ago
stwf
38b2db297b
search indexing metadata respects discoverable flag
4 years ago
Mark Felder
118bf6e92b
Fixed Welcome chats with MRF Simple applied locally
4 years ago
Mark Felder
25d1caf1dd
Merge duplicate Changed sections
4 years ago
Mark Felder
d31f0393bf
Validate Welcome Chat message works with Simple policy applied to local instance
4 years ago
rinpatch
39d769f250
Merge branch 'remove/managed-config-option' into 'develop'
...
Remove `:managed_config` option.
Closes #2086
See merge request pleroma/pleroma!2983
4 years ago
rinpatch
0b5e72ecf0
Remove `:managed_config` option.
...
In practice, it was already removed half a year ago, but the description
and cheatsheet entries were still there.
The migration intentionally does not use ConfigDB.get_by_params, since
this will break migration code as soon as we add a new field is added
to ConfigDB.
Closes #2086
4 years ago
rinpatch
6e70415e4a
Merge branch 'hotfix/rich-media-compile-error' into 'develop'
...
RichMedia: fix a compilation error due to nonexistent variable
See merge request pleroma/pleroma!2996
4 years ago
rinpatch
bb407edce4
RichMedia: fix a compilation error due to nonexistent variable
...
No idea why this passed Gitlab CI
4 years ago
rinpatch
4d543fcb75
Merge branch 'feat/rich-media-head' into 'develop'
...
RichMedia: Do a HEAD request to check content type/length
See merge request pleroma/pleroma!2995
4 years ago
rinpatch
738685a629
Apply 1 suggestion(s) to 1 file(s)
4 years ago
rinpatch
f70335002d
RichMedia: Do a HEAD request to check content type/length
...
This shouldn't be too expensive, since the connections are pooled,
but it should save us some bandwidth since we won't fetch non-html
files and files that are too large for us to process (especially
since you can't cancel a request without closing the connection
with HTTP1).
4 years ago
rinpatch
f66a15c4a5
RichMedia parser: do not set a cache TTL for unchanging errors
4 years ago
Maksim Pechnikov
3e53ab4e98
added notification constraints
4 years ago
rinpatch
2937e3095a
Merge branch 'fix/2139-oban-migration' into 'develop'
...
Remove old workers in oban migrations
Closes #2139
See merge request pleroma/pleroma!2994
4 years ago
Maksim
489a107cf4
Apply 1 suggestion(s) to 1 file(s)
4 years ago
Alexander Strizhakov
65f4e37ee1
remove old workers in oban migrations
4 years ago
Haelwenn
88fe0a262e
Merge branch 'weblate-pleroma-pleroma' into 'develop'
...
Translations update from Weblate
See merge request pleroma/pleroma!2991
4 years ago
Ivan Tashkinov
cd234a5321
[ #2497 ] Media preview proxy: preview bypass for small images
...
(basing on Content-Length and Content-Type).
4 years ago
Ivan Tashkinov
32831f371f
[ #2497 ] Media preview proxy: redirecting to media proxy url in case of preview error or unsupported content type.
4 years ago
Mark Felder
c0b36621f1
Ensure we only apply NSFW Simple policy on parsable objects
4 years ago
tarteka
6877bad44c
Translated using Weblate (Spanish)
...
Currently translated at 20.7% (22 of 106 strings)
Translation: Pleroma/Pleroma backend
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/es/
4 years ago
feld
2b06805ad5
Merge branch 'chore/docs-spelling' into 'develop'
...
Spelling nit
See merge request pleroma/pleroma!2993
4 years ago
Mark Felder
40c847dc2a
Spelling
...
Reported by: trevoke
4 years ago
Alex Gleason
c4061f06ba
Merge branch 'chat-moderation-stable' into chat-moderation
4 years ago
Alex Gleason
bc86d0a906
Chat moderation: fix formatting
4 years ago
Alex Gleason
9733c9d065
Merge remote-tracking branch 'upstream/develop' into chat-moderation
4 years ago
Alex Gleason
dfb831ca39
Chat moderation: add tests for unauthorized access
4 years ago
Alex Gleason
e229536e5c
Chat Moderation: use explicit `sender` and `recipient` fields
4 years ago
Alex Gleason
67726453f8
Credo fix
4 years ago
Alex Gleason
c361df11b4
Docs: AdminAPI chat moderation
4 years ago
Alex Gleason
02d70228b5
AdminAPI: fix delete chat message
4 years ago
Alex Gleason
9dd0b23da4
AdminAPI: show chat
4 years ago
Alex Gleason
f13b52a703
AdminAPI: list messages in a chat
4 years ago
Alex Gleason
c41430b23e
Refactor with Chat.for_user_query/1
4 years ago
Alex Gleason
fb0de07343
AdminAPI: list chats for a user
4 years ago
Alex Gleason
b40a627ab0
AdminAPI: delete a chat message
4 years ago
Alex Gleason
f88dc1937e
MastodonAPI.StatusView.get_user/1 --> CommonAPI.get_user/1
4 years ago
Haelwenn (lanodan) Monnier
f1f44069ae
Fetcher: Correctly return MRF reject reason
4 years ago
Ivan Tashkinov
0bda85857e
Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy
...
# Conflicts:
# lib/pleroma/instances/instance.ex
4 years ago
rinpatch
9fb88c814d
Merge branch 'feat/log-possible-hol' into 'develop'
...
ConnectionPool: Log possible HTTP1 blocks
See merge request pleroma/pleroma!2989
4 years ago
rinpatch
89a7efab69
ConnectionPool: Log possible HTTP1 blocks
4 years ago
Haelwenn
36c9197ac3
Apply 1 suggestion(s) to 1 file(s)
4 years ago