akkoma
4 years agoRemoved a space that was too much
Ilja [Mon, 22 Jun 2020 12:22:23 +0000 (14:22 +0200)]
Removed a space that was too much

4 years agoI forgot to git add some files, oops (should be squashed with MR)
Ilja [Mon, 22 Jun 2020 12:18:55 +0000 (14:18 +0200)]
I forgot to git add some files, oops (should be squashed with MR)

4 years agoFix 1586 Docs: provide a index.md
Ilja [Mon, 22 Jun 2020 12:13:30 +0000 (14:13 +0200)]
Fix 1586 Docs: provide a index.md

* I renamed the introduction.md to index.md
* I moved over the FE parts to an index file in the FE repo (will do an MR in the FE repo to actually add it)
* While I was at it, I also fixed some broken links

4 years agoMerge branch 'feature/1854-emoji-pagination' into 'develop'
lain [Mon, 22 Jun 2020 08:41:09 +0000 (08:41 +0000)]
Merge branch 'feature/1854-emoji-pagination' into 'develop'

Emoji and packs pagination

Closes #1854

See merge request pleroma/pleroma!2658

4 years agoMerge branch 'bugfix/mix.exs-version-dot-git-less' into 'develop'
lain [Sat, 20 Jun 2020 16:22:01 +0000 (16:22 +0000)]
Merge branch 'bugfix/mix.exs-version-dot-git-less' into 'develop'

mix.exs: version git-less (part 2, MacOS-compat)

See merge request pleroma/pleroma!2420

4 years agoApply suggestion to lib/pleroma/web/api_spec/operations/pleroma_emoji_pack_operation.ex
Alexander Strizhakov [Sat, 20 Jun 2020 10:59:08 +0000 (10:59 +0000)]
Apply suggestion to lib/pleroma/web/api_spec/operations/pleroma_emoji_pack_operation.ex

4 years agoMerge branch 'feature/support-bot-field-in-update-credentials' into 'develop'
lain [Sat, 20 Jun 2020 09:57:12 +0000 (09:57 +0000)]
Merge branch 'feature/support-bot-field-in-update-credentials' into 'develop'

Support 'bot' field in account update_credentials

Closes #1600 and #1467

See merge request pleroma/pleroma!2662

4 years agoMerge branch 'docs/attachment_links' into 'develop'
lain [Sat, 20 Jun 2020 09:56:04 +0000 (09:56 +0000)]
Merge branch 'docs/attachment_links' into 'develop'

cheatsheet.md: no_attachment_links → attachment_links

See merge request pleroma/pleroma!2664

4 years agoMerge branch 'cleanup/object-conversation' into 'develop'
lain [Sat, 20 Jun 2020 09:45:01 +0000 (09:45 +0000)]
Merge branch 'cleanup/object-conversation' into 'develop'

Stop filling conversation field on incoming objects (legacy, unused)

See merge request pleroma/pleroma!2663

4 years agoApply suggestion to lib/pleroma/web/api_spec/operations/pleroma_emoji_pack_operation.ex
lain [Sat, 20 Jun 2020 09:39:50 +0000 (09:39 +0000)]
Apply suggestion to lib/pleroma/web/api_spec/operations/pleroma_emoji_pack_operation.ex

4 years agocheatsheet.md: no_attachment_links → attachment_links
Haelwenn (lanodan) Monnier [Sat, 20 Jun 2020 09:39:06 +0000 (11:39 +0200)]
cheatsheet.md: no_attachment_links → attachment_links

4 years agofix for packs pagination
Alexander Strizhakov [Sat, 20 Jun 2020 07:56:28 +0000 (10:56 +0300)]
fix for packs pagination

4 years agoStop filling conversation field on incoming objects (legacy, unused)
Haelwenn (lanodan) Monnier [Thu, 18 Jun 2020 17:32:03 +0000 (19:32 +0200)]
Stop filling conversation field on incoming objects (legacy, unused)

conversation field is still set for outgoing federation for compatibility.

4 years agoMerge branch 'issue/1855' into 'develop'
feld [Fri, 19 Jun 2020 20:38:22 +0000 (20:38 +0000)]
Merge branch 'issue/1855' into 'develop'

#1855 MediaProxy cache invalidation via Admin API

See merge request pleroma/pleroma!2648

4 years agoOnly accounts with Service actor_type are considered as bots
Sergey Suprunenko [Fri, 19 Jun 2020 19:19:00 +0000 (21:19 +0200)]
Only accounts with Service actor_type are considered as bots

4 years agoAdd support for bot field in update_credentials
Sergey Suprunenko [Fri, 19 Jun 2020 19:18:07 +0000 (21:18 +0200)]
Add support for bot field in update_credentials

4 years agoMerge branch 'add-troubleshooting-info' into 'develop'
lain [Fri, 19 Jun 2020 14:26:43 +0000 (14:26 +0000)]
Merge branch 'add-troubleshooting-info' into 'develop'

README: Add some troubleshooting info for compilation issues.

See merge request pleroma/pleroma!2660

4 years agoREADME: Add some troubleshooting info for compilation issues.
lain [Fri, 19 Jun 2020 13:49:34 +0000 (15:49 +0200)]
README: Add some troubleshooting info for compilation issues.

4 years agoMerge branch '1873-pagination-fixes' into 'develop'
lain [Fri, 19 Jun 2020 13:42:57 +0000 (13:42 +0000)]
Merge branch '1873-pagination-fixes' into 'develop'

[#1873] :offset pagination param support, hashtags pagination

Closes #1873

See merge request pleroma/pleroma!2659

4 years agoMerge branch 'dry-up-follower-update' into 'develop'
lain [Fri, 19 Jun 2020 13:40:34 +0000 (13:40 +0000)]
Merge branch 'dry-up-follower-update' into 'develop'

User: update_follower_count refactor.

See merge request pleroma/pleroma!2649

4 years ago[#1873] Fixes missing :offset pagination param support. Added pagination support...
Ivan Tashkinov [Fri, 19 Jun 2020 13:14:06 +0000 (16:14 +0300)]
[#1873] Fixes missing :offset pagination param support. Added pagination support for hashtags search.

4 years agodefault page size for files
Alexander Strizhakov [Fri, 19 Jun 2020 11:46:38 +0000 (14:46 +0300)]
default page size for files

4 years agochangelog entry
Alexander Strizhakov [Fri, 19 Jun 2020 09:31:55 +0000 (12:31 +0300)]
changelog entry

4 years agoadding overall count for packs and files
Alexander Strizhakov [Fri, 19 Jun 2020 07:17:24 +0000 (10:17 +0300)]
adding overall count for packs and files

4 years agoemoji pagination for pack show action
Alexander Strizhakov [Thu, 18 Jun 2020 15:50:03 +0000 (18:50 +0300)]
emoji pagination for pack show action

4 years agoemoji packs pagination
Alexander Strizhakov [Thu, 18 Jun 2020 11:32:21 +0000 (14:32 +0300)]
emoji packs pagination

4 years agofix test
Maksim Pechnikov [Thu, 18 Jun 2020 02:02:33 +0000 (05:02 +0300)]
fix test

4 years agoChange references from "deleted_urls" to "banned_urls" as nothing is handled via...
Mark Felder [Wed, 17 Jun 2020 18:13:55 +0000 (13:13 -0500)]
Change references from "deleted_urls" to "banned_urls" as nothing is handled via media deletions anymore; all actions are manual operations by an admin to ban the url

4 years agoRemove misleading is_ prefix from boolean function
Mark Felder [Wed, 17 Jun 2020 18:02:01 +0000 (13:02 -0500)]
Remove misleading is_ prefix from boolean function

4 years agoEmpty list as default
Mark Felder [Wed, 17 Jun 2020 17:54:02 +0000 (12:54 -0500)]
Empty list as default

4 years agoMerge branch 'develop' into issue/1855
Mark Felder [Wed, 17 Jun 2020 17:50:06 +0000 (12:50 -0500)]
Merge branch 'develop' into issue/1855

4 years agoMerge branch 'fix/1787-mogrify-args' into 'develop'
lain [Wed, 17 Jun 2020 15:53:24 +0000 (15:53 +0000)]
Merge branch 'fix/1787-mogrify-args' into 'develop'

Moving custom ecto types in context folders

See merge request pleroma/pleroma!2652

4 years agoMerge branch 'fix/notification-type' into 'develop'
rinpatch [Wed, 17 Jun 2020 15:21:42 +0000 (15:21 +0000)]
Merge branch 'fix/notification-type' into 'develop'

Remove `poll` from `notification_type` OpenAPI spec

Closes #1867

See merge request pleroma/pleroma!2657

4 years agoRemove `poll` from `notification_type` OpenAPI spec
Egor Kislitsyn [Wed, 17 Jun 2020 14:47:59 +0000 (18:47 +0400)]
Remove `poll` from `notification_type` OpenAPI spec

4 years agoApply suggestion to test/web/media_proxy/invalidation_test.exs
Maksim [Wed, 17 Jun 2020 13:14:01 +0000 (13:14 +0000)]
Apply suggestion to test/web/media_proxy/invalidation_test.exs

4 years agoApply suggestion to lib/pleroma/web/media_proxy/invalidations/script.ex
Maksim [Wed, 17 Jun 2020 13:12:38 +0000 (13:12 +0000)]
Apply suggestion to lib/pleroma/web/media_proxy/invalidations/script.ex

4 years agoApply suggestion to lib/pleroma/web/media_proxy/invalidations/script.ex
Maksim [Wed, 17 Jun 2020 13:12:32 +0000 (13:12 +0000)]
Apply suggestion to lib/pleroma/web/media_proxy/invalidations/script.ex

4 years agoApply suggestion to test/web/media_proxy/media_proxy_controller_test.exs
Maksim [Wed, 17 Jun 2020 12:58:50 +0000 (12:58 +0000)]
Apply suggestion to test/web/media_proxy/media_proxy_controller_test.exs

4 years agoApply suggestion to test/web/media_proxy/invalidations/script_test.exs
Maksim [Wed, 17 Jun 2020 12:58:38 +0000 (12:58 +0000)]
Apply suggestion to test/web/media_proxy/invalidations/script_test.exs

4 years agoApply suggestion to test/web/media_proxy/invalidations/http_test.exs
Maksim [Wed, 17 Jun 2020 12:58:33 +0000 (12:58 +0000)]
Apply suggestion to test/web/media_proxy/invalidations/http_test.exs

4 years agoApply suggestion to test/web/admin_api/controllers/media_proxy_cache_controller_test.exs
Maksim [Wed, 17 Jun 2020 12:58:28 +0000 (12:58 +0000)]
Apply suggestion to test/web/admin_api/controllers/media_proxy_cache_controller_test.exs

4 years agoApply suggestion to test/web/admin_api/controllers/media_proxy_cache_controller_test.exs
Maksim [Wed, 17 Jun 2020 12:58:16 +0000 (12:58 +0000)]
Apply suggestion to test/web/admin_api/controllers/media_proxy_cache_controller_test.exs

4 years agoApply suggestion to test/web/admin_api/controllers/media_proxy_cache_controller_test.exs
Maksim [Wed, 17 Jun 2020 12:58:08 +0000 (12:58 +0000)]
Apply suggestion to test/web/admin_api/controllers/media_proxy_cache_controller_test.exs

4 years agoApply suggestion to lib/pleroma/web/media_proxy/invalidation.ex
Maksim [Wed, 17 Jun 2020 12:56:30 +0000 (12:56 +0000)]
Apply suggestion to lib/pleroma/web/media_proxy/invalidation.ex

4 years agoApply suggestion to docs/API/admin_api.md
Maksim [Wed, 17 Jun 2020 12:56:17 +0000 (12:56 +0000)]
Apply suggestion to docs/API/admin_api.md

4 years agoApply suggestion to docs/API/admin_api.md
Maksim [Wed, 17 Jun 2020 12:56:13 +0000 (12:56 +0000)]
Apply suggestion to docs/API/admin_api.md

4 years agoMerge branch 'features/users-raw_bio' into 'develop'
rinpatch [Wed, 17 Jun 2020 10:34:23 +0000 (10:34 +0000)]
Merge branch 'features/users-raw_bio' into 'develop'

User: Add raw_bio, storing unformatted bio

See merge request pleroma/pleroma!2326

4 years agocredo fix
Alexander Strizhakov [Wed, 17 Jun 2020 07:31:06 +0000 (10:31 +0300)]
credo fix

4 years agoMerge branch 'release/update-otp-elixir' into 'develop'
rinpatch [Wed, 17 Jun 2020 00:00:51 +0000 (00:00 +0000)]
Merge branch 'release/update-otp-elixir' into 'develop'

Update elixir image used for OTP releases

See merge request pleroma/pleroma!2654

4 years agoCHANGELOG.md: mention minimal elixir version update
rinpatch [Tue, 16 Jun 2020 23:29:32 +0000 (02:29 +0300)]
CHANGELOG.md: mention minimal elixir version update

4 years agoUpdate OTP releases to official images of 1.10.3
rinpatch [Tue, 16 Jun 2020 23:27:28 +0000 (02:27 +0300)]
Update OTP releases to official images of 1.10.3

This is necessary since we bumped required version of elixir to 1.9.

The dlsym bug should be gone by now.

4 years agoMerge branch 'hotfix/notification-migration' into 'develop'
lain [Tue, 16 Jun 2020 21:07:04 +0000 (21:07 +0000)]
Merge branch 'hotfix/notification-migration' into 'develop'

Chunk the notification type backfill migration

See merge request pleroma/pleroma!2653

4 years agoChunk the notification type backfill migration
rinpatch [Tue, 16 Jun 2020 20:45:59 +0000 (23:45 +0300)]
Chunk the notification type backfill migration

Long-term we want that migration to be done entirely in SQL,
but for now this is a hotfix to not cause OOMs on large databases.

This is using a homegrown version of `Repo.stream`, it's worse in
terms of performance than the upstream since it doesn't use the same
prepared query for chunk queries, but unlike the upstream it supports
preloads.

4 years agoMerge branch '1866-last-status-stuff' into 'develop'
Haelwenn [Tue, 16 Jun 2020 18:10:00 +0000 (18:10 +0000)]
Merge branch '1866-last-status-stuff' into 'develop'

Resolve "/api/v1/conversations returns the wrong `last_status`"

Closes #1866

See merge request pleroma/pleroma!2647

4 years agomoving custom ecto types in context folders
Alexander Strizhakov [Tue, 16 Jun 2020 14:50:33 +0000 (17:50 +0300)]
moving custom ecto types in context folders

4 years agoMerge branch 'elixir-1.9' into 'develop'
rinpatch [Tue, 16 Jun 2020 13:18:29 +0000 (13:18 +0000)]
Merge branch 'elixir-1.9' into 'develop'

Upgrade to Elixir 1.9

See merge request pleroma/pleroma!2651

4 years agoUpgrade to Elixir 1.9
Steven Fuchs [Tue, 16 Jun 2020 13:18:29 +0000 (13:18 +0000)]
Upgrade to Elixir 1.9

4 years agoMerge branch 'fix/1787-mogrify-args' into 'develop'
lain [Tue, 16 Jun 2020 13:17:52 +0000 (13:17 +0000)]
Merge branch 'fix/1787-mogrify-args' into 'develop'

Mogrify args in adminFE

Closes #1787

See merge request pleroma/pleroma!2616

4 years agonaming
Alexander Strizhakov [Sun, 31 May 2020 11:42:15 +0000 (14:42 +0300)]
naming

4 years agofix attemps to merge map
Alexander Strizhakov [Sun, 31 May 2020 10:25:04 +0000 (13:25 +0300)]
fix attemps to merge map

4 years agofix for updated hackney
Alexander Strizhakov [Sun, 31 May 2020 09:38:24 +0000 (12:38 +0300)]
fix for updated hackney

warning: :hackney_connect.partial_chain/1 is undefined or private

4 years agoMogrify args as custom tuples
Alexander Strizhakov [Sun, 31 May 2020 07:46:02 +0000 (10:46 +0300)]
Mogrify args as custom tuples

4 years agofixed a visibility of functions
Maksim Pechnikov [Mon, 15 Jun 2020 17:47:02 +0000 (20:47 +0300)]
fixed a visibility of functions

4 years agoMerge branch 'merge-ogp-twitter-parsers' into 'develop'
lain [Mon, 15 Jun 2020 12:41:48 +0000 (12:41 +0000)]
Merge branch 'merge-ogp-twitter-parsers' into 'develop'

Merge OGP parser with TwitterCard

Closes #1835

See merge request pleroma/pleroma!2642

4 years agoUser: update_follower_count refactor.
lain [Mon, 15 Jun 2020 12:29:34 +0000 (14:29 +0200)]
User: update_follower_count refactor.

4 years agoMerge branch 'develop' into issue/1855
Maksim Pechnikov [Mon, 15 Jun 2020 12:24:55 +0000 (15:24 +0300)]
Merge branch 'develop' into issue/1855

4 years agoupdate docs
Maksim Pechnikov [Mon, 15 Jun 2020 12:24:00 +0000 (15:24 +0300)]
update docs

4 years agoFix tests
Egor Kislitsyn [Mon, 15 Jun 2020 12:20:05 +0000 (16:20 +0400)]
Fix tests

4 years agoMerge remote-tracking branch 'origin/develop' into merge-ogp-twitter-parsers
Egor Kislitsyn [Mon, 15 Jun 2020 12:03:40 +0000 (16:03 +0400)]
Merge remote-tracking branch 'origin/develop' into merge-ogp-twitter-parsers

4 years agoadded tests
Maksim Pechnikov [Mon, 15 Jun 2020 11:55:00 +0000 (14:55 +0300)]
added tests

4 years agoChangelog: Add info about conversation view changes.
lain [Mon, 15 Jun 2020 10:30:11 +0000 (12:30 +0200)]
Changelog: Add info about conversation view changes.

4 years agoConversations: Return last dm for conversation, not last message.
lain [Mon, 15 Jun 2020 10:27:13 +0000 (12:27 +0200)]
Conversations: Return last dm for conversation, not last message.

4 years agoMerge branch 'notifications-filtering' into 'develop'
lain [Mon, 15 Jun 2020 07:57:58 +0000 (07:57 +0000)]
Merge branch 'notifications-filtering' into 'develop'

Mastodon API return full result set in notifications

See merge request pleroma/pleroma!2552

4 years agofix invalidates media url's
Maksim Pechnikov [Sun, 14 Jun 2020 18:02:57 +0000 (21:02 +0300)]
fix invalidates media url's

4 years agoMastodon API: ensure the notification endpoint doesn't return less than the requested...
eugenijm [Mon, 18 May 2020 15:46:04 +0000 (18:46 +0300)]
Mastodon API: ensure the notification endpoint doesn't return less than the requested amount of records unless it's the last page

4 years agoMerge branch '1851-favorites-pagination' into 'develop'
rinpatch [Sat, 13 Jun 2020 17:20:43 +0000 (17:20 +0000)]
Merge branch '1851-favorites-pagination' into 'develop'

StatusController: Correctly paginate favorites.

Closes #1851

See merge request pleroma/pleroma!2636

4 years agoControllerHelper: Always return id field.
lain [Sat, 13 Jun 2020 11:12:43 +0000 (13:12 +0200)]
ControllerHelper: Always return id field.

4 years agoApply suggestion to lib/pleroma/web/controller_helper.ex
lain [Sat, 13 Jun 2020 10:37:15 +0000 (10:37 +0000)]
Apply suggestion to lib/pleroma/web/controller_helper.ex

4 years agoRemove use of atoms in MRF.UserAllowListPolicy
href [Wed, 10 Jun 2020 15:34:23 +0000 (17:34 +0200)]
Remove use of atoms in MRF.UserAllowListPolicy

4 years agoFix atom leak in Rich Media Parser
Egor Kislitsyn [Tue, 9 Jun 2020 17:49:24 +0000 (21:49 +0400)]
Fix atom leak in Rich Media Parser

4 years agoMerge branch 'patch-1' into 'develop'
Haelwenn [Fri, 12 Jun 2020 21:46:16 +0000 (21:46 +0000)]
Merge branch 'patch-1' into 'develop'

Update pleroma.nginx to support TLSv1.3

See merge request pleroma/pleroma!2644

4 years agoMerge branch 'recipients-experiments' into 'develop'
Haelwenn [Fri, 12 Jun 2020 16:57:13 +0000 (16:57 +0000)]
Merge branch 'recipients-experiments' into 'develop'

ActivityPub: Don't show announces of your own objects in timeline.

See merge request pleroma/pleroma!2637

4 years agoReturn an empty map from Pleroma.Web.RichMedia.Parsers.OGP.parse/2
Egor Kislitsyn [Fri, 12 Jun 2020 14:37:32 +0000 (18:37 +0400)]
Return an empty map from Pleroma.Web.RichMedia.Parsers.OGP.parse/2

4 years agoMerge remote-tracking branch 'origin/develop' into merge-ogp-twitter-parsers
Egor Kislitsyn [Fri, 12 Jun 2020 14:25:29 +0000 (18:25 +0400)]
Merge remote-tracking branch 'origin/develop' into merge-ogp-twitter-parsers

4 years agoMerge branch 'global-status-expiration' into 'develop'
lain [Fri, 12 Jun 2020 14:14:09 +0000 (14:14 +0000)]
Merge branch 'global-status-expiration' into 'develop'

Global status expiration

See merge request pleroma/pleroma!2208

4 years agoApply suggestion to config/description.exs
lain [Fri, 12 Jun 2020 14:03:33 +0000 (14:03 +0000)]
Apply suggestion to config/description.exs

4 years agoMerge branch 'features/mix-task-reset-mfa' into 'develop'
feld [Fri, 12 Jun 2020 14:01:19 +0000 (14:01 +0000)]
Merge branch 'features/mix-task-reset-mfa' into 'develop'

New mix task: pleroma.user reset_mfa <nickname>

See merge request pleroma/pleroma!2643

4 years agoMerge branch 'chore/bump-changelog' into 'develop'
feld [Fri, 12 Jun 2020 13:55:13 +0000 (13:55 +0000)]
Merge branch 'chore/bump-changelog' into 'develop'

Add changelog entry for emoji pack reload command

See merge request pleroma/pleroma!2646

4 years agoDocument new mix task feature to reset mfa
Mark Felder [Fri, 12 Jun 2020 13:51:11 +0000 (08:51 -0500)]
Document new mix task feature to reset mfa

4 years agoMerge branch 'develop' into features/mix-task-reset-mfa
Mark Felder [Fri, 12 Jun 2020 13:43:50 +0000 (08:43 -0500)]
Merge branch 'develop' into features/mix-task-reset-mfa

4 years agoAdd changelog entry for emoji pack reload command
Mark Felder [Fri, 12 Jun 2020 13:42:23 +0000 (08:42 -0500)]
Add changelog entry for emoji pack reload command

4 years agoMerge branch 'feature/cli-reload-emoji' into 'develop'
lain [Fri, 12 Jun 2020 13:32:59 +0000 (13:32 +0000)]
Merge branch 'feature/cli-reload-emoji' into 'develop'

Add command to reload emoji packs from cli for OTP users

Closes #1814

See merge request pleroma/pleroma!2639

4 years agoMerge branch '1794-hashtags-construction-from-uri-fix' into 'develop'
feld [Fri, 12 Jun 2020 12:31:27 +0000 (12:31 +0000)]
Merge branch '1794-hashtags-construction-from-uri-fix' into 'develop'

[#1794] Fixes URI query handling for hashtags extraction in search

Closes #1794

See merge request pleroma/pleroma!2645

4 years agoadded admin api for MediaProxy cache invalidation
Maksim Pechnikov [Fri, 12 Jun 2020 11:49:54 +0000 (14:49 +0300)]
added admin api for MediaProxy cache invalidation

4 years ago[#1794] Fixes URI query handling for hashtags extraction in search.
Ivan Tashkinov [Fri, 12 Jun 2020 11:25:41 +0000 (14:25 +0300)]
[#1794] Fixes URI query handling for hashtags extraction in search.

4 years agoUpdate pleroma.nginx to support TLSv1.3
normandy [Fri, 12 Jun 2020 01:41:09 +0000 (01:41 +0000)]
Update pleroma.nginx to support TLSv1.3

Based on SSL config from https://ssl-config.mozilla.org/

4 years agoNew mix task: pleroma.user reset_mfa <nickname>
Haelwenn (lanodan) Monnier [Thu, 11 Jun 2020 20:54:39 +0000 (22:54 +0200)]
New mix task: pleroma.user reset_mfa <nickname>

4 years agoDeprecate Pleroma.Web.RichMedia.Parsers.OGP
Egor Kislitsyn [Thu, 11 Jun 2020 19:11:46 +0000 (23:11 +0400)]
Deprecate Pleroma.Web.RichMedia.Parsers.OGP

4 years agoMerge branch 'fix/csp-mediaproxy-base-url' into 'develop'
feld [Thu, 11 Jun 2020 16:18:06 +0000 (16:18 +0000)]
Merge branch 'fix/csp-mediaproxy-base-url' into 'develop'

HTTP security plug: add media proxy base url host to csp

See merge request pleroma/pleroma!2638

4 years agoCheck for media proxy base_url, not Upload base_url
Mark Felder [Thu, 11 Jun 2020 16:05:22 +0000 (11:05 -0500)]
Check for media proxy base_url, not Upload base_url