akkoma
3 years agoweb endpoint: Use Config.get directly instead of a tuple
Haelwenn (lanodan) Monnier [Fri, 4 Jun 2021 17:57:48 +0000 (19:57 +0200)]
web endpoint: Use Config.get directly instead of a tuple

Fixes a lot of warnings like the following while running the testsuite:

  warning: passing a {module, function, args} tuple to Plug.Parsers.MULTIPART is deprecated. Please see Plug.Parsers.MULTIPART module docs for better approaches to configuration

This might mean no more dynamic configuration but there seems to be the same limitation two lines underneath anyway.

3 years agoMerge branch 'fix/missing-deprecation' into 'develop'
feld [Fri, 4 Jun 2021 17:37:30 +0000 (17:37 +0000)]
Merge branch 'fix/missing-deprecation' into 'develop'

Add missing deprecation warning left out of !2842

See merge request pleroma/pleroma!3444

3 years agoMerge branch 'bugfix/erlang-24' into 'develop'
feld [Fri, 4 Jun 2021 17:36:36 +0000 (17:36 +0000)]
Merge branch 'bugfix/erlang-24' into 'develop'

Erlang 24 compatibility

Closes #2647

See merge request pleroma/pleroma!3405

3 years agoAdd missing deprecation warning left out of !2842
Mark Felder [Fri, 4 Jun 2021 17:30:10 +0000 (12:30 -0500)]
Add missing deprecation warning left out of !2842

3 years agoMIME.valid?(type) → is_bitstring(type) && MIME.extensions(type) != []
Haelwenn (lanodan) Monnier [Mon, 31 May 2021 08:41:31 +0000 (10:41 +0200)]
MIME.valid?(type) → is_bitstring(type) && MIME.extensions(type) != []

Since mime 1.6.0:

  warning: MIME.valid?/1 is deprecated. Use MIME.extensions(type) != [] instead

As for the bitstring(type) part it's because MIME.extensions only expects a string.
https://github.com/elixir-plug/mime/issues/43

3 years agorequest_builder_test: mode :read got removed
Haelwenn (lanodan) Monnier [Mon, 31 May 2021 08:14:12 +0000 (10:14 +0200)]
request_builder_test: mode :read got removed

3 years agofactory: Fix article_factory
Haelwenn (lanodan) Monnier [Mon, 31 May 2021 08:06:06 +0000 (10:06 +0200)]
factory: Fix article_factory

3 years agomix: Update pot to ~> 1.0
Haelwenn (lanodan) Monnier [Sat, 22 May 2021 16:04:13 +0000 (18:04 +0200)]
mix: Update pot to ~> 1.0

3 years agomix.exs: Apply OTP24 fixes to web_push_encryption
Haelwenn (lanodan) Monnier [Sat, 22 May 2021 15:55:40 +0000 (17:55 +0200)]
mix.exs: Apply OTP24 fixes to web_push_encryption

3 years agomix: Update dependencies
Haelwenn (lanodan) Monnier [Sat, 22 May 2021 15:48:35 +0000 (17:48 +0200)]
mix: Update dependencies

3 years agomedia_proxy: switch from :crypto.hmac to :crypto.mac
Haelwenn (lanodan) Monnier [Sat, 15 May 2021 11:15:02 +0000 (13:15 +0200)]
media_proxy: switch from :crypto.hmac to :crypto.mac

3 years agomix: Switch hackney & gun to releases
Haelwenn (lanodan) Monnier [Sat, 15 May 2021 11:08:00 +0000 (13:08 +0200)]
mix: Switch hackney & gun to releases

3 years agoUpdate all dependencies
Haelwenn (lanodan) Monnier [Sat, 15 May 2021 10:40:37 +0000 (12:40 +0200)]
Update all dependencies

3 years agoMerge branch 'chore/rename-chat' into 'develop'
Haelwenn [Thu, 3 Jun 2021 15:52:16 +0000 (15:52 +0000)]
Merge branch 'chore/rename-chat' into 'develop'

Rename the non-federating Chat feature to Shout

See merge request pleroma/pleroma!2842

3 years agoMerge branch 'chore/cicd_skip_nonsense' into 'develop'
rinpatch [Wed, 2 Jun 2021 17:18:10 +0000 (17:18 +0000)]
Merge branch 'chore/cicd_skip_nonsense' into 'develop'

Skip CI/CD automatically under certain conditions

See merge request pleroma/pleroma!3439

3 years agoDon't generate new specs unless they've changed.
Mark Felder [Wed, 2 Jun 2021 17:09:41 +0000 (12:09 -0500)]
Don't generate new specs unless they've changed.

3 years agoSkip build, test, analysis/lint when we don't make code changes
Mark Felder [Wed, 2 Jun 2021 17:00:45 +0000 (12:00 -0500)]
Skip build, test, analysis/lint when we don't make code changes

3 years agoMerge branch 'Snow-develop-patch-01683' into 'develop'
feld [Wed, 2 Jun 2021 16:53:37 +0000 (16:53 +0000)]
Merge branch 'Snow-develop-patch-01683' into 'develop'

Update docs/description for allow_relay

See merge request pleroma/pleroma!3438

3 years agoUpdate wording for relays in docs and config description
Mark Felder [Wed, 2 Jun 2021 16:26:26 +0000 (11:26 -0500)]
Update wording for relays in docs and config description

3 years agoFormatting
Mark Felder [Wed, 2 Jun 2021 16:21:04 +0000 (11:21 -0500)]
Formatting

3 years agoMerge branch 'cycles-email' into 'develop'
feld [Wed, 2 Jun 2021 16:11:49 +0000 (16:11 +0000)]
Merge branch 'cycles-email' into 'develop'

Recompilation speedup: Avoid `use Phoenix.Swoosh` to prevent recompiling the Endpoint

See merge request pleroma/pleroma!3436

3 years agodisableChat / disableShout didn't actually do anything for PleromaFE
Mark Felder [Tue, 1 Jun 2021 21:53:32 +0000 (16:53 -0500)]
disableChat / disableShout didn't actually do anything for PleromaFE

3 years agoMerge remote-tracking branch 'pleroma/develop' into cycles-email
Alex Gleason [Tue, 1 Jun 2021 21:17:43 +0000 (16:17 -0500)]
Merge remote-tracking branch 'pleroma/develop' into cycles-email

3 years agoAvoid `use Phoenix.Swoosh` to prevent recompiling the Endpoint
Alex Gleason [Sat, 22 May 2021 19:48:13 +0000 (14:48 -0500)]
Avoid `use Phoenix.Swoosh` to prevent recompiling the Endpoint
Speeds up recompilation by fixing cycles in UserEmail

3 years agoMerge branch 'cycles-streaming' into 'develop'
feld [Tue, 1 Jun 2021 19:41:37 +0000 (19:41 +0000)]
Merge branch 'cycles-streaming' into 'develop'

Recompilation speedup: Remove deps from Streaming/Persisting behaviors

See merge request pleroma/pleroma!3434

3 years agoMerge branch 'cycles-uploader' into 'develop'
feld [Tue, 1 Jun 2021 19:39:36 +0000 (19:39 +0000)]
Merge branch 'cycles-uploader' into 'develop'

Recompilation speedup: Remove deps from Uploader behaviour

See merge request pleroma/pleroma!3435

3 years agoKeep original Shoutbox channel name as chat:public
Mark Felder [Tue, 1 Jun 2021 19:34:13 +0000 (14:34 -0500)]
Keep original Shoutbox channel name as chat:public
There is no sane / high level workaround for merging users who join shout:public and chat:public.

3 years agoMerge remote-tracking branch 'pleroma/develop' into cycles-uploader
Alex Gleason [Tue, 1 Jun 2021 19:20:31 +0000 (14:20 -0500)]
Merge remote-tracking branch 'pleroma/develop' into cycles-uploader

3 years agoRemove deps from Uploader behaviour
Alex Gleason [Sat, 22 May 2021 20:30:14 +0000 (15:30 -0500)]
Remove deps from Uploader behaviour
Speeds up recompilation by limiting compile-time deps

3 years agoMerge remote-tracking branch 'pleroma/develop' into cycles-streaming
Alex Gleason [Tue, 1 Jun 2021 18:56:40 +0000 (13:56 -0500)]
Merge remote-tracking branch 'pleroma/develop' into cycles-streaming

3 years agoRemove deps from Streaming/Persisting behaviors
Alex Gleason [Tue, 1 Jun 2021 18:55:07 +0000 (13:55 -0500)]
Remove deps from Streaming/Persisting behaviors
Speeds up recompilation by limiting compile-time deps

3 years agoAdd "chat" back as a feature for backwards compat.
Mark Felder [Tue, 1 Jun 2021 17:57:18 +0000 (12:57 -0500)]
Add "chat" back as a feature for backwards compat.

Legacy PleromaFE uses this to identify if ShoutBox is available.

3 years agoWire up join requests to the old "chat:public" channel into the new "shout:public...
Mark Felder [Tue, 1 Jun 2021 16:55:51 +0000 (11:55 -0500)]
Wire up join requests to the old "chat:public" channel into the new "shout:public" channel

3 years agoForgot to move migration test when rebasing
Mark Felder [Fri, 28 May 2021 19:10:37 +0000 (14:10 -0500)]
Forgot to move migration test when rebasing

3 years agoWe want clear_config/2 in all tests now
Mark Felder [Thu, 20 May 2021 19:30:29 +0000 (14:30 -0500)]
We want clear_config/2 in all tests now

3 years agoUpdate test for RenameInstanceChat migration
Roman Chvanikov [Fri, 7 Aug 2020 09:18:55 +0000 (12:18 +0300)]
Update test for RenameInstanceChat migration

3 years agoAdd RenameInstanceChat migration
Roman Chvanikov [Fri, 7 Aug 2020 09:18:36 +0000 (12:18 +0300)]
Add RenameInstanceChat migration

3 years agoAdd a test for the migration
Mark Felder [Thu, 6 Aug 2020 21:37:17 +0000 (16:37 -0500)]
Add a test for the migration

3 years agoUpdate description file for new shout config setting location
Mark Felder [Tue, 4 Aug 2020 15:45:28 +0000 (10:45 -0500)]
Update description file for new shout config setting location

3 years agoMove shout configuration from :instance, update docs and changelog
Mark Felder [Tue, 4 Aug 2020 15:42:52 +0000 (10:42 -0500)]
Move shout configuration from :instance, update docs and changelog

3 years agoMore confusingly named legacy chat code renamed to shout
Mark Felder [Mon, 3 Aug 2020 23:41:49 +0000 (18:41 -0500)]
More confusingly named legacy chat code renamed to shout

3 years agoEnsure we actually start ShoutChannel
Mark Felder [Mon, 3 Aug 2020 23:34:58 +0000 (18:34 -0500)]
Ensure we actually start ShoutChannel

3 years agoUpdate PleromaFE settings for the old chat box
Mark Felder [Mon, 3 Aug 2020 23:00:16 +0000 (18:00 -0500)]
Update PleromaFE settings for the old chat box

3 years agoJust call it shout
Mark Felder [Mon, 3 Aug 2020 22:58:27 +0000 (17:58 -0500)]
Just call it shout

3 years agoRename the non-federating Chat feature to Shout
Mark Felder [Mon, 3 Aug 2020 22:08:35 +0000 (17:08 -0500)]
Rename the non-federating Chat feature to Shout

3 years agoMerge branch 'cycles-constants' into 'develop'
feld [Tue, 1 Jun 2021 16:43:51 +0000 (16:43 +0000)]
Merge branch 'cycles-constants' into 'develop'

Recompilation speedup: move as_local_public/0 into ActivityPub.Utils

See merge request pleroma/pleroma!3431

3 years agoMerge remote-tracking branch 'pleroma/develop' into cycles-constants
Alex Gleason [Tue, 1 Jun 2021 16:32:30 +0000 (11:32 -0500)]
Merge remote-tracking branch 'pleroma/develop' into cycles-constants

3 years agoMerge branch 'cycles-frontend-static' into 'develop'
feld [Tue, 1 Jun 2021 16:19:41 +0000 (16:19 +0000)]
Merge branch 'cycles-frontend-static' into 'develop'

Recompilation speedup: make Router a runtime dep of FrontendStatic

See merge request pleroma/pleroma!3429

3 years agoMerge branch 'cycles-base-url' into 'develop'
feld [Tue, 1 Jun 2021 16:15:27 +0000 (16:15 +0000)]
Merge branch 'cycles-base-url' into 'develop'

Deprecate Pleroma.Web.base_url/0

See merge request pleroma/pleroma!3432

3 years agoMerge branch 'features/validators-note' into 'develop'
Haelwenn [Tue, 1 Jun 2021 01:51:38 +0000 (01:51 +0000)]
Merge branch 'features/validators-note' into 'develop'

Pipeline Ingestion: Note

Closes #290

See merge request pleroma/pleroma!2984

3 years agoMerge remote-tracking branch 'pleroma/develop' into cycles-base-url
Alex Gleason [Mon, 31 May 2021 21:49:46 +0000 (16:49 -0500)]
Merge remote-tracking branch 'pleroma/develop' into cycles-base-url

3 years agoDeprecate Pleroma.Web.base_url/0
Alex Gleason [Mon, 31 May 2021 20:09:11 +0000 (15:09 -0500)]
Deprecate Pleroma.Web.base_url/0
Use Pleroma.Web.Endpoint.url/0 directly instead. Reduces compiler cycles.

3 years agoPleroma.Constants.as_local_public/0 --> Pleroma.Web.ActivityPub.Utils.as_local_public/0
Alex Gleason [Mon, 31 May 2021 18:39:15 +0000 (13:39 -0500)]
Pleroma.Constants.as_local_public/0 --> Pleroma.Web.ActivityPub.Utils.as_local_public/0
Move as_local_public/0 to stop making modules depend on Web at compile-time

3 years agoMerge branch 'docs/goto-libera' into 'develop'
Haelwenn [Mon, 31 May 2021 17:42:36 +0000 (17:42 +0000)]
Merge branch 'docs/goto-libera' into 'develop'

Changing references of freenode to libera.chat

See merge request pleroma/pleroma!3415

3 years agoChanging references of freenode to libera.chat
Haelwenn (lanodan) Monnier [Wed, 26 May 2021 04:14:45 +0000 (06:14 +0200)]
Changing references of freenode to libera.chat

3 years agoMerge branch 'weblate-pleroma-pleroma' into 'develop'
Haelwenn [Mon, 31 May 2021 14:40:46 +0000 (14:40 +0000)]
Merge branch 'weblate-pleroma-pleroma' into 'develop'

Translations update from Weblate

See merge request pleroma/pleroma!3373

3 years agoMerge commit '07fed0fda2473fc4e1e3b01e863217391fd2902f'; commit 'e3173a279dad89dfce6e...
Alex Gleason [Sun, 30 May 2021 17:58:24 +0000 (12:58 -0500)]
Merge commit '07fed0fda2473fc4e1e3b01e863217391fd2902f'; commit 'e3173a279dad89dfce6eae89368ad3ba180c0490'; commit '21787546c01069d1d1d8261f0bc37d13a73122a9'; commit 'fda34591cefad94277385311c6391d1ca2adb36c'; commit '0ada3fe823a3c2e6c5835431bdacfbdb8b3d02a7'; commit '32d263cb905dd7fffd43a4955295af0b2b378537'; commit 'c9e4200ed2167772294fceb4f282979b5ea04981'; commit '3ff9c5e2a67ab83c2abdb14cd246dea059079e75'; commit 'fa543a936124abee524f9a103c17d2601176dcd4'; commit 'c23b81e399d5be6fc30f4acb1d757d5eb291d8e1' into cycles-phase-1

3 years agoTranslated using Weblate (Chinese (Traditional))
Snow [Tue, 11 May 2021 01:39:31 +0000 (01:39 +0000)]
Translated using Weblate (Chinese (Traditional))

Currently translated at 5.6% (6 of 106 strings)

Translation: Pleroma/Pleroma backend
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/zh_Hant/

3 years agoTranslated using Weblate (Chinese (Traditional))
Snow [Thu, 25 Mar 2021 06:35:52 +0000 (06:35 +0000)]
Translated using Weblate (Chinese (Traditional))

Currently translated at 0.9% (1 of 106 strings)

Translation: Pleroma/Pleroma backend
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/zh_Hant/

3 years agoAdded translation using Weblate (Chinese (Traditional))
Snow [Mon, 15 Mar 2021 15:10:17 +0000 (15:10 +0000)]
Added translation using Weblate (Chinese (Traditional))

3 years agoMerge branch 'ffmpeg' into 'develop'
Haelwenn [Sun, 30 May 2021 17:42:48 +0000 (17:42 +0000)]
Merge branch 'ffmpeg' into 'develop'

Add ffmpeg to docker image

See merge request pleroma/pleroma!3428

3 years agoMerge remote-tracking branch 'pleroma/develop' into cycles-frontend-static
Alex Gleason [Sun, 30 May 2021 17:12:58 +0000 (12:12 -0500)]
Merge remote-tracking branch 'pleroma/develop' into cycles-frontend-static

3 years agoFrontendStatic: make Router a runtime dep
Alex Gleason [Fri, 21 May 2021 22:37:34 +0000 (17:37 -0500)]
FrontendStatic: make Router a runtime dep
Speeds up recompilation by removing compile-time cycles

3 years agoAdd ffmpeg
shibao [Sun, 30 May 2021 14:27:58 +0000 (10:27 -0400)]
Add ffmpeg

3 years agoMerge branch 'cycles-views' into 'develop'
feld [Sat, 29 May 2021 21:50:07 +0000 (21:50 +0000)]
Merge branch 'cycles-views' into 'develop'

Recompilation speedup: Create real Views for all Controllers

See merge request pleroma/pleroma!3425

3 years agoMerge branch 'cycles-html' into 'develop'
feld [Sat, 29 May 2021 21:19:25 +0000 (21:19 +0000)]
Merge branch 'cycles-html' into 'develop'

Recompilation speedup: Break out activity-specific HTML functions into Pleroma.Activity.HTML

See merge request pleroma/pleroma!3426

3 years agoMerge branch 'cycles-gun' into 'develop'
feld [Sat, 29 May 2021 21:16:57 +0000 (21:16 +0000)]
Merge branch 'cycles-gun' into 'develop'

Recompilation speedup: use runtime deps in Pleroma.Gun

See merge request pleroma/pleroma!3422

3 years agoMerge branch 'cycles-config' into 'develop'
feld [Sat, 29 May 2021 19:20:47 +0000 (19:20 +0000)]
Merge branch 'cycles-config' into 'develop'

Recompilation speedup: use runtime deps in Pleroma.Config

See merge request pleroma/pleroma!3424

3 years agoMerge branch 'cycles-pipeline' into 'develop'
feld [Sat, 29 May 2021 19:16:06 +0000 (19:16 +0000)]
Merge branch 'cycles-pipeline' into 'develop'

Recompilation speedup: switch to runtime deps in ActivityPub.Pipeline

See merge request pleroma/pleroma!3427

3 years agoMerge remote-tracking branch 'pleroma/develop' into cycles-pipeline
Alex Gleason [Sat, 29 May 2021 18:32:57 +0000 (13:32 -0500)]
Merge remote-tracking branch 'pleroma/develop' into cycles-pipeline

3 years agoActivityPub.Pipeline: switch to runtime deps
Alex Gleason [Fri, 21 May 2021 21:58:20 +0000 (16:58 -0500)]
ActivityPub.Pipeline: switch to runtime deps
Speed up recompilation by breaking compile-time cycles

3 years agoMerge remote-tracking branch 'pleroma/develop' into cycles-html
Alex Gleason [Sat, 29 May 2021 17:29:58 +0000 (12:29 -0500)]
Merge remote-tracking branch 'pleroma/develop' into cycles-html

3 years agoBreak out activity-specific HTML functions into Pleroma.Activity.HTML
Alex Gleason [Sat, 22 May 2021 21:44:51 +0000 (16:44 -0500)]
Break out activity-specific HTML functions into Pleroma.Activity.HTML
Fixes cycles in lib/pleroma/ecto_type/activity_pub/object_validators/safe_text.ex

3 years agoMerge remote-tracking branch 'pleroma/develop' into cycles-views
Alex Gleason [Sat, 29 May 2021 17:17:24 +0000 (12:17 -0500)]
Merge remote-tracking branch 'pleroma/develop' into cycles-views

3 years agoCreate real Views for all Controllers
Alex Gleason [Sat, 22 May 2021 19:59:12 +0000 (14:59 -0500)]
Create real Views for all Controllers
This makes views depend on each other at runtime instead of compile-time

3 years agoMerge remote-tracking branch 'pleroma/develop' into cycles-plugs
Alex Gleason [Sat, 29 May 2021 17:01:37 +0000 (12:01 -0500)]
Merge remote-tracking branch 'pleroma/develop' into cycles-plugs

3 years agoConfig: use runtime deps instead of module attributes
Alex Gleason [Fri, 21 May 2021 18:04:57 +0000 (13:04 -0500)]
Config: use runtime deps instead of module attributes
Speeds up recompilation time by breaking compile-time cycles

3 years agoMerge remote-tracking branch 'pleroma/develop' into cycles-gun
Alex Gleason [Sat, 29 May 2021 16:35:57 +0000 (11:35 -0500)]
Merge remote-tracking branch 'pleroma/develop' into cycles-gun

3 years agoGun: use runtime deps in ConnectionPool
Alex Gleason [Fri, 21 May 2021 17:31:28 +0000 (12:31 -0500)]
Gun: use runtime deps in ConnectionPool
Speed up recompilation time by breaking compile-time cycles

3 years agoGun: make Gun.API a runtime dep
Alex Gleason [Thu, 20 May 2021 22:23:02 +0000 (17:23 -0500)]
Gun: make Gun.API a runtime dep
Speed up recompilation by breaking a compile-time cycle

3 years agoAdding description
Snow [Sat, 29 May 2021 02:22:33 +0000 (02:22 +0000)]
Adding description

3 years agoMerge branch 'cycles-router-api-routes' into 'develop'
feld [Fri, 28 May 2021 19:06:49 +0000 (19:06 +0000)]
Merge branch 'cycles-router-api-routes' into 'develop'

Recompilation speedup: Pleroma.Web.get_api_routes/0 --> Pleroma.Web.Router.get_api_routes/0

See merge request pleroma/pleroma!3419

3 years agoMerge branch 'simplepolicy-announce-leak' into 'develop'
feld [Fri, 28 May 2021 19:05:13 +0000 (19:05 +0000)]
Merge branch 'simplepolicy-announce-leak' into 'develop'

SimplePolicy: filter nested objects, fixes #2582

Closes #2582

See merge request pleroma/pleroma!3376

3 years agoMerge branch 'gitignore-runtime-exs' into 'develop'
feld [Fri, 28 May 2021 19:02:15 +0000 (19:02 +0000)]
Merge branch 'gitignore-runtime-exs' into 'develop'

gitignore runtime.exs

See merge request pleroma/pleroma!3407

3 years agoMerge branch 'alias-router-helpers' into 'develop'
feld [Fri, 28 May 2021 19:01:47 +0000 (19:01 +0000)]
Merge branch 'alias-router-helpers' into 'develop'

Switch to aliasing `Router.Helpers` instead of importing

See merge request pleroma/pleroma!3409

3 years agoMerge branch 'plug-runtime-dev' into 'develop'
feld [Fri, 28 May 2021 18:57:45 +0000 (18:57 +0000)]
Merge branch 'plug-runtime-dev' into 'develop'

Put Plugs in runtime mode in :dev, :test to speed up recompilation

See merge request pleroma/pleroma!3411

3 years agoMerge remote-tracking branch 'pleroma/develop' into cycles-router-api-routes
Alex Gleason [Fri, 28 May 2021 18:51:21 +0000 (13:51 -0500)]
Merge remote-tracking branch 'pleroma/develop' into cycles-router-api-routes

3 years agoPleroma.Web.get_api_routes/0 --> Pleroma.Web.Router.get_api_routes/0
Alex Gleason [Fri, 21 May 2021 19:47:11 +0000 (14:47 -0500)]
Pleroma.Web.get_api_routes/0 --> Pleroma.Web.Router.get_api_routes/0
Reduce recompilation time by breaking compile-time cycles

3 years agoMerge branch 'cycles-router' into 'develop'
feld [Fri, 28 May 2021 18:24:33 +0000 (18:24 +0000)]
Merge branch 'cycles-router' into 'develop'

Recompilation speedup: move StaticFEPlug to a pipeline

See merge request pleroma/pleroma!3417

3 years agoMerge branch 'cycles-router-mediaproxy' into 'develop'
feld [Fri, 28 May 2021 18:22:27 +0000 (18:22 +0000)]
Merge branch 'cycles-router-mediaproxy' into 'develop'

Recompilation speedup: don't make MediaProxy be a compile-dep of Router

See merge request pleroma/pleroma!3418

3 years agoMerge remote-tracking branch 'pleroma/develop' into cycles-router-mediaproxy
Alex Gleason [Fri, 28 May 2021 18:08:23 +0000 (13:08 -0500)]
Merge remote-tracking branch 'pleroma/develop' into cycles-router-mediaproxy

3 years agoDon't make MediaProxy be a compile-dep of Router
Alex Gleason [Sat, 22 May 2021 20:04:05 +0000 (15:04 -0500)]
Don't make MediaProxy be a compile-dep of Router
Speeds up recompilation by removing MediaProxy as a compile-time dep of Router

3 years agoMerge remote-tracking branch 'pleroma/develop' into cycles-router
Alex Gleason [Fri, 28 May 2021 17:44:16 +0000 (12:44 -0500)]
Merge remote-tracking branch 'pleroma/develop' into cycles-router

3 years agoRouter: move StaticFEPlug to a pipeline
Alex Gleason [Sun, 23 May 2021 22:25:18 +0000 (17:25 -0500)]
Router: move StaticFEPlug to a pipeline
Speed up recompilation by breaking a cycle. Removes StaticFEPlug as a compile-time dep of Router.

3 years agoMerge branch 'featured-totalItems' into 'develop'
Haelwenn [Thu, 27 May 2021 21:01:54 +0000 (21:01 +0000)]
Merge branch 'featured-totalItems' into 'develop'

Add missing totalItems field for featured collections

See merge request pleroma/pleroma!3416

3 years agoMissing entry for pinned posts federation from MR !3312
Mark Felder [Thu, 27 May 2021 17:20:21 +0000 (12:20 -0500)]
Missing entry for pinned posts federation from MR !3312

3 years agoProvide totalItems field for featured collections
Mark Felder [Thu, 27 May 2021 17:04:42 +0000 (12:04 -0500)]
Provide totalItems field for featured collections

3 years agoMerge branch 'feat/expose_email_to_self' into 'develop'
Haelwenn [Wed, 26 May 2021 18:04:23 +0000 (18:04 +0000)]
Merge branch 'feat/expose_email_to_self' into 'develop'

Expose user email address to user/owner; not publicly.

See merge request pleroma/pleroma!3412

3 years agoMerge branch 'mix_config_deprecation' into 'develop'
Haelwenn [Sat, 22 May 2021 15:46:02 +0000 (15:46 +0000)]
Merge branch 'mix_config_deprecation' into 'develop'

Switch from the deprecated "use Mix.config" to "import Config"

See merge request pleroma/pleroma!3413

3 years agoSwitch from the deprecated "use Mix.config" to "import Config"
Mark Felder [Thu, 20 May 2021 18:55:37 +0000 (13:55 -0500)]
Switch from the deprecated "use Mix.config" to "import Config"