alyssa
/
pleroma
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
11,943 Commits 1 Branch 0 Tags 177 MiB
Commit Graph

11943 Commits

Author SHA1 Message Date
rinpatch a4f80e1e74 Merge branch 'feat/connection-worker-monitor-flush' into 'develop' 
ConnectionPool Worker: use monitor flush instead of checking ref

See merge request pleroma/pleroma!3002
 2020-09-16 15:10:20 +00:00
rinpatch adb1b0282d ConnectionPool Worker: use monitor flush instead of checking ref 
`:flush` removes the DOWN message if one had arrived, so this check
should no longer be necessary.
 2020-09-16 17:29:07 +03: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
Maksim c74fad9e06 Apply 1 suggestion(s) to 1 file(s) 2020-09-16 03:18:50 +00: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
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
 2020-09-15 12:21:38 +00: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
Mark Felder 0b66e806e3 Move changelog entry to next patch 2020-09-14 17:11:08 -05:00
Mark Felder 709723182d Ensure SimplePolicy's tags in string representation don't trip up the object validator 2020-09-14 17:06:42 -05: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 118bf6e92b Fixed Welcome chats with MRF Simple applied locally 2020-09-14 12:08:32 -05:00
Mark Felder 25d1caf1dd Merge duplicate Changed sections 2020-09-14 12:07:31 -05: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 39d769f250 Merge branch 'remove/managed-config-option' into 'develop' 
Remove `:managed_config` option.

Closes #2086

See merge request pleroma/pleroma!2983
 2020-09-14 15:19:09 +00:00
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
 2020-09-14 18:04:16 +03:00
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
 2020-09-14 12:48:27 +00:00
rinpatch bb407edce4 RichMedia: fix a compilation error due to nonexistent variable 
No idea why this passed Gitlab CI
 2020-09-14 15:46:00 +03:00
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
 2020-09-14 12:38:00 +00: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
rinpatch f66a15c4a5 RichMedia parser: do not set a cache TTL for unchanging errors 2020-09-14 14:44:25 +03:00
Maksim Pechnikov 3e53ab4e98 added notification constraints 2020-09-14 14:08:12 +03:00
rinpatch 2937e3095a Merge branch 'fix/2139-oban-migration' into 'develop' 
Remove old workers in oban migrations

Closes #2139

See merge request pleroma/pleroma!2994
 2020-09-14 07:54:06 +00:00
Maksim 489a107cf4 Apply 1 suggestion(s) to 1 file(s) 2020-09-13 11:54:15 +00:00
Alexander Strizhakov 65f4e37ee1
remove old workers in oban migrations 2020-09-13 10:04:50 +03:00
Haelwenn 88fe0a262e Merge branch 'weblate-pleroma-pleroma' into 'develop' 
Translations update from Weblate

See merge request pleroma/pleroma!2991
 2020-09-12 08:26:41 +00:00
Ivan Tashkinov cd234a5321 [#2497] Media preview proxy: preview bypass for small images 
(basing on Content-Length and Content-Type).
 2020-09-12 11:20:41 +03:00
Ivan Tashkinov 32831f371f [#2497] Media preview proxy: redirecting to media proxy url in case of preview error or unsupported content type. 2020-09-12 10:33:42 +03:00
Mark Felder c0b36621f1 Ensure we only apply NSFW Simple policy on parsable objects 2020-09-11 23:22:14 -05:00
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/
 2020-09-11 23:15:02 +00:00
feld 2b06805ad5 Merge branch 'chore/docs-spelling' into 'develop' 
Spelling nit

See merge request pleroma/pleroma!2993
 2020-09-11 23:14:54 +00:00
Mark Felder 40c847dc2a Spelling 
Reported by:	trevoke
 2020-09-11 17:42:39 -05: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 c361df11b4
Docs: AdminAPI chat moderation 2020-09-11 14:10:45 -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 c41430b23e
Refactor with Chat.for_user_query/1 2020-09-11 14:10:13 -05:00
Alex Gleason fb0de07343
AdminAPI: list chats for a user 2020-09-11 14:10:05 -05:00