akkoma
4 years agodon't fail on url fetch
Alexander Strizhakov [Tue, 1 Sep 2020 16:12:45 +0000 (19:12 +0300)]
don't fail on url fetch

4 years agoMerge branch 'fix/static-fe-nil-bio-crash' into 'develop'
lain [Tue, 1 Sep 2020 09:32:01 +0000 (09:32 +0000)]
Merge branch 'fix/static-fe-nil-bio-crash' into 'develop'

User table: ensure bio is always a string

Closes #2067

See merge request pleroma/pleroma!2938

4 years agoUser table: ensure bio is always a string
rinpatch [Tue, 1 Sep 2020 06:25:32 +0000 (09:25 +0300)]
User table: ensure bio is always a string

Gets rid of '|| ""' in multiple places and fixes #2067

4 years agoapplication.ex: disable warnings_as_errors at runtime
rinpatch [Tue, 1 Sep 2020 06:08:54 +0000 (09:08 +0300)]
application.ex: disable warnings_as_errors at runtime

see changed files for rationale

4 years agoMerge branch 'chat-relation-constraints' into 'develop'
Haelwenn [Mon, 31 Aug 2020 20:55:05 +0000 (20:55 +0000)]
Merge branch 'chat-relation-constraints' into 'develop'

Chats: Add cascading delete on both referenced users.

See merge request pleroma/pleroma!2934

4 years agoChats: Add cascading delete on both referenced users.
lain [Mon, 31 Aug 2020 14:48:17 +0000 (16:48 +0200)]
Chats: Add cascading delete on both referenced users.

Also remove the now-superfluous join in the chat controller,
which was only used to filter out these cases.

4 years agoMerge branch 'issue/2068' into 'develop'
lain [Mon, 31 Aug 2020 09:21:02 +0000 (09:21 +0000)]
Merge branch 'issue/2068' into 'develop'

[#2068] marks notifications as read after mute

Closes #2068

See merge request pleroma/pleroma!2930

4 years agoNotification: Small refactor.
lain [Mon, 31 Aug 2020 09:02:54 +0000 (11:02 +0200)]
Notification: Small refactor.

4 years agoMerge branch 'chore/fast-sanitize-bump' into 'develop'
rinpatch [Mon, 31 Aug 2020 07:22:35 +0000 (07:22 +0000)]
Merge branch 'chore/fast-sanitize-bump' into 'develop'

mix.lock: bump fast_sanitize

See merge request pleroma/pleroma!2932

4 years agomix.lock: bump fast_sanitize
rinpatch [Mon, 31 Aug 2020 06:54:16 +0000 (09:54 +0300)]
mix.lock: bump fast_sanitize

The update brings a better error message for when cmake isn't installed

4 years agomarks notifications as read after mute
Maksim Pechnikov [Fri, 28 Aug 2020 15:17:44 +0000 (18:17 +0300)]
marks notifications as read after mute

4 years agoMerge branch 'stable-sync/2.1.0' into 'develop'
lain [Fri, 28 Aug 2020 14:40:26 +0000 (14:40 +0000)]
Merge branch 'stable-sync/2.1.0' into 'develop'

Merge stable in develop and bump development version

Closes #1610, #1621, #1613, #1375, #1374, #1614, #1422, #1595, #1620, #1364, #1640, #1643, #1653, #1624, #764, #1687, #1698, #1670, #1677, #1727, #1559, #1746, #1313, #1810, #751, and #866

See merge request pleroma/pleroma!2928

4 years agoMerge branch 'mention-sudo-pleroma-when-updating' into 'develop'
lain [Fri, 28 Aug 2020 14:12:23 +0000 (14:12 +0000)]
Merge branch 'mention-sudo-pleroma-when-updating' into 'develop'

Add mention of sudo -Hu pleroma to update docs

See merge request pleroma/pleroma!2929

4 years agoAdd mention of sudo -Hu pleroma to docs
Shpuld Shpludson [Fri, 28 Aug 2020 13:50:21 +0000 (13:50 +0000)]
Add mention of sudo -Hu pleroma to docs

4 years agomix.exs: bump development version after 2.1.0 release
rinpatch [Fri, 28 Aug 2020 13:15:57 +0000 (16:15 +0300)]
mix.exs: bump development version after 2.1.0 release

4 years agoMerge branch 'release/2.1.0' into 'stable'
lain [Fri, 28 Aug 2020 12:17:19 +0000 (12:17 +0000)]
Merge branch 'release/2.1.0' into 'stable'

Release/2.1.0

See merge request pleroma/pleroma!2927

4 years agoMix: Update version
lain [Fri, 28 Aug 2020 09:34:48 +0000 (11:34 +0200)]
Mix: Update version

4 years agoMerge branch 'develop' of git.pleroma.social:pleroma/pleroma into pleroma-2.1-rc0
lain [Fri, 28 Aug 2020 09:33:11 +0000 (11:33 +0200)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into pleroma-2.1-rc0

4 years agoMerge branch '2078-list-fixes' into 'develop'
Haelwenn [Thu, 27 Aug 2020 17:05:53 +0000 (17:05 +0000)]
Merge branch '2078-list-fixes' into 'develop'

Resolve "List timeline returns incorrectly assigned Account for replies and repeats"

Closes #2070 and #2078

See merge request pleroma/pleroma!2923

4 years agoMerge branch 'develop' of git.pleroma.social:pleroma/pleroma into pleroma-2.1-rc0
lain [Thu, 27 Aug 2020 13:38:03 +0000 (15:38 +0200)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into pleroma-2.1-rc0

4 years agoMerge branch '2081-deleted-user-chats' into 'develop'
lain [Thu, 27 Aug 2020 11:18:42 +0000 (11:18 +0000)]
Merge branch '2081-deleted-user-chats' into 'develop'

ChatController: Don't die if the recipient is gone.

Closes #2081

See merge request pleroma/pleroma!2926

4 years agoChatController: Don't die if the recipient is gone.
lain [Thu, 27 Aug 2020 10:13:18 +0000 (12:13 +0200)]
ChatController: Don't die if the recipient is gone.

4 years agoMerge branch 'update/admin-fe-20200826' into 'develop'
rinpatch [Thu, 27 Aug 2020 04:11:34 +0000 (04:11 +0000)]
Merge branch 'update/admin-fe-20200826' into 'develop'

Update AdminFE build in preparation for 2.1.0 release

See merge request pleroma/pleroma!2925

4 years agoUpdate AdminFE build in preparation for 2.1.0 release
Mark Felder [Wed, 26 Aug 2020 20:43:34 +0000 (15:43 -0500)]
Update AdminFE build in preparation for 2.1.0 release

4 years agoMerge branch 'develop' of git.pleroma.social:pleroma/pleroma into pleroma-2.1-rc0
lain [Wed, 26 Aug 2020 13:58:49 +0000 (15:58 +0200)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into pleroma-2.1-rc0

4 years agoMerge branch 'fix/fast_html-build-errors' into 'develop'
rinpatch [Wed, 26 Aug 2020 13:49:52 +0000 (13:49 +0000)]
Merge branch 'fix/fast_html-build-errors' into 'develop'

fix fast_html build errors with gcc 10 by bumping fast_sanitize

Closes #2058

See merge request pleroma/pleroma!2922

4 years agoChangelog: Add info about list fixes.
lain [Wed, 26 Aug 2020 13:40:00 +0000 (15:40 +0200)]
Changelog: Add info about list fixes.

4 years agoTimelineController: Keys are atoms now.
lain [Wed, 26 Aug 2020 13:37:30 +0000 (15:37 +0200)]
TimelineController: Keys are atoms now.

Closes #2078
Closes #2070

4 years agofix fast_html build errors with gcc 10 by bumping fast_sanitize
rinpatch [Wed, 26 Aug 2020 13:31:02 +0000 (16:31 +0300)]
fix fast_html build errors with gcc 10 by bumping fast_sanitize

Closes #2058

4 years agoMerge branch '2079-welcome-message-docs' into 'develop'
rinpatch [Wed, 26 Aug 2020 13:11:17 +0000 (13:11 +0000)]
Merge branch '2079-welcome-message-docs' into 'develop'

Cheatsheet: Remove misleading example

Closes #2079

See merge request pleroma/pleroma!2921

4 years agoCheatsheet: Remove misleading example
lain [Wed, 26 Aug 2020 11:53:16 +0000 (13:53 +0200)]
Cheatsheet: Remove misleading example

4 years agoMerge branch 'develop' of git.pleroma.social:pleroma/pleroma into pleroma-2.1-rc0
lain [Wed, 26 Aug 2020 11:17:39 +0000 (13:17 +0200)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into pleroma-2.1-rc0

4 years agoMerge branch 'chore/release-template-merge-back-to-develop' into 'develop'
lain [Wed, 26 Aug 2020 05:50:41 +0000 (05:50 +0000)]
Merge branch 'chore/release-template-merge-back-to-develop' into 'develop'

release MR template: add a note about merging stable changes back to develop

See merge request pleroma/pleroma!2920

4 years agorelease MR template: add a note about merging stable changes back to
rinpatch [Wed, 26 Aug 2020 04:08:02 +0000 (07:08 +0300)]
release MR template: add a note about merging stable changes back to
develop

4 years agoMerge branch 'buildx-multiarch-arm32v7' into 'develop'
Haelwenn [Tue, 25 Aug 2020 22:27:19 +0000 (22:27 +0000)]
Merge branch 'buildx-multiarch-arm32v7' into 'develop'

Add multiarch support to docker container, fixes pleroma/pleroma-docker-compose#2

Closes pleroma-docker-compose#2

See merge request pleroma/pleroma!2789

4 years agoMerge branch 'feature/1952-read-muted-notifications' into 'develop'
feld [Tue, 25 Aug 2020 21:32:32 +0000 (21:32 +0000)]
Merge branch 'feature/1952-read-muted-notifications' into 'develop'

Automatically mark notifications about statuses from muted users and threads as read

Closes #1952

See merge request pleroma/pleroma!2893

4 years agoMerge branch '2077-fix-bogus-webfinger-ids' into 'develop'
Haelwenn [Tue, 25 Aug 2020 20:01:43 +0000 (20:01 +0000)]
Merge branch '2077-fix-bogus-webfinger-ids' into 'develop'

Webfinger: Handle bogus ids better.

Closes #2077

See merge request pleroma/pleroma!2919

4 years agoWebfinger: Handle bogus ids better.
lain [Tue, 25 Aug 2020 15:35:59 +0000 (17:35 +0200)]
Webfinger: Handle bogus ids better.

4 years agoMix: Make rc version explicit.
lain [Tue, 25 Aug 2020 14:07:07 +0000 (16:07 +0200)]
Mix: Make rc version explicit.

4 years agoMerge branch 'stable' of git.pleroma.social:pleroma/pleroma into pleroma-2.1-rc0
lain [Tue, 25 Aug 2020 13:16:20 +0000 (15:16 +0200)]
Merge branch 'stable' of git.pleroma.social:pleroma/pleroma into pleroma-2.1-rc0

4 years agoMerge branch 'frontend-bundles-downloads' into 'develop'
lain [Tue, 25 Aug 2020 10:34:09 +0000 (10:34 +0000)]
Merge branch 'frontend-bundles-downloads' into 'develop'

frontend install mix tasks

See merge request pleroma/pleroma!2841

4 years agoDescription: Update description.
lain [Tue, 25 Aug 2020 09:49:44 +0000 (11:49 +0200)]
Description: Update description.

4 years agoMerge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-bundles...
lain [Tue, 25 Aug 2020 09:44:51 +0000 (11:44 +0200)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-bundles-downloads

4 years agoMerge branch 'docs/update-clients' into 'develop'
lain [Tue, 25 Aug 2020 07:41:25 +0000 (07:41 +0000)]
Merge branch 'docs/update-clients' into 'develop'

clients.md: Remove Nekonium, Twidere-iOS, Feather; Add DashFE and BloatFE

See merge request pleroma/pleroma!2914

4 years agoclients.md: Remove Nekonium, Twidere-iOS, Feather; Add DashFE and BloatFE
Haelwenn (lanodan) Monnier [Mon, 24 Aug 2020 21:13:35 +0000 (23:13 +0200)]
clients.md: Remove Nekonium, Twidere-iOS, Feather; Add DashFE and BloatFE

4 years agoMerge branch 'feature/add-preload-to-description' into 'develop'
feld [Mon, 24 Aug 2020 20:41:33 +0000 (20:41 +0000)]
Merge branch 'feature/add-preload-to-description' into 'develop'

Add Pleroma.Web.Preload to description.exs

See merge request pleroma/pleroma!2913

4 years agoAdd Pleroma.Web.Preload to description.exs
Angelina Filippova [Mon, 24 Aug 2020 19:43:37 +0000 (22:43 +0300)]
Add Pleroma.Web.Preload to description.exs

4 years agoMerge branch 'relay-fix-admin-fe' into 'develop'
feld [Mon, 24 Aug 2020 17:03:18 +0000 (17:03 +0000)]
Merge branch 'relay-fix-admin-fe' into 'develop'

Relay fix for admin-fe

See merge request pleroma/pleroma!2902

4 years agoMerge branch 'features/validators-event' into 'develop'
lain [Fri, 21 Aug 2020 16:10:30 +0000 (16:10 +0000)]
Merge branch 'features/validators-event' into 'develop'

Pipeline Ingestion: Event

See merge request pleroma/pleroma!2909

4 years agoMerge branch 'feature/2071-actor-type' into 'develop'
lain [Fri, 21 Aug 2020 08:36:56 +0000 (08:36 +0000)]
Merge branch 'feature/2071-actor-type' into 'develop'

Adding actor type in user show

Closes #2071

See merge request pleroma/pleroma!2910

4 years agoadding actor type in user show
Alexander Strizhakov [Fri, 21 Aug 2020 07:38:56 +0000 (10:38 +0300)]
adding actor type in user show

4 years agoPipeline Ingestion: Event
Haelwenn (lanodan) Monnier [Thu, 20 Aug 2020 16:41:42 +0000 (18:41 +0200)]
Pipeline Ingestion: Event

4 years agoMerge branch 'features/validators-audio2' into 'develop'
lain [Wed, 19 Aug 2020 12:59:41 +0000 (12:59 +0000)]
Merge branch 'features/validators-audio2' into 'develop'

Pipeline Ingestion: Audio (Part 2)

See merge request pleroma/pleroma!2903

4 years agoAudioHandlingTest: Make mock explicit
lain [Wed, 19 Aug 2020 12:36:42 +0000 (14:36 +0200)]
AudioHandlingTest: Make mock explicit

4 years agoMerge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/validators...
lain [Wed, 19 Aug 2020 12:10:11 +0000 (14:10 +0200)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/validators-audio2

4 years agoMerge branch 'fix-arm64' into 'develop'
lain [Wed, 19 Aug 2020 11:41:00 +0000 (11:41 +0000)]
Merge branch 'fix-arm64' into 'develop'

CI: Fix release builds once more.

See merge request pleroma/pleroma!2907

4 years agoCI: Fix release builds once more.
lain [Wed, 19 Aug 2020 11:37:33 +0000 (13:37 +0200)]
CI: Fix release builds once more.

4 years agoMerge branch 'email-tests' into 'develop'
lain [Wed, 19 Aug 2020 10:56:07 +0000 (10:56 +0000)]
Merge branch 'email-tests' into 'develop'

Fix for sometimes failing email tests

See merge request pleroma/pleroma!2906

4 years agofix for sometimes failing tests
Alexander Strizhakov [Wed, 19 Aug 2020 09:57:29 +0000 (12:57 +0300)]
fix for sometimes failing tests

4 years agoMerge branch 'mix-task-fixes' into 'develop'
lain [Wed, 19 Aug 2020 09:48:40 +0000 (09:48 +0000)]
Merge branch 'mix-task-fixes' into 'develop'

Fixes for mix tasks

See merge request pleroma/pleroma!2905

4 years agofixes for mix tasks
Alexander Strizhakov [Wed, 19 Aug 2020 08:06:03 +0000 (11:06 +0300)]
fixes for mix tasks

- fix for `mix pleroma.database update_users_following_followers_counts`
- raise error, if fetch was unsuccessful in emoji tasks
- fix for `pleroma.digest test` task

4 years agoadditional changelog entry
Alexander Strizhakov [Wed, 19 Aug 2020 05:55:03 +0000 (08:55 +0300)]
additional changelog entry

4 years agochangelog entry
Alexander Strizhakov [Wed, 19 Aug 2020 05:40:26 +0000 (08:40 +0300)]
changelog entry

4 years agorelay fix for admin-fe
Alexander Strizhakov [Tue, 18 Aug 2020 15:21:34 +0000 (18:21 +0300)]
relay fix for admin-fe

4 years agoPipeline Ingestion: Audio (Part 2)
Haelwenn (lanodan) Monnier [Tue, 18 Aug 2020 22:05:48 +0000 (00:05 +0200)]
Pipeline Ingestion: Audio (Part 2)

4 years agoMerge branch '2064-image-blanking' into 'develop'
Haelwenn [Tue, 18 Aug 2020 19:02:33 +0000 (19:02 +0000)]
Merge branch '2064-image-blanking' into 'develop'

Resolve "Make default image description blank"

Closes #2064

See merge request pleroma/pleroma!2899

4 years agoMerge branch 'improve/freebsd-rc-script' into 'develop'
feld [Tue, 18 Aug 2020 15:57:43 +0000 (15:57 +0000)]
Merge branch 'improve/freebsd-rc-script' into 'develop'

Improve FreeBSD rc script

See merge request pleroma/pleroma!2901

4 years agoImprove FreeBSD rc script
Mark Felder [Tue, 18 Aug 2020 15:24:34 +0000 (10:24 -0500)]
Improve FreeBSD rc script

Passes rclint now, $HOME is dynamic, and properly matches process name for signalling shutdown.

4 years agoMerge branch 'freebsd-docs' into 'develop'
lain [Tue, 18 Aug 2020 12:56:28 +0000 (12:56 +0000)]
Merge branch 'freebsd-docs' into 'develop'

FreeBSD installation process

See merge request pleroma/pleroma!2887

4 years agoMerge branch 'chore/improve-descriptions' into 'develop'
lain [Tue, 18 Aug 2020 12:56:07 +0000 (12:56 +0000)]
Merge branch 'chore/improve-descriptions' into 'develop'

Improve description for mediaproxy cache invalidation settings

See merge request pleroma/pleroma!2891

4 years agoTest config: Default to filename for descriptions
lain [Tue, 18 Aug 2020 12:37:35 +0000 (14:37 +0200)]
Test config: Default to filename for descriptions

4 years agoMerge branch 'features/validators-audio' into 'develop'
lain [Tue, 18 Aug 2020 12:27:45 +0000 (12:27 +0000)]
Merge branch 'features/validators-audio' into 'develop'

Pipeline Ingestion: Audio

See merge request pleroma/pleroma!2897

4 years agoTransmogrifier Test: Extract audio tests.
lain [Tue, 18 Aug 2020 11:37:28 +0000 (13:37 +0200)]
Transmogrifier Test: Extract audio tests.

4 years agoMerge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/validators...
lain [Tue, 18 Aug 2020 11:31:42 +0000 (13:31 +0200)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/validators-audio

4 years agoMerge branch 'purge-user' into 'develop'
lain [Tue, 18 Aug 2020 11:31:13 +0000 (11:31 +0000)]
Merge branch 'purge-user' into 'develop'

Purge a local user upon deletion, fixes #2062

Closes #2062

See merge request pleroma/pleroma!2898

4 years agoChangelog: Add info about upload description changes
lain [Tue, 18 Aug 2020 11:24:39 +0000 (13:24 +0200)]
Changelog: Add info about upload description changes

4 years agoCheatsheet: Add information about filename descriptions
lain [Tue, 18 Aug 2020 11:22:00 +0000 (13:22 +0200)]
Cheatsheet: Add information about filename descriptions

4 years agoPleroma.Upload: Set default upload name / description based on config.
lain [Tue, 18 Aug 2020 11:21:30 +0000 (13:21 +0200)]
Pleroma.Upload: Set default upload name / description based on config.

4 years agoMerge branch 'features/validators_use_ectotypes' into 'develop'
lain [Tue, 18 Aug 2020 11:01:38 +0000 (11:01 +0000)]
Merge branch 'features/validators_use_ectotypes' into 'develop'

object_validators: Use ecto_types where available

See merge request pleroma/pleroma!2896

4 years agoMerge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/validators...
lain [Tue, 18 Aug 2020 10:38:13 +0000 (12:38 +0200)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/validators_use_ectotypes

4 years agoTest that `POST /api/pleroma/delete_account` purges the user
Alex Gleason [Tue, 18 Aug 2020 05:24:28 +0000 (00:24 -0500)]
Test that `POST /api/pleroma/delete_account` purges the user

4 years agoTest purging a user with User.delete/1
Alex Gleason [Tue, 18 Aug 2020 05:10:09 +0000 (00:10 -0500)]
Test purging a user with User.delete/1

4 years agoPurge most user fields upon deletion, "right to be forgotten" #859
Alex Gleason [Tue, 18 Aug 2020 04:44:44 +0000 (23:44 -0500)]
Purge most user fields upon deletion, "right to be forgotten" #859

4 years agoAlso purge bio and display name
Alex Gleason [Tue, 18 Aug 2020 03:08:08 +0000 (22:08 -0500)]
Also purge bio and display name

4 years agoPurge a local user upon deletion, fixes #2062
Alex Gleason [Tue, 18 Aug 2020 02:52:28 +0000 (21:52 -0500)]
Purge a local user upon deletion, fixes #2062

4 years agocommon_fixes: Remove Utils.make_date call
Haelwenn (lanodan) Monnier [Tue, 18 Aug 2020 00:12:13 +0000 (02:12 +0200)]
common_fixes: Remove Utils.make_date call

4 years agocommon_fixes: Get fixes common from Audio and Question
Haelwenn (lanodan) Monnier [Tue, 18 Aug 2020 00:11:38 +0000 (02:11 +0200)]
common_fixes: Get fixes common from Audio and Question

4 years agoPipeline Ingestion: Audio
Haelwenn (lanodan) Monnier [Mon, 17 Aug 2020 23:48:42 +0000 (01:48 +0200)]
Pipeline Ingestion: Audio

4 years agofetcher: fallback to [] when to/cc is nil
Haelwenn (lanodan) Monnier [Tue, 18 Aug 2020 00:01:40 +0000 (02:01 +0200)]
fetcher: fallback to [] when to/cc is nil

Related: https://git.pleroma.social/pleroma/pleroma/-/issues/2063

4 years agoobject_validators: Use ecto_types where available
Haelwenn (lanodan) Monnier [Mon, 17 Aug 2020 21:46:42 +0000 (23:46 +0200)]
object_validators: Use ecto_types where available

4 years agoMerge branch 'issue/1936' into 'develop'
lain [Mon, 17 Aug 2020 13:05:20 +0000 (13:05 +0000)]
Merge branch 'issue/1936' into 'develop'

[#1936] Ability to search for banned MediaProxy URLs 

See merge request pleroma/pleroma!2873

4 years agoMerge branch 'invisible-index' into 'develop'
rinpatch [Mon, 17 Aug 2020 12:38:14 +0000 (12:38 +0000)]
Merge branch 'invisible-index' into 'develop'

Migrations: Add an index on the `invisible` field on users.

See merge request pleroma/pleroma!2895

4 years agoMerge branch '2046-default-restrict-unauthenticated-basing-on-instance-privacy' into...
lain [Mon, 17 Aug 2020 12:26:53 +0000 (12:26 +0000)]
Merge branch '2046-default-restrict-unauthenticated-basing-on-instance-privacy' into 'develop'

[#2046] Defaulted pleroma/restrict_unauthenticated basing on instance privacy

Closes #2046

See merge request pleroma/pleroma!2890

4 years agoMigrations: Add an index on the `invisible` field on users.
lain [Mon, 17 Aug 2020 12:11:36 +0000 (14:11 +0200)]
Migrations: Add an index on the `invisible` field on users.

4 years agoMerge branch 'fix/start-ssl-if-ssl-required' into 'develop'
rinpatch [Mon, 17 Aug 2020 08:44:26 +0000 (08:44 +0000)]
Merge branch 'fix/start-ssl-if-ssl-required' into 'develop'

Start :ssl if not started when running migration or rollback

Closes #2056

See merge request pleroma/pleroma!2894

4 years agoApply 1 suggestion(s) to 1 file(s)
Hugo [Mon, 17 Aug 2020 07:58:24 +0000 (07:58 +0000)]
Apply 1 suggestion(s) to 1 file(s)

4 years agoStart :ssl if not started when running migration or rollback
Hugo Müller-Downing [Sun, 16 Aug 2020 04:02:33 +0000 (14:02 +1000)]
Start :ssl if not started when running migration or rollback

4 years agoMake notifications about new statuses from muted threads read
Sergey Suprunenko [Sun, 16 Aug 2020 22:07:23 +0000 (00:07 +0200)]
Make notifications about new statuses from muted threads read

4 years agofix search media proxy urls
Maksim Pechnikov [Sun, 16 Aug 2020 03:54:48 +0000 (06:54 +0300)]
fix search media proxy urls

4 years ago[#2046] Added test for pleroma/restrict_unauthenticated defaults on private instance...
Ivan Tashkinov [Sat, 15 Aug 2020 15:30:20 +0000 (18:30 +0300)]
[#2046] Added test for pleroma/restrict_unauthenticated defaults on private instance. Updated docs and changelog.