Commit graph

4452 commits

Author SHA1 Message Date
6c052bd5b6 Merge branch 'media-preview-proxy-nostream' into 'develop'
Media preview proxy

See merge request pleroma/pleroma!3001
2020-09-18 18:38:20 +00:00
lain
7e02f4ed3b Merge branch 'feature/2118-web-push-encryption-http' into 'develop'
Make WebPushEncryption use Pleroma.HTTP as an HTTP adapter

Closes #2118

See merge request pleroma/pleroma!3008
2020-09-18 12:25:10 +00:00
Steven Fuchs
f2ef9735c5 Federate data through persistent websocket connections 2020-09-18 11:58:22 +00:00
Sergey Suprunenko
226fa3e486
Make WebPushEncryption use Pleroma.HTTP as an HTTP adapter 2020-09-17 22:10:55 +02:00
Ivan Tashkinov
a428800405 Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy-nostream
# Conflicts:
#	CHANGELOG.md
2020-09-17 22:22:59 +03:00
Haelwenn (lanodan) Monnier
7bf269fe83 Fix MRF reject for ChatMessage 2020-09-17 22:07:54 +03:00
Haelwenn (lanodan) Monnier
abf25e5d52 Create MRF.filter_pipeline to inject :object_data when present 2020-09-17 22:07:54 +03:00
Haelwenn
beefc022dd Merge branch 'omit-nondiscoverable-from-search' into 'develop'
User search should respect discoverable flag

See merge request pleroma/pleroma!2997
2020-09-17 17:59:38 +00:00
608824b97e Merge branch 'instance-docs' into 'develop'
AdminAPI: Allow to modify Terms of Service and Instance Panel via Admin API

Closes #1516

See merge request pleroma/pleroma!2931
2020-09-17 16:54:53 +00:00
stwf
9d77f4abf8 adapt to new user factory behavior 2020-09-17 12:32:40 -04:00
stwf
dfc621a529 add test and changelog entry 2020-09-17 12:18:07 -04:00
stwf
41939e3175 User search respect discoverable flag 2020-09-17 12:15:50 -04:00
Mark Felder
f7e40f7ef1 Deny ConfigDB migration when deprecated settings found 2020-09-17 09:32:50 -05:00
Ivan Tashkinov
d9fb5bc08a Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy-nostream 2020-09-17 17:14:20 +03:00
Ivan Tashkinov
7cdbd91d83 [#2497] Configurability of :min_content_length (preview proxy). Refactoring, documentation, tests. 2020-09-17 17:13:40 +03:00
lain
7c60789ba5 Merge branch 'develop' into 'nondiscoverable-user-metadata'
# Conflicts:
#   CHANGELOG.md
2020-09-17 14:09:01 +00:00
eugenijm
c711a2b157 Return the file content for GET /api/pleroma/admin/instance_document/:document_name 2020-09-17 16:55:53 +03:00
eugenijm
582ad5d4e1 AdminAPI: Allow to modify Terms of Service and Instance Panel via Admin API 2020-09-17 16:48:07 +03:00
lain
5e3c70afa5 AdminAPI Chat tests: Remove factory.
The factory system doesn't work too well with how the chats are
done. Instead of tempting people to use it, let's rather use the
CommonAPI system for now.
2020-09-17 13:37:25 +02:00
lain
e39ff2616b Admin chat api tests: Small additions. 2020-09-17 13:29:26 +02:00
lain
7a73850928 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma-chat-moderation 2020-09-17 13:26:04 +02:00
Mark Felder
73e0e6a8a2 Remove unused import 2020-09-16 10:56:42 -05:00
lain
7a88b726bf User: Remote users don't need to be confirmed or approved 2020-09-16 17:29:16 +02:00
rinpatch
eca8d26784 Merge branch 'chores/mrf-loglevel' into 'develop'
Fetcher: Correctly return MRF reject reason

See merge request pleroma/pleroma!2990
2020-09-16 13:37:04 +00:00
rinpatch
adbd0032fa Merge branch 'features/validators-video' into 'develop'
Pipeline Ingestion: Video and Article

See merge request pleroma/pleroma!2908
2020-09-16 13:36:27 +00:00
lain
6b088ed76a Merge branch 'issue/2089' into 'develop'
[#2089] fix notifications

See merge request pleroma/pleroma!3000
2020-09-16 12:22:48 +00:00
Maksim Pechnikov
599f8bb152 RepoStreamer.chunk_stream -> Repo.chunk_stream 2020-09-16 09:47:18 +03:00
Ivan Tashkinov
2f155fb89f Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy-nostream 2020-09-15 20:29:39 +03:00
Maksim Pechnikov
f879d07fa1 fixed tests 2020-09-15 15:32:49 +03:00
eugenijm
3ab59a6f3c Mastodon API: fix the public timeline returning an error when the reply_visibility parameter is set to self for an unauthenticated user 2020-09-15 13:00:56 +03:00
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
2020-09-15 08:25:10 +00:00
stwf
f900a40d5d fix credo warning 2020-09-14 13:55:49 -04:00
stwf
38b2db297b search indexing metadata respects discoverable flag 2020-09-14 13:18:11 -04:00
Mark Felder
d31f0393bf Validate Welcome Chat message works with Simple policy applied to local instance 2020-09-14 12:06:08 -05:00
rinpatch
738685a629 Apply 1 suggestion(s) to 1 file(s) 2020-09-14 11:56:00 +00:00
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).
2020-09-14 14:45:58 +03:00
Alex Gleason
c4061f06ba
Merge branch 'chat-moderation-stable' into chat-moderation 2020-09-11 14:30:28 -05:00
Alex Gleason
bc86d0a906
Chat moderation: fix formatting 2020-09-11 14:29:56 -05:00
Alex Gleason
9733c9d065
Merge remote-tracking branch 'upstream/develop' into chat-moderation 2020-09-11 14:13:38 -05:00
Alex Gleason
dfb831ca39
Chat moderation: add tests for unauthorized access 2020-09-11 14:11:07 -05:00
Alex Gleason
e229536e5c
Chat Moderation: use explicit sender and recipient fields 2020-09-11 14:11:00 -05:00
Alex Gleason
67726453f8
Credo fix 2020-09-11 14:10:52 -05:00
Alex Gleason
02d70228b5
AdminAPI: fix delete chat message 2020-09-11 14:10:35 -05:00
Alex Gleason
9dd0b23da4
AdminAPI: show chat 2020-09-11 14:10:28 -05:00
Alex Gleason
f13b52a703
AdminAPI: list messages in a chat 2020-09-11 14:10:19 -05:00
Alex Gleason
fb0de07343
AdminAPI: list chats for a user 2020-09-11 14:10:05 -05:00
Alex Gleason
b40a627ab0
AdminAPI: delete a chat message 2020-09-11 14:09:58 -05:00
Alex Gleason
f88dc1937e
MastodonAPI.StatusView.get_user/1 --> CommonAPI.get_user/1 2020-09-11 14:09:50 -05:00
Haelwenn (lanodan) Monnier
f1f44069ae
Fetcher: Correctly return MRF reject reason 2020-09-11 20:00:41 +02:00
Ivan Tashkinov
0bda85857e Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy
# Conflicts:
#	lib/pleroma/instances/instance.ex
2020-09-11 17:19:58 +03:00