feld
5aff479951
Merge branch '1668-prometheus-access-restrictions' into 'develop'
...
[#1668 ] App metrics endpoint (Prometheus) access restrictions
Closes #1668
See merge request pleroma/pleroma!3093
2020-10-27 17:47:56 +00:00
Ivan Tashkinov
50d4280880
[ #1668 ] Formatting fix.
2020-10-20 16:18:24 +03:00
Ivan Tashkinov
3a28aa8814
[ #1668 ] Added :prometheus group config to config/description.exs.
2020-10-20 15:13:20 +03:00
Mark Felder
405f27b4f8
The suggestions are problematic as they need to be real local account names
2020-10-16 17:41:44 +00:00
Mark Felder
b738f70953
Merge branch 'develop' into feature/gen-magic
2020-10-13 10:08:38 -05:00
Alexander Strizhakov
3be8ab5103
RemoteIp module name
2020-10-13 16:43:50 +03:00
Mark Felder
04b514c567
Merge branch 'develop' into feature/gen-magic
2020-10-09 11:26:10 -05:00
Haelwenn
74be4de3f6
Merge branch 'fix/2209-remoteip' into 'develop'
...
#2209 RemoteIP CIDR helper, config and doc improvements
See merge request pleroma/pleroma!3057
2020-10-08 17:29:00 +00:00
Mark Felder
b90eda3d8b
Improve description yet again
2020-10-06 17:36:29 -05:00
Mark Felder
e08eb4aba0
Don't leak internal variables in the docs. They're useless to users.
2020-10-06 17:29:56 -05:00
Mark Felder
b8c05f4876
Improve descriptions for reserved and proxies
2020-10-06 17:21:27 -05:00
Mark Felder
7aff2b47c5
Fix docs for default headers used by RemoteIp. We only use X-Forwarded-For by default.
2020-10-06 15:47:11 -05:00
Angelina Filippova
d96b8923f6
Fix typo
2020-09-30 00:50:53 +03:00
Angelina Filippova
fe19750644
Fix comma typo
2020-09-30 00:49:08 +03:00
Angelina Filippova
1b2f7139c8
Apply 1 suggestion(s) to 1 file(s)
2020-09-29 20:33:04 +00:00
Angelina Filippova
0e57f13365
Apply 1 suggestion(s) to 1 file(s)
2020-09-29 20:32:55 +00:00
Angelina Filippova
7ac4d1e7ee
Remove extra nesting and add labels in `:frontends` setting
2020-09-28 18:13:45 +03:00
Mark Felder
7b2bf381e9
Chase the Autolinker rename from !2677
2020-09-21 16:02:57 -05:00
feld
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
Steven Fuchs
f2ef9735c5
Federate data through persistent websocket connections
2020-09-18 11:58:22 +00:00
Ivan Tashkinov
7cdbd91d83
[ #2497 ] Configurability of :min_content_length (preview proxy). Refactoring, documentation, tests.
2020-09-17 17:13:40 +03:00
Ivan Tashkinov
2f155fb89f
Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy-nostream
2020-09-15 20:29:39 +03:00
rinpatch
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
Ivan Tashkinov
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
Mark Felder
55562ca936
Merge branch 'develop' into feature/gen-magic
2020-09-10 16:05:22 -05:00
Alexander Strizhakov
2c2094d4b2
configurable lifetime for ephemeral activities
2020-09-10 21:51:59 +03:00
Alexander Strizhakov
629a8de9cb
deprecation warning
...
changed namespace for activity expiration configuration
2020-09-10 21:50:41 +03:00
Alexander Strizhakov
9bf1065a06
schedule activity expiration in Oban
2020-09-10 21:50:40 +03:00
Alexander Strizhakov
3ce658b930
schedule expired oauth tokens deletion with Oban
2020-09-10 16:01:19 +03:00
Mark Felder
4ee99dafcc
Merge branch 'develop' into media-preview-proxy
2020-09-09 11:11:36 -05:00
Alexander Strizhakov
a83916fdac
adapter options unification
...
not needed options deletion
2020-09-07 19:59:17 +03:00
Alexander Strizhakov
ee67c98e55
removing Stats worker from Oban cron jobs
2020-09-07 19:16:14 +03:00
Mark Felder
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
Mark Felder
85446cc30c
Merge branch 'develop' into media-preview-proxy
2020-09-03 10:34:06 -05:00
rinpatch
19691389b9
Rich media: Add failure tracking
2020-09-02 14:59:52 +03:00
Mark Felder
899ea2da3e
Switch to imagemagick, only support videos
2020-08-25 17:18:22 -05:00
Mark Felder
479578b148
Merge branch 'develop' into feld-2168-media-preview-proxy
2020-08-25 11:57:23 -05:00
lain
6d6e43fd09
Description: Update description.
2020-08-25 11:49:44 +02:00
lain
c1d51944c7
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-bundles-downloads
2020-08-25 11:44:51 +02:00
Angelina Filippova
6e5678b5af
Add Pleroma.Web.Preload to description.exs
2020-08-24 22:43:37 +03:00
Ivan Tashkinov
aa0a5ffb48
[ #2497 ] Media preview proxy: added `quality` config setting, adjusted width/height defaults.
2020-08-21 08:59:08 +03:00
Ivan Tashkinov
4ee15e991e
[ #2497 ] Media preview proxy config refactoring & documentation.
2020-08-19 21:36:26 +03:00
Mark Felder
6c3130ef47
Improve description for mediaproxy cache invalidation settings
2020-08-14 13:07:58 -05:00
Angelina Filippova
f21b6ebd5d
Merge branch 'feature/update-welcome-setting-in-description' of git.pleroma.social:pleroma/pleroma into feature/update-welcome-setting-in-description
2020-08-07 21:05:44 +03:00
Angelina Filippova
8e1f7a3eff
Add new `image` type to settings whose values are image urls
2020-08-07 21:04:13 +03:00
lain
3f88366e2a
Apply 1 suggestion(s) to 1 file(s)
2020-08-07 11:07:02 +00:00
Maksim Pechnikov
8e90cc58e7
Merge branch 'develop' into feature/update-welcome-setting-in-description
2020-08-07 09:48:34 +03:00
Maksim Pechnikov
6e6276b4f8
added test
2020-08-07 09:47:05 +03:00
lain
03da653a12
Description: Refactor.
2020-08-06 16:41:56 +02:00
lain
532d6f94ae
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-bundles-downloads
2020-08-04 15:10:36 +02:00