b738f70953
Merge branch 'develop' into feature/gen-magic
2020-10-13 10:08:38 -05:00
3be8ab5103
RemoteIp module name
2020-10-13 16:43:50 +03:00
04b514c567
Merge branch 'develop' into feature/gen-magic
2020-10-09 11:26:10 -05:00
d43d05005a
Move hardcoded default configuration into config.exs
2020-10-06 17:02:46 -05:00
cbdaabad34
web push http_client fix
2020-10-01 13:32:11 +03:00
6c052bd5b6
Merge branch 'media-preview-proxy-nostream' into 'develop'
...
Media preview proxy
See merge request pleroma/pleroma!3001
2020-09-18 18:38:20 +00:00
7e02f4ed3b
Merge branch 'feature/2118-web-push-encryption-http' into 'develop'
...
Make WebPushEncryption use Pleroma.HTTP as an HTTP adapter
Closes #2118
See merge request pleroma/pleroma!3008
2020-09-18 12:25:10 +00:00
f2ef9735c5
Federate data through persistent websocket connections
2020-09-18 11:58:22 +00:00
226fa3e486
Make WebPushEncryption use Pleroma.HTTP as an HTTP adapter
2020-09-17 22:10:55 +02:00
7cdbd91d83
[ #2497 ] Configurability of :min_content_length (preview proxy). Refactoring, documentation, tests.
2020-09-17 17:13:40 +03:00
2f155fb89f
Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy-nostream
2020-09-15 20:29:39 +03:00
0b5e72ecf0
Remove `:managed_config` option.
...
In practice, it was already removed half a year ago, but the description
and cheatsheet entries were still there.
The migration intentionally does not use ConfigDB.get_by_params, since
this will break migration code as soon as we add a new field is added
to ConfigDB.
Closes #2086
2020-09-14 18:04:16 +03:00
0bda85857e
Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy
...
# Conflicts:
# lib/pleroma/instances/instance.ex
2020-09-11 17:19:58 +03:00
55562ca936
Merge branch 'develop' into feature/gen-magic
2020-09-10 16:05:22 -05:00
2c2094d4b2
configurable lifetime for ephemeral activities
2020-09-10 21:51:59 +03:00
9bf1065a06
schedule activity expiration in Oban
2020-09-10 21:50:40 +03:00
7dd986a563
expire mfa tokens through Oban
2020-09-10 16:01:19 +03:00
3ce658b930
schedule expired oauth tokens deletion with Oban
2020-09-10 16:01:19 +03:00
4ee99dafcc
Merge branch 'develop' into media-preview-proxy
2020-09-09 11:11:36 -05:00
14d07081fd
Feed provider only generates a redirect, so always activate it.
...
Making this configurable is misleading.
2020-09-08 20:21:34 +03:00
630444ee08
Do not make RelMe metadata provider optional.
...
There's really no sound reason to turn this off anyway.
2020-09-08 20:21:34 +03:00
a83916fdac
adapter options unification
...
not needed options deletion
2020-09-07 19:59:17 +03:00
ee67c98e55
removing Stats worker from Oban cron jobs
2020-09-07 19:16:14 +03:00
f170d47130
[ #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.
2020-09-05 20:19:09 +03:00
b529616e11
Increase pool and timeout for preview so it catches slow media pool responses
2020-09-03 15:08:12 -05:00
6141eb94ab
Fetch preview requests through the MediaProxy. Separate connection options are not needed.
...
Use a separate pool for preview requests
2020-09-03 14:42:11 -05:00
85446cc30c
Merge branch 'develop' into media-preview-proxy
2020-09-03 10:34:06 -05:00
19691389b9
Rich media: Add failure tracking
2020-09-02 14:59:52 +03:00
c17d83cd73
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
2020-09-02 09:04:23 +03:00
899ea2da3e
Switch to imagemagick, only support videos
2020-08-25 17:18:22 -05:00
479578b148
Merge branch 'develop' into feld-2168-media-preview-proxy
2020-08-25 11:57:23 -05:00
c1d51944c7
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-bundles-downloads
2020-08-25 11:44:51 +02:00
aa0a5ffb48
[ #2497 ] Media preview proxy: added `quality` config setting, adjusted width/height defaults.
2020-08-21 08:59:08 +03:00
4ee15e991e
[ #2497 ] Media preview proxy config refactoring & documentation.
2020-08-19 21:36:26 +03:00
da116d81fb
[ #2497 ] Added video preview proxy. Switched from exexec to Port.
2020-08-18 18:23:27 +03:00
27e7999a15
Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
2020-08-18 18:02:09 +03:00
aabc26a573
Pleroma.Upload: Set default upload name / description based on config.
2020-08-18 13:21:30 +02:00
95529ab709
[ #2046 ] Defaulted pleroma/restrict_unauthenticated basing on instance privacy setting (i.e. restrict on private instances only by default).
2020-08-14 20:55:45 +03:00
2def3cbf41
Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
...
# Conflicts:
# config/config.exs
# mix.lock
2020-08-11 15:13:29 +03:00
d0fc48ea67
Merge branch 'develop' into 'feat/floki-fast-html-2'
...
# Conflicts:
# config/config.exs
2020-08-09 10:53:58 +00:00
54e2af8293
Merge branch 'develop' into fix/ldap-auth-issues
2020-08-07 14:55:22 -05:00
325c7c924b
Make Floki use fast_html
2020-08-07 16:45:33 +03:00
1298a2ea2c
Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
...
# Conflicts:
# mix.lock
2020-08-07 09:38:05 +03:00
e639eee82e
restricted_nicknames: Add names from MastoAPI endpoints
2020-08-06 18:01:29 -05:00
d5e4d8a6f3
Define default authenticator in the config
2020-08-05 09:41:17 -05:00
532d6f94ae
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-bundles-downloads
2020-08-04 15:10:36 +02:00
28584bb224
Merge branch 'email-blacklist' into 'develop'
...
Add email blacklist, fixes #1404
Closes #1404
See merge request pleroma/pleroma!2837
2020-08-04 11:00:30 +00:00
e3953923ac
Merge branch 'fixes_1957_add_option_to_send_user_chatmessage_instead_of_dm' into 'develop'
...
fixes 1957 Add option to send user chatmessage instead of dm
Closes #1957
See merge request pleroma/pleroma!2782
2020-08-03 21:01:56 +00:00
56b5b9aa27
Merge branch 'follower-mrf-again' into 'develop'
...
Follower mrf again
See merge request pleroma/pleroma!2833
2020-08-03 14:22:11 +00:00
66ebd88634
Merge branch 'config/default_ok_oldage' into 'develop'
...
config: :mrf, :policies default to ObjectAgePolicy
Closes #2000
See merge request pleroma/pleroma!2814
2020-08-03 12:50:29 +00:00
Mark Felder
Alexander Strizhakov
feld
lain
Steven Fuchs
Sergey Suprunenko
Ivan Tashkinov
rinpatch
Alex Gleason