lain [Mon, 21 Sep 2020 14:08:38 +0000 (16:08 +0200)]
ActivityPub: Don't block-filter your own posts
We are filtering out replies to people you block, but that should
not include your own posts.
lain [Sun, 20 Sep 2020 15:23:15 +0000 (15:23 +0000)]
Merge branch 'weblate-pleroma-pleroma' into 'develop'
Translations update from Weblate
See merge request pleroma/pleroma!3014
Kana [Sun, 20 Sep 2020 13:19:21 +0000 (13:19 +0000)]
Translated using Weblate (Chinese (Simplified))
Currently translated at 24.5% (26 of 106 strings)
Translation: Pleroma/Pleroma backend
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/zh_Hans/
Kana [Sun, 20 Sep 2020 13:18:26 +0000 (13:18 +0000)]
Added translation using Weblate (Chinese (Simplified))
rinpatch [Sun, 20 Sep 2020 11:15:20 +0000 (11:15 +0000)]
Merge branch 'fix/openapi-errors' into 'develop'
OpenAPI: fix various errors pointed out by editor.swagger.io
See merge request pleroma/pleroma!3011
rinpatch [Fri, 18 Sep 2020 21:50:38 +0000 (00:50 +0300)]
OpenAPI: make it possible to generate a spec without starting the app
Needed for api docs generation on pleroma.social that will come later
rinpatch [Fri, 18 Sep 2020 21:50:00 +0000 (00:50 +0300)]
OpenAPI: fix various errors pointed out by editor.swagger.io
feld [Fri, 18 Sep 2020 18:38:20 +0000 (18:38 +0000)]
Merge branch 'media-preview-proxy-nostream' into 'develop'
Media preview proxy
See merge request pleroma/pleroma!3001
lain [Fri, 18 Sep 2020 13:30:41 +0000 (13:30 +0000)]
Merge branch 'fix/fedsocket-log-spam' into 'develop'
FedSockets: fix log spam on cached rejects
See merge request pleroma/pleroma!3009
rinpatch [Fri, 18 Sep 2020 13:09:37 +0000 (16:09 +0300)]
FedSockets: fix log spam on cached rejects
lain [Fri, 18 Sep 2020 12:25:10 +0000 (12:25 +0000)]
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
lain [Fri, 18 Sep 2020 11:58:23 +0000 (11:58 +0000)]
Merge branch 'websocket-data-fed' into 'develop'
Federate data through persistent websocket connections
See merge request pleroma/pleroma!2408
Steven Fuchs [Fri, 18 Sep 2020 11:58:22 +0000 (11:58 +0000)]
Federate data through persistent websocket connections
Sergey Suprunenko [Thu, 17 Sep 2020 20:04:47 +0000 (22:04 +0200)]
Make WebPushEncryption use Pleroma.HTTP as an HTTP adapter
rinpatch [Thu, 17 Sep 2020 19:42:42 +0000 (19:42 +0000)]
Merge branch 'stable-sync/2.1.2' into 'develop'
Sync develop with 2.1.2
Closes #2133, #2131, and #2130
See merge request pleroma/pleroma!3007
Ivan Tashkinov [Thu, 17 Sep 2020 19:22:59 +0000 (22:22 +0300)]
Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy-nostream
# Conflicts:
# CHANGELOG.md
rinpatch [Thu, 17 Sep 2020 19:19:49 +0000 (22:19 +0300)]
Merge branch 'stable' into stable-sync/2.1.2
rinpatch [Thu, 17 Sep 2020 19:09:10 +0000 (19:09 +0000)]
Merge branch 'release/2.1.2' into 'stable'
Release/2.1.2
See merge request pleroma/secteam/pleroma!17
Haelwenn (lanodan) Monnier [Mon, 14 Sep 2020 12:07:22 +0000 (14:07 +0200)]
Fix MRF reject for ChatMessage
Haelwenn (lanodan) Monnier [Sat, 12 Sep 2020 10:05:36 +0000 (12:05 +0200)]
Create MRF.filter_pipeline to inject :object_data when present
Haelwenn (lanodan) Monnier [Mon, 14 Sep 2020 11:52:13 +0000 (13:52 +0200)]
KeywordPolicy: Still match when fields are absent
rinpatch [Thu, 17 Sep 2020 18:00:13 +0000 (21:00 +0300)]
rinpatch [Thu, 17 Sep 2020 17:40:52 +0000 (20:40 +0300)]
CHANGELOG.md: Add 2.1.2 entry
Haelwenn [Thu, 17 Sep 2020 17:59:38 +0000 (17:59 +0000)]
Merge branch 'omit-nondiscoverable-from-search' into 'develop'
User search should respect discoverable flag
See merge request pleroma/pleroma!2997
feld [Thu, 17 Sep 2020 16:54:53 +0000 (16:54 +0000)]
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
rinpatch [Thu, 17 Sep 2020 16:54:41 +0000 (19:54 +0300)]
mix.exs: bump version to 2.1.2
rinpatch [Thu, 10 Sep 2020 18:38:48 +0000 (18:38 +0000)]
Merge branch '2130-mfa-users-oauth-login-fix' into 'develop'
[#2130] Fixed OAuth OOB authentication for users with enabled MFA
Closes #2130
See merge request pleroma/pleroma!2979
rinpatch [Thu, 10 Sep 2020 18:40:54 +0000 (18:40 +0000)]
Merge branch 'fix/streaming-termination-errors' into 'develop'
Fix two pseudo-errors in websocket handler
Closes #2131
See merge request pleroma/pleroma!2982
Haelwenn [Tue, 15 Sep 2020 08:25:10 +0000 (08:25 +0000)]
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
lain [Tue, 15 Sep 2020 12:21:38 +0000 (12:21 +0000)]
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
rinpatch [Thu, 17 Sep 2020 12:13:36 +0000 (12:13 +0000)]
Merge branch 'bugfix/mrf-ingestion' into 'develop'
Bugfix: MRF and Pipeline Ingestion
See merge request pleroma/secteam/pleroma!15
stwf [Thu, 17 Sep 2020 16:32:40 +0000 (12:32 -0400)]
adapt to new user factory behavior
stwf [Thu, 17 Sep 2020 14:13:56 +0000 (10:13 -0400)]
add test and changelog entry
stwf [Mon, 14 Sep 2020 15:40:52 +0000 (11:40 -0400)]
User search respect discoverable flag
rinpatch [Mon, 14 Sep 2020 12:48:27 +0000 (12:48 +0000)]
Merge branch 'hotfix/rich-media-compile-error' into 'develop'
RichMedia: fix a compilation error due to nonexistent variable
See merge request pleroma/pleroma!2996
rinpatch [Mon, 14 Sep 2020 12:38:00 +0000 (12:38 +0000)]
Merge branch 'feat/rich-media-head' into 'develop'
RichMedia: Do a HEAD request to check content type/length
See merge request pleroma/pleroma!2995
feld [Thu, 17 Sep 2020 14:51:13 +0000 (14:51 +0000)]
Merge branch 'fix/configdb-migration-with-deprecated' into 'develop'
Deny ConfigDB migration when deprecated settings found
Closes #2148
See merge request pleroma/pleroma!3005
Mark Felder [Thu, 17 Sep 2020 14:32:50 +0000 (09:32 -0500)]
Deny ConfigDB migration when deprecated settings found
lain [Thu, 17 Sep 2020 14:20:03 +0000 (14:20 +0000)]
Merge branch 'nondiscoverable-user-metadata' into 'develop'
search indexing metadata should respect discoverable flag
See merge request pleroma/pleroma!2998
Ivan Tashkinov [Thu, 17 Sep 2020 14:14:20 +0000 (17:14 +0300)]
Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy-nostream
Ivan Tashkinov [Thu, 17 Sep 2020 14:13:40 +0000 (17:13 +0300)]
[#2497] Configurability of :min_content_length (preview proxy). Refactoring, documentation, tests.
rinpatch [Thu, 17 Sep 2020 14:13:24 +0000 (14:13 +0000)]
Merge branch 'fix/rich-media-log-spam-and-ttl-reset' into 'develop'
RichMedia: Fix log spam on failures and resetting TTL on cached errors
See merge request pleroma/pleroma!3006
lain [Thu, 17 Sep 2020 14:09:01 +0000 (14:09 +0000)]
Merge branch 'develop' into 'nondiscoverable-user-metadata'
# Conflicts:
# CHANGELOG.md
rinpatch [Thu, 17 Sep 2020 13:13:21 +0000 (16:13 +0300)]
RichMedia: Fix log spam on failures and resetting TTL on cached errors
eugenijm [Thu, 17 Sep 2020 13:54:38 +0000 (16:54 +0300)]
Return the file content for `GET /api/pleroma/admin/instance_document/:document_name`
stwf [Thu, 17 Sep 2020 13:48:17 +0000 (09:48 -0400)]
add description to changelog
eugenijm [Sun, 30 Aug 2020 12:15:14 +0000 (15:15 +0300)]
AdminAPI: Allow to modify Terms of Service and Instance Panel via Admin API
lain [Thu, 17 Sep 2020 11:56:30 +0000 (11:56 +0000)]
Merge branch 'chat-moderation' into 'develop'
Chat moderation MVP
See merge request pleroma/pleroma!2937
lain [Thu, 17 Sep 2020 11:37:25 +0000 (13:37 +0200)]
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.
lain [Thu, 17 Sep 2020 11:29:26 +0000 (13:29 +0200)]
Admin chat api tests: Small additions.
lain [Thu, 17 Sep 2020 11:26:04 +0000 (13:26 +0200)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma-chat-moderation
Ivan Tashkinov [Wed, 16 Sep 2020 19:30:42 +0000 (22:30 +0300)]
[#2497] Media preview proxy: misc. improvements (`static` param support, dynamic fifo pipe path), refactoring.
feld [Wed, 16 Sep 2020 16:12:22 +0000 (16:12 +0000)]
Merge branch 'chore/unused-import' into 'develop'
Remove unused import
See merge request pleroma/pleroma!3004
Mark Felder [Wed, 16 Sep 2020 15:56:42 +0000 (10:56 -0500)]
Remove unused import
rinpatch [Wed, 16 Sep 2020 15:47:07 +0000 (15:47 +0000)]
Merge branch '2144-empty-users' into 'develop'
User: Remote users don't need to be confirmed or approved
Closes #2144
See merge request pleroma/pleroma!3003
lain [Wed, 16 Sep 2020 15:29:16 +0000 (17:29 +0200)]
User: Remote users don't need to be confirmed or approved
rinpatch [Wed, 16 Sep 2020 15:10:20 +0000 (15:10 +0000)]
Merge branch 'feat/connection-worker-monitor-flush' into 'develop'
ConnectionPool Worker: use monitor flush instead of checking ref
See merge request pleroma/pleroma!3002
rinpatch [Wed, 16 Sep 2020 14:23:05 +0000 (17:23 +0300)]
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.
rinpatch [Wed, 16 Sep 2020 13:37:04 +0000 (13:37 +0000)]
Merge branch 'chores/mrf-loglevel' into 'develop'
Fetcher: Correctly return MRF reject reason
See merge request pleroma/pleroma!2990
rinpatch [Wed, 16 Sep 2020 13:36:27 +0000 (13:36 +0000)]
Merge branch 'features/validators-video' into 'develop'
Pipeline Ingestion: Video and Article
See merge request pleroma/pleroma!2908
lain [Wed, 16 Sep 2020 12:22:48 +0000 (12:22 +0000)]
Merge branch 'issue/2089' into 'develop'
[#2089] fix notifications
See merge request pleroma/pleroma!3000
Maksim Pechnikov [Wed, 16 Sep 2020 06:47:18 +0000 (09:47 +0300)]
RepoStreamer.chunk_stream -> Repo.chunk_stream
Maksim [Wed, 16 Sep 2020 03:18:50 +0000 (03:18 +0000)]
Apply 1 suggestion(s) to 1 file(s)
Ivan Tashkinov [Tue, 15 Sep 2020 17:29:39 +0000 (20:29 +0300)]
Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy-nostream
Maksim Pechnikov [Tue, 15 Sep 2020 12:32:49 +0000 (15:32 +0300)]
fixed tests
lain [Tue, 15 Sep 2020 12:21:38 +0000 (12:21 +0000)]
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
eugenijm [Tue, 15 Sep 2020 10:00:07 +0000 (13:00 +0300)]
Mastodon API: fix the public timeline returning an error when the `reply_visibility` parameter is set to `self` for an unauthenticated user
Haelwenn [Tue, 15 Sep 2020 08:25:10 +0000 (08:25 +0000)]
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
Mark Felder [Mon, 14 Sep 2020 22:11:08 +0000 (17:11 -0500)]
Move changelog entry to next patch
Mark Felder [Mon, 14 Sep 2020 22:06:42 +0000 (17:06 -0500)]
Ensure SimplePolicy's tags in string representation don't trip up the object validator
stwf [Mon, 14 Sep 2020 17:55:49 +0000 (13:55 -0400)]
fix credo warning
stwf [Mon, 14 Sep 2020 17:18:11 +0000 (13:18 -0400)]
search indexing metadata respects discoverable flag
Mark Felder [Mon, 14 Sep 2020 17:08:32 +0000 (12:08 -0500)]
Fixed Welcome chats with MRF Simple applied locally
Mark Felder [Mon, 14 Sep 2020 17:07:31 +0000 (12:07 -0500)]
Merge duplicate Changed sections
Mark Felder [Mon, 14 Sep 2020 17:06:08 +0000 (12:06 -0500)]
Validate Welcome Chat message works with Simple policy applied to local instance
rinpatch [Mon, 14 Sep 2020 15:19:09 +0000 (15:19 +0000)]
Merge branch 'remove/managed-config-option' into 'develop'
Remove `:managed_config` option.
Closes #2086
See merge request pleroma/pleroma!2983
rinpatch [Thu, 10 Sep 2020 12:00:19 +0000 (15:00 +0300)]
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
rinpatch [Mon, 14 Sep 2020 12:48:27 +0000 (12:48 +0000)]
Merge branch 'hotfix/rich-media-compile-error' into 'develop'
RichMedia: fix a compilation error due to nonexistent variable
See merge request pleroma/pleroma!2996
rinpatch [Mon, 14 Sep 2020 12:46:00 +0000 (15:46 +0300)]
RichMedia: fix a compilation error due to nonexistent variable
No idea why this passed Gitlab CI
rinpatch [Mon, 14 Sep 2020 12:38:00 +0000 (12:38 +0000)]
Merge branch 'feat/rich-media-head' into 'develop'
RichMedia: Do a HEAD request to check content type/length
See merge request pleroma/pleroma!2995
rinpatch [Mon, 14 Sep 2020 11:56:00 +0000 (11:56 +0000)]
Apply 1 suggestion(s) to 1 file(s)
rinpatch [Mon, 14 Sep 2020 11:45:58 +0000 (14:45 +0300)]
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).
rinpatch [Mon, 14 Sep 2020 11:44:25 +0000 (14:44 +0300)]
RichMedia parser: do not set a cache TTL for unchanging errors
Maksim Pechnikov [Mon, 14 Sep 2020 11:08:12 +0000 (14:08 +0300)]
added notification constraints
rinpatch [Mon, 14 Sep 2020 07:54:06 +0000 (07:54 +0000)]
Merge branch 'fix/2139-oban-migration' into 'develop'
Remove old workers in oban migrations
Closes #2139
See merge request pleroma/pleroma!2994
Alexander Strizhakov [Sun, 13 Sep 2020 07:04:50 +0000 (10:04 +0300)]
remove old workers in oban migrations
Haelwenn [Sat, 12 Sep 2020 08:26:41 +0000 (08:26 +0000)]
Merge branch 'weblate-pleroma-pleroma' into 'develop'
Translations update from Weblate
See merge request pleroma/pleroma!2991
Ivan Tashkinov [Sat, 12 Sep 2020 08:20:41 +0000 (11:20 +0300)]
[#2497] Media preview proxy: preview bypass for small images
(basing on Content-Length and Content-Type).
Ivan Tashkinov [Sat, 12 Sep 2020 07:33:42 +0000 (10:33 +0300)]
[#2497] Media preview proxy: redirecting to media proxy url in case of preview error or unsupported content type.
Mark Felder [Fri, 11 Sep 2020 21:59:45 +0000 (16:59 -0500)]
Ensure we only apply NSFW Simple policy on parsable objects
tarteka [Fri, 11 Sep 2020 18:24:59 +0000 (18:24 +0000)]
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/
feld [Fri, 11 Sep 2020 23:14:54 +0000 (23:14 +0000)]
Merge branch 'chore/docs-spelling' into 'develop'
Spelling nit
See merge request pleroma/pleroma!2993
Mark Felder [Fri, 11 Sep 2020 22:42:39 +0000 (17:42 -0500)]
Spelling
Reported by: trevoke
Alex Gleason [Fri, 11 Sep 2020 19:30:28 +0000 (14:30 -0500)]
Merge branch 'chat-moderation-stable' into chat-moderation
Alex Gleason [Fri, 11 Sep 2020 19:29:56 +0000 (14:29 -0500)]
Chat moderation: fix formatting
Alex Gleason [Fri, 11 Sep 2020 19:13:38 +0000 (14:13 -0500)]
Merge remote-tracking branch 'upstream/develop' into chat-moderation
Alex Gleason [Fri, 11 Sep 2020 19:00:34 +0000 (14:00 -0500)]
Chat moderation: add tests for unauthorized access
Alex Gleason [Thu, 10 Sep 2020 06:44:32 +0000 (01:44 -0500)]
Chat Moderation: use explicit `sender` and `recipient` fields
Alex Gleason [Wed, 2 Sep 2020 02:12:21 +0000 (21:12 -0500)]
Credo fix
Alex Gleason [Wed, 2 Sep 2020 01:56:42 +0000 (20:56 -0500)]
Docs: AdminAPI chat moderation
projects / akkoma / log