akkoma
4 years ago[#2497] Fix for png media proxy preview response headers (content-type & content...
Ivan Tashkinov [Tue, 1 Sep 2020 18:21:58 +0000 (21:21 +0300)]
[#2497] Fix for png media proxy preview response headers (content-type & content-disposition).

4 years ago[#2497] Added Cache-Control response header for media proxy preview endpoint.
Ivan Tashkinov [Mon, 31 Aug 2020 10:08:50 +0000 (13:08 +0300)]
[#2497] Added Cache-Control response header for media proxy preview endpoint.

4 years agoMerge branch 'develop' into feld-2168-media-preview-proxy
Mark Felder [Sun, 30 Aug 2020 16:28:45 +0000 (11:28 -0500)]
Merge branch 'develop' into feld-2168-media-preview-proxy

4 years agoCredo
Mark Felder [Sun, 30 Aug 2020 14:32:22 +0000 (09:32 -0500)]
Credo

4 years agoSupport PNG previews to preserve alpha channels
Mark Felder [Sun, 30 Aug 2020 14:17:24 +0000 (09:17 -0500)]
Support PNG previews to preserve alpha channels

4 years agoQtFastStart: optimize
href [Sat, 29 Aug 2020 11:05:23 +0000 (13:05 +0200)]
QtFastStart: optimize

~4-6x faster
~3~4x memory usage reduction (now mostly adds what we are rewriting in
the metadatas)

4 years agoRewrite MP4/MOV binaries to be faststart
href [Fri, 28 Aug 2020 19:14:28 +0000 (21:14 +0200)]
Rewrite MP4/MOV binaries to be faststart

In some cases, MP4/MOV files can have the data _before_ the meta-data.

Thus, ffmpeg (and all similar tools) cannot really process the input if
it's given over stdin/streaming/pipes.

BUT I REALLY DON'T WANT TO MAKE TEMPORARY FILES

so here we go, an implementation of qtfaststart in elixir.

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 agoAdd a note about the avatars and banners situation
Mark Felder [Thu, 27 Aug 2020 22:28:21 +0000 (17:28 -0500)]
Add a note about the avatars and banners situation

4 years agoSupport static avatars and header images with Mediaproxy Preview
Mark Felder [Thu, 27 Aug 2020 22:15:23 +0000 (17:15 -0500)]
Support static avatars and header images with Mediaproxy Preview

4 years agoKeep args construction within video/image scopes instead of mangling down in fifo...
Mark Felder [Thu, 27 Aug 2020 21:33:37 +0000 (16:33 -0500)]
Keep args construction within video/image scopes instead of mangling down in fifo town

4 years agoTry to trick ffmpeg into working with this named pipe
Mark Felder [Thu, 27 Aug 2020 18:10:40 +0000 (13:10 -0500)]
Try to trick ffmpeg into working with this named pipe

4 years agoffmpeg needs input from fifo path, not stdin
Mark Felder [Thu, 27 Aug 2020 17:47:29 +0000 (12:47 -0500)]
ffmpeg needs input from fifo path, not stdin

4 years agoAttempt at supporting video thumbnails via ffmpeg
Mark Felder [Thu, 27 Aug 2020 17:31:55 +0000 (12:31 -0500)]
Attempt at supporting video thumbnails via ffmpeg

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 agoFollow redirects.
Mark Felder [Thu, 27 Aug 2020 16:46:56 +0000 (11:46 -0500)]
Follow redirects.

I think we should be using some global adapter options here, though.

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 agoMove arg for images to the list so we can reuse these fifo functions for videos
Mark Felder [Wed, 26 Aug 2020 22:43:25 +0000 (17:43 -0500)]
Move arg for images to the list so we can reuse these fifo functions for videos

4 years agoRename to make it obvious this is for images not videos
Mark Felder [Wed, 26 Aug 2020 21:40:13 +0000 (16:40 -0500)]
Rename to make it obvious this is for images not videos

4 years agoMerge branch 'develop' into feld-2168-media-preview-proxy
Mark Felder [Wed, 26 Aug 2020 21:37:57 +0000 (16:37 -0500)]
Merge branch 'develop' into feld-2168-media-preview-proxy

4 years agoEnsure GIFs are redirected to the original or they become static.
Mark Felder [Wed, 26 Aug 2020 21:18:11 +0000 (16:18 -0500)]
Ensure GIFs are redirected to the original or they become static.

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 agoChange method of convert using stdout, make progressive jpegs
Mark Felder [Wed, 26 Aug 2020 15:37:45 +0000 (15:37 +0000)]
Change method of convert using stdout, make progressive jpegs

4 years agoRemove auto-orient; don't use it on previews, only originals
Mark Felder [Wed, 26 Aug 2020 14:28:25 +0000 (14:28 +0000)]
Remove auto-orient; don't use it on previews, only originals

4 years agoUse mkfifo to feed ImageMagick
href [Wed, 26 Aug 2020 14:12:34 +0000 (16:12 +0200)]
Use mkfifo to feed ImageMagick

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 agoTry specifying fd0, force jpg out
Mark Felder [Tue, 25 Aug 2020 23:10:27 +0000 (18:10 -0500)]
Try specifying fd0, force jpg out

4 years agoAllow both stdin and stdout
Mark Felder [Tue, 25 Aug 2020 22:36:53 +0000 (17:36 -0500)]
Allow both stdin and stdout

4 years agoRedirects for videos right now
Mark Felder [Tue, 25 Aug 2020 22:31:55 +0000 (17:31 -0500)]
Redirects for videos right now

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 agoSwitch to imagemagick, only support videos
Mark Felder [Tue, 25 Aug 2020 22:18:22 +0000 (17:18 -0500)]
Switch to imagemagick, only support videos

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 agoMerge branch 'develop' into feld-2168-media-preview-proxy
Mark Felder [Tue, 25 Aug 2020 16:57:23 +0000 (11:57 -0500)]
Merge branch 'develop' into feld-2168-media-preview-proxy

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 agoUse the image thumbnail for rich metadata (OGP/Twittercards)
Mark Felder [Sat, 22 Aug 2020 20:12:11 +0000 (15:12 -0500)]
Use the image thumbnail for rich metadata (OGP/Twittercards)

4 years agoRemove newline for linter
href [Fri, 21 Aug 2020 17:40:49 +0000 (17:40 +0000)]
Remove newline for linter

4 years agoTry to warm the cache with the preview image if preview proxy enabled
Mark Felder [Fri, 21 Aug 2020 17:19:35 +0000 (12:19 -0500)]
Try to warm the cache with the preview image if preview proxy enabled

4 years agoFix truncated images
href [Fri, 21 Aug 2020 17:02:57 +0000 (17:02 +0000)]
Fix truncated images

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 ago[#2497] Media preview proxy: added `quality` config setting, adjusted width/height...
Ivan Tashkinov [Fri, 21 Aug 2020 05:59:08 +0000 (08:59 +0300)]
[#2497] Media preview proxy: added `quality` config setting, adjusted width/height defaults.

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

4 years ago[#2497] Media preview proxy: added Content-Disposition header with filename to response.
Ivan Tashkinov [Thu, 20 Aug 2020 06:58:50 +0000 (09:58 +0300)]
[#2497] Media preview proxy: added Content-Disposition header with filename to response.

4 years ago[#2497] Media preview proxy config refactoring & documentation.
Ivan Tashkinov [Wed, 19 Aug 2020 18:36:26 +0000 (21:36 +0300)]
[#2497] Media preview proxy config refactoring & documentation.

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 ago[#2497] Added video preview proxy. Switched from exexec to Port.
Ivan Tashkinov [Tue, 18 Aug 2020 15:23:27 +0000 (18:23 +0300)]
[#2497] Added video preview proxy. Switched from exexec to Port.

4 years agoMerge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
Ivan Tashkinov [Tue, 18 Aug 2020 15:02:09 +0000 (18:02 +0300)]
Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy

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