akkoma
4 years agoMerge branch 'develop' of git.pleroma.social:pleroma/pleroma into media-preview-proxy
Mark Felder [Sun, 6 Sep 2020 13:15:34 +0000 (08:15 -0500)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into media-preview-proxy

4 years ago[#2497] Fixed MediaProxyWarmingPolicyTest.
Ivan Tashkinov [Sun, 6 Sep 2020 12:30:11 +0000 (15:30 +0300)]
[#2497] Fixed MediaProxyWarmingPolicyTest.

4 years agoMerge branch 'hotfix-the-hotfix' into 'develop'
rinpatch [Sat, 5 Sep 2020 19:04:19 +0000 (19:04 +0000)]
Merge branch 'hotfix-the-hotfix' into 'develop'

ConnectionPool: fix the previous hotfix

See merge request pleroma/pleroma!2959

4 years agoConnectionPool middleware: handle connection opening errors
rinpatch [Sat, 5 Sep 2020 18:36:17 +0000 (21:36 +0300)]
ConnectionPool middleware: handle connection opening errors

4 years agoConnectionPool: fix the previous hotfix
rinpatch [Sat, 5 Sep 2020 18:27:06 +0000 (21:27 +0300)]
ConnectionPool: fix the previous hotfix

I rushed the hotfix and forgot how `pop_in` actually works,
I want to die. We need some integration tests for the HTTP client

4 years agoMerge branch 'hotfix/tesla-env-no-access' into 'develop'
rinpatch [Sat, 5 Sep 2020 18:18:49 +0000 (18:18 +0000)]
Merge branch 'hotfix/tesla-env-no-access' into 'develop'

ConnectionPool middleware: fix a crash due to unimplemented behaviour

See merge request pleroma/pleroma!2958

4 years agoConnectionPool middleware: fix a crash due to unimplemented behaviour
rinpatch [Sat, 5 Sep 2020 18:17:03 +0000 (21:17 +0300)]
ConnectionPool middleware: fix a crash due to unimplemented behaviour

Structs don't implement Access behaviour, so this crashed. Tests didn't
catch it and I didn't test that part of the codepath. Very sorry

4 years agoMerge branch 'fix/pool-middleware-reverseproxy-leak' into 'develop'
rinpatch [Sat, 5 Sep 2020 17:47:12 +0000 (17:47 +0000)]
Merge branch 'fix/pool-middleware-reverseproxy-leak' into 'develop'

ConnectionPool middleware: Fix connection leak on ReverseProxy redirects

See merge request pleroma/pleroma!2954

4 years ago[#2497] Func defs grouping fix.
Ivan Tashkinov [Sat, 5 Sep 2020 17:23:18 +0000 (20:23 +0300)]
[#2497] Func defs grouping fix.

4 years ago[#2497] Adjusted media proxy preview invalidation. Allowed client-side caching for...
Ivan Tashkinov [Sat, 5 Sep 2020 17:19:09 +0000 (20:19 +0300)]
[#2497] Adjusted media proxy preview invalidation. Allowed client-side caching for media preview. Adjusted prewarmer to fetch only proxiable URIs.
Removed :preview pool in favor of existing :media one. Misc. refactoring.

4 years ago[#2497] Made media preview proxy fall back to media proxy instead of to source url...
Ivan Tashkinov [Sat, 5 Sep 2020 13:16:35 +0000 (16:16 +0300)]
[#2497] Made media preview proxy fall back to media proxy instead of to source url. Adjusted tests. Refactoring.

4 years agoMerge branch 'use-https-in-dockerfile' into 'develop'
Haelwenn [Sat, 5 Sep 2020 03:10:54 +0000 (03:10 +0000)]
Merge branch 'use-https-in-dockerfile' into 'develop'

Use TLS when adding Alpine community repository in Dockerfile

See merge request pleroma/pleroma!2955

4 years agoUse TLS when adding Alpine community repository in Dockerfile
James Alseth [Sat, 5 Sep 2020 02:19:56 +0000 (19:19 -0700)]
Use TLS when adding Alpine community repository in Dockerfile

4 years agoConnectionPool middleware: Fix connection leak on ReverseProxy redirects
rinpatch [Fri, 4 Sep 2020 19:10:40 +0000 (22:10 +0300)]
ConnectionPool middleware: Fix connection leak on ReverseProxy redirects

Requires a patched Tesla due to upstream not saving opts between
redirects, patch submitted at https://github.com/teamon/tesla/pull/414

4 years agoMerge branch 'develop' into 'develop'
lain [Fri, 4 Sep 2020 18:19:23 +0000 (18:19 +0000)]
Merge branch 'develop' into 'develop'

Added cmake

See merge request pleroma/pleroma!2953

4 years agoAdded cmake
Farhan Khan [Fri, 4 Sep 2020 18:03:58 +0000 (18:03 +0000)]
Added cmake

4 years agoMerge branch 'feat/simplify-pool-managment' into 'develop'
Haelwenn [Fri, 4 Sep 2020 10:27:46 +0000 (10:27 +0000)]
Merge branch 'feat/simplify-pool-managment' into 'develop'

HTTP: radically simplify pool checkin/checkout

See merge request pleroma/pleroma!2948

4 years agoMerge branch 'chore/fast_html-bump' into 'develop'
rinpatch [Fri, 4 Sep 2020 07:17:10 +0000 (07:17 +0000)]
Merge branch 'chore/fast_html-bump' into 'develop'

mix.lock: Bump fast_html

See merge request pleroma/pleroma!2950

4 years agomix.lock: Bump fast_html
Haelwenn (lanodan) Monnier [Fri, 4 Sep 2020 07:15:58 +0000 (09:15 +0200)]
mix.lock: Bump fast_html

This update fixes an incorrect push to Hex that reverted the gcc-10 fix

4 years agoHTTP: radically simplify pool checkin/checkout
rinpatch [Thu, 3 Sep 2020 20:15:22 +0000 (23:15 +0300)]
HTTP: radically simplify pool checkin/checkout

Use a custom tesla middleware instead of adapter helper function +
custom redirect middleware.

This will also fix "Client died before releasing the connection"
messages when the request pool is overloaded. Since the checkout is
now done after passing ConcurrentLimiter.

This is technically less efficient, since the connection needs to be
checked in/out every time the middleware is left or entered respectively.
But I don't think the nanoseconds we might lose on redirects
to the same host are worth the complexity.

4 years agoURL passed to helper is already MediaProxy
Mark Felder [Thu, 3 Sep 2020 20:28:57 +0000 (15:28 -0500)]
URL passed to helper is already MediaProxy

Set :preview pool on the request

4 years agoIncrease pool and timeout for preview so it catches slow media pool responses
Mark Felder [Thu, 3 Sep 2020 20:08:12 +0000 (15:08 -0500)]
Increase pool and timeout for preview so it catches slow media pool responses

4 years agoMerge branch 'media-preview-proxy' of git.pleroma.social:pleroma/pleroma into feld...
Mark Felder [Thu, 3 Sep 2020 19:48:43 +0000 (14:48 -0500)]
Merge branch 'media-preview-proxy' of git.pleroma.social:pleroma/pleroma into feld-media-preview-proxy

4 years agoFetch preview requests through the MediaProxy. Separate connection options are not...
Mark Felder [Thu, 3 Sep 2020 17:40:42 +0000 (12:40 -0500)]
Fetch preview requests through the MediaProxy. Separate connection options are not needed.

Use a separate pool for preview requests

4 years ago[#2497] Added support for enforcing output format for media proxy preview, used for...
Ivan Tashkinov [Thu, 3 Sep 2020 17:13:29 +0000 (20:13 +0300)]
[#2497] Added support for enforcing output format for media proxy preview, used for avatar_static & header_static (AccountView).

4 years agoMerge branch 'develop' into media-preview-proxy
Mark Felder [Thu, 3 Sep 2020 15:34:06 +0000 (10:34 -0500)]
Merge branch 'develop' into media-preview-proxy

4 years agoMerge branch 'bugfix/incoming-poll-emoji' into 'develop'
lain [Thu, 3 Sep 2020 11:50:30 +0000 (11:50 +0000)]
Merge branch 'bugfix/incoming-poll-emoji' into 'develop'

Fix emoji in Question, force generated context/context_id insertion

Closes #1870

See merge request pleroma/pleroma!2915

4 years agoMerge branch 'fix_install_fe_bug' into 'develop'
lain [Thu, 3 Sep 2020 09:56:17 +0000 (09:56 +0000)]
Merge branch 'fix_install_fe_bug' into 'develop'

Fix frontend install mix task bug

See merge request pleroma/pleroma!2942

4 years agoFrontend mix task: Add tests.
lain [Thu, 3 Sep 2020 09:40:17 +0000 (11:40 +0200)]
Frontend mix task: Add tests.

4 years agoMerge branch 'develop' of git.pleroma.social:pleroma/pleroma into seanking/pleroma...
lain [Thu, 3 Sep 2020 09:29:39 +0000 (11:29 +0200)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into seanking/pleroma-fix_install_fe_bug

4 years agoMerge branch 'fix/2095-deactivated-account-reset' into 'develop'
feld [Wed, 2 Sep 2020 17:11:24 +0000 (17:11 +0000)]
Merge branch 'fix/2095-deactivated-account-reset' into 'develop'

Disallow password resets for deactivated accounts

Closes #2095

See merge request pleroma/pleroma!2935

4 years agoMerge branch 'fix/1991-tzdata-update' into 'develop'
lain [Wed, 2 Sep 2020 17:09:55 +0000 (17:09 +0000)]
Merge branch 'fix/1991-tzdata-update' into 'develop'

user agent if Endpoint is not started yet

Closes #1991

See merge request pleroma/pleroma!2945

4 years agoMerge branch 'bugfix/mastoapi-lists' into 'develop'
lain [Wed, 2 Sep 2020 17:03:45 +0000 (17:03 +0000)]
Merge branch 'bugfix/mastoapi-lists' into 'develop'

Fix removing an account from a list

Closes #2103

See merge request pleroma/pleroma!2940

4 years agoListController: DRY up stuff.
lain [Wed, 2 Sep 2020 16:32:00 +0000 (18:32 +0200)]
ListController: DRY up stuff.

4 years agoDisallow password resets for deactivated accounts.
Mark Felder [Wed, 2 Sep 2020 14:09:13 +0000 (09:09 -0500)]
Disallow password resets for deactivated accounts.

Ensure all responses to password reset events are identical.

4 years agoMerge branch 'feat/rich-media-improvements' into 'develop'
rinpatch [Wed, 2 Sep 2020 13:46:11 +0000 (13:46 +0000)]
Merge branch 'feat/rich-media-improvements' into 'develop'

Rich media improvements

See merge request pleroma/pleroma!2944

4 years agoStatusView: Start fetching rich media cards as soon as possible
rinpatch [Wed, 2 Sep 2020 10:44:08 +0000 (13:44 +0300)]
StatusView: Start fetching rich media cards as soon as possible

4 years agouser agent if Endpoint is not started yet
Alexander Strizhakov [Wed, 2 Sep 2020 12:45:47 +0000 (15:45 +0300)]
user agent if Endpoint is not started yet

4 years agoRich media: Add failure tracking
rinpatch [Wed, 2 Sep 2020 11:21:28 +0000 (14:21 +0300)]
Rich media: Add failure tracking

4 years agohtml.ex: optimize external url extraction
rinpatch [Wed, 2 Sep 2020 09:42:25 +0000 (12:42 +0300)]
html.ex: optimize external url extraction

By using a :not() selector and only extracting attributes from the
first match.

4 years agoMerge branch 'fix/2047-rich-media-parser' into 'develop'
rinpatch [Wed, 2 Sep 2020 09:38:43 +0000 (09:38 +0000)]
Merge branch 'fix/2047-rich-media-parser' into 'develop'

RichMedia parser fix

Closes #2047

See merge request pleroma/pleroma!2941

4 years agoMerge branch 'http-fixes' into 'develop'
rinpatch [Wed, 2 Sep 2020 09:36:56 +0000 (09:36 +0000)]
Merge branch 'http-fixes' into 'develop'

Improvements and fixes for http requests

See merge request pleroma/pleroma!2904

4 years agotimeout option moved to gun adapter helper
Alexander Strizhakov [Wed, 2 Sep 2020 07:50:51 +0000 (10:50 +0300)]
timeout option moved to gun adapter helper

4 years agodefault pool for tz_data client
Alexander Strizhakov [Wed, 2 Sep 2020 07:33:43 +0000 (10:33 +0300)]
default pool for tz_data client

4 years agoMerge branch 'fix-searching-following' into 'develop'
rinpatch [Wed, 2 Sep 2020 06:55:58 +0000 (06:55 +0000)]
Merge branch 'fix-searching-following' into 'develop'

search: fix 'following' query parameter

See merge request pleroma/pleroma!2943

4 years agocorrect pool and uniform headers format
Alexander Strizhakov [Wed, 2 Sep 2020 06:16:51 +0000 (09:16 +0300)]
correct pool and uniform headers format

4 years agodon't overwrite passed pool option in http clients
Alexander Strizhakov [Tue, 1 Sep 2020 08:30:56 +0000 (11:30 +0300)]
don't overwrite passed pool option in http clients

4 years agoimprovements and fixes for http requests
Alexander Strizhakov [Wed, 19 Aug 2020 07:22:59 +0000 (10:22 +0300)]
improvements and fixes for http requests

- fix for gun worker termination in some circumstances
- pool for http clients (ex_aws, tzdata)
- default pool timeouts for gun
- gun retries on gun_down messages
- s3 upload timeout if streaming enabled

4 years agosearch: fix 'following' query parameter
Karol Kosek [Tue, 1 Sep 2020 17:56:32 +0000 (19:56 +0200)]
search: fix 'following' query parameter

The parameter included the accounts that are following you (followers)
instead of those you are actually following.

Co-Authored-By: Haelwenn (lanodan) Monnier <contact@hacktivis.me>
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 agoFix frontend install mix task bug
Sean King [Tue, 1 Sep 2020 18:20:32 +0000 (12:20 -0600)]
Fix frontend install mix task bug

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 agoFix removing an account from a list
Haelwenn (lanodan) Monnier [Tue, 1 Sep 2020 10:48:39 +0000 (12:48 +0200)]
Fix removing an account from a list

Mastodon (Frontend) changed a different method for deletes,
keeping old format as mastodon documentation is too loose

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 agofetcher: Remove fix_object call for Question activities
Haelwenn (lanodan) Monnier [Tue, 25 Aug 2020 00:21:19 +0000 (02:21 +0200)]
fetcher: Remove fix_object call for Question activities

4 years agocommon_fixes: Force inserting context and context_id
Haelwenn (lanodan) Monnier [Tue, 25 Aug 2020 00:18:33 +0000 (02:18 +0200)]
common_fixes: Force inserting context and context_id

4 years agoAdd new Emoji Ecto.Type and fix emoji in Question
Haelwenn (lanodan) Monnier [Mon, 24 Aug 2020 23:16:12 +0000 (01:16 +0200)]
Add new Emoji Ecto.Type and fix emoji in Question

4 years agotransmogrifier: Remove mastodon emoji-format from emoji field
Haelwenn (lanodan) Monnier [Mon, 24 Aug 2020 22:38:10 +0000 (00:38 +0200)]
transmogrifier: Remove mastodon emoji-format from emoji field

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 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 '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 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 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 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