Mark Felder
9e54ef086b
Merge branch 'develop' into feature/account-export
2020-10-27 12:51:31 -05:00
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
e062329a17
Merge branch 'develop' into 'feature/autofollowing'
...
# Conflicts:
# CHANGELOG.md
2020-10-27 17:42:24 +00:00
d6907e6e0c
Merge branch 'chore/elixir-1.11' into 'develop'
...
Elixir 1.11 compatibility / Phoenix 1.5+
See merge request pleroma/pleroma!3059
2020-10-22 20:33:52 +00:00
Egor Kislitsyn
e87901c424
Merge remote-tracking branch 'origin/develop' into feature/account-export
2020-10-20 17:27:29 +04:00
Ivan Tashkinov
50d4280880
[ #1668 ] Formatting fix.
2020-10-20 16:18:24 +03:00
Egor Kislitsyn
ad605e3e16
Rename Pleroma.Backup to Pleroma.User.Backup
2020-10-20 17:16:58 +04:00
Ivan Tashkinov
3a28aa8814
[ #1668 ] Added :prometheus group config to config/description.exs.
2020-10-20 15:13:20 +03:00
Ivan Tashkinov
524fb0e4c2
[ #1668 ] Restricted access to app metrics endpoint by default. Added ability to configure IP whitelist for this endpoint.
...
Added tests and documentation.
2020-10-18 21:22:21 +03:00
Ivan Tashkinov
9ea31b373f
Merge remote-tracking branch 'remotes/origin/develop' into chore/elixir-1.11
2020-10-17 17:53:47 +03:00
efd6572ffb
Remove suggestions
2020-10-16 17:43:44 +00:00
405f27b4f8
The suggestions are problematic as they need to be real local account names
2020-10-16 17:41:44 +00:00
1b8fd7e65a
Adds feature to permit e.g., local admins and community moderators to automatically follow all newly registered accounts
2020-10-16 17:36:02 +00:00
Mark Felder
1fb9452131
Merge branch 'develop' into feature/account-export
2020-10-14 15:27:15 -05:00
Mark Felder
b738f70953
Merge branch 'develop' into feature/gen-magic
2020-10-13 10:08:38 -05:00
Mark Felder
64553ebae2
Merge branch 'develop' into chore/elixir-1.11
2020-10-13 09:54:53 -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
87fc5a40f4
instrumenters has no effect in Endpoint anymore
2020-10-07 11:52:23 -05:00
Mark Felder
fddea9e3ce
:pubsub is deprecated and replaced wit :pubsub_server
2020-10-07 10:34:24 -05:00
Egor Kislitsyn
e52dd62e14
Add configurable temporary directory
2020-10-07 18:34:30 +04:00
Egor Kislitsyn
3ad7492f9d
Add config for Pleroma.Backup
2020-10-07 18:34:29 +04:00
Egor Kislitsyn
a0ad9bd734
Add BackupWorker
2020-10-07 18:34:28 +04: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
d43d05005a
Move hardcoded default configuration into config.exs
2020-10-06 17:02:46 -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
rinpatch
0a69dbc97c
Merge branch 'feature/update-description-for-frontends-setting' into 'develop'
...
Remove extra nesting and add labels in `:frontends` setting
See merge request pleroma/pleroma!3043
2020-10-06 18:05:03 +00:00
Alexander Strizhakov
cbdaabad34
web push http_client fix
2020-10-01 13:32:11 +03: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
Roman Chvanikov
8f5589cf66
Merge develop
2020-09-23 13:56:50 +03:00
Mark Felder
7b2bf381e9
Chase the Autolinker rename from !2677
2020-09-21 16:02:57 -05:00
Roman Chvanikov
4987ee6256
Merge branch 'develop' into feature/expire-mutes
2020-09-20 19:27:27 +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
lain
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
Steven Fuchs
f2ef9735c5
Federate data through persistent websocket connections
2020-09-18 11:58:22 +00:00
Sergey Suprunenko
226fa3e486
Make WebPushEncryption use Pleroma.HTTP as an HTTP adapter
2020-09-17 22:10:55 +02:00
Ivan Tashkinov
7cdbd91d83
[ #2497 ] Configurability of :min_content_length (preview proxy). Refactoring, documentation, tests.
2020-09-17 17:13:40 +03:00
Roman Chvanikov
44e8b6037a
Merge branch 'develop' into feature/expire-mutes
2020-09-17 14:54:00 +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
Roman Chvanikov
c5830ac037
Merge develop
2020-09-13 12:24:57 +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
7dd986a563
expire mfa tokens through Oban
2020-09-10 16:01:19 +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
Mark Felder
14d07081fd
Feed provider only generates a redirect, so always activate it.
...
Making this configurable is misleading.
2020-09-08 20:21:34 +03:00
Mark Felder
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
Haelwenn (lanodan) Monnier
788dececff
test: remove extraneous :instances_favicons config bits
2020-09-08 16:32:54 +02:00
Roman Chvanikov
880a92ccc7
Merge branch 'develop' into feature/expire-mutes
2020-09-08 15:16:43 +03:00
Roman Chvanikov
c56e3d4f3b
Add expires_in param for account mutes
2020-09-08 13:26:44 +03:00
Alexander Strizhakov
696bf09433
passing adapter options directly without adapter key
2020-09-07 19:59:17 +03: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
Ivan Tashkinov
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
Mark Felder
b529616e11
Increase pool and timeout for preview so it catches slow media pool responses
2020-09-03 15:08:12 -05: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
Alexander Strizhakov
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
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
Haelwenn
3d5d8c05c9
Merge branch '2064-image-blanking' into 'develop'
...
Resolve "Make default image description blank"
Closes #2064
See merge request pleroma/pleroma!2899
2020-08-18 19:02:33 +00:00
Ivan Tashkinov
da116d81fb
[ #2497 ] Added video preview proxy. Switched from exexec to Port.
2020-08-18 18:23:27 +03:00
Ivan Tashkinov
27e7999a15
Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
2020-08-18 18:02:09 +03:00
lain
83cef25794
Merge branch 'chore/improve-descriptions' into 'develop'
...
Improve description for mediaproxy cache invalidation settings
See merge request pleroma/pleroma!2891
2020-08-18 12:56:07 +00:00
lain
52a79506c7
Test config: Default to filename for descriptions
2020-08-18 14:37:35 +02:00
lain
aabc26a573
Pleroma.Upload: Set default upload name / description based on config.
2020-08-18 13:21:30 +02:00
Mark Felder
6c3130ef47
Improve description for mediaproxy cache invalidation settings
2020-08-14 13:07:58 -05:00
Ivan Tashkinov
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
dfc56de167
Merge branch 'feature/update-welcome-setting-in-description' into 'develop'
...
Update :welcome settings in description.exs
Closes #2024
See merge request pleroma/pleroma!2843
2020-08-12 16:18:40 +00:00
Ivan Tashkinov
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
lain
d0fc48ea67
Merge branch 'develop' into 'feat/floki-fast-html-2'
...
# Conflicts:
# config/config.exs
2020-08-09 10:53:58 +00:00
Mark Felder
54e2af8293
Merge branch 'develop' into fix/ldap-auth-issues
2020-08-07 14:55:22 -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
rinpatch
325c7c924b
Make Floki use fast_html
2020-08-07 16:45:33 +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
Ivan Tashkinov
1298a2ea2c
Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
...
# Conflicts:
# mix.lock
2020-08-07 09:38:05 +03:00
Alex Gleason
e639eee82e
restricted_nicknames: Add names from MastoAPI endpoints
2020-08-06 18:01:29 -05:00
lain
03da653a12
Description: Refactor.
2020-08-06 16:41:56 +02:00
lain
bf95dfb240
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-bundles-downloads
2020-08-06 15:22:20 +02:00
Mark Felder
d5e4d8a6f3
Define default authenticator in the config
2020-08-05 09:41:17 -05:00
lain
532d6f94ae
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-bundles-downloads
2020-08-04 15:10:36 +02:00
Angelina Filippova
8bb5441547
Update descriptions in :frontends group
2020-08-04 15:10:44 +03:00
lain
988ca4ab6a
Test Config: Don't have any MRFs by default
2020-08-04 14:07:10 +02:00
lain
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
Angelina Filippova
63b1ca6a07
Add label to :restrict_unauthenticated setting, fix typos
2020-08-04 02:21:25 +03:00
Angelina Filippova
ae95472dcc
Update :welcome settings description
2020-08-04 02:04:29 +03:00
Angelina Filippova
1489c2ae5f
Fix :args settings description in Upload.Filter.Mogrify group
2020-08-04 01:45:18 +03:00
lain
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
Ilja
13e5540c2c
Apply 1 suggestion(s) to 1 file(s)
2020-08-03 16:44:56 +00:00
lain
187d9bda0f
Description: Add new fields for frontend configuration.
2020-08-03 16:39:01 +02:00
lain
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
lain
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
Alex Gleason
dc88b6f091
Add email blacklist, fixes #1404
2020-08-02 14:53:42 -05:00
Alex Gleason
e9cff69bce
Add TagPolicy as default MRF, #2010
2020-08-02 12:24:40 -05:00
Ilja
f671d7e68c
Add welcome chatmessages
...
* I added the option in config/config.exs
* created a new module lib/pleroma/user/welcome_chat_message.ex
* Added it to the registration flow
* added to the cheatsheet
* added to the config/description.ex
* added to the Changelog.md
2020-08-02 15:54:59 +02:00
Alex Gleason
cb1e3893aa
SimpleMRF: Add missing :followers_only to config.exs
2020-08-01 16:08:29 -05:00
lain
4b18a07392
Revert "Merge branch 'revert-1ac0969c' into 'develop'"
...
This reverts merge request !2825
2020-07-31 15:18:04 +00:00
lain
010d77ec85
Revert "Merge branch 'mrf-silence-2' into 'develop'"
...
This reverts merge request !2820
2020-07-31 15:17:09 +00:00
lain
1ac0969c72
Merge branch 'mrf-silence-2' into 'develop'
...
MRF silencing alternative solution
See merge request pleroma/pleroma!2820
2020-07-31 14:43:33 +00:00
Haelwenn (lanodan) Monnier
0309514656
Default MRF to ObjectAgePolicy, 7 days threshold
2020-07-31 12:13:08 +02:00
lain
7bcd2e948e
Config: Default to Hackney again
...
Gun is still acting up.
2020-07-31 10:50:45 +02:00
lain
99bfdffb1d
Config: Add kenoma as available frontend.
2020-07-30 14:17:58 +02:00
lain
4ce4d799fd
Config: Add frontend information.
2020-07-30 14:14:58 +02:00
Alex Gleason
702f0fb822
Merge remote-tracking branch 'upstream/develop' into mrf-silence
2020-07-29 13:01:16 -05:00
Alex Gleason
93638935d7
SimpleMRF: :silence --> :followers_only
2020-07-29 12:58:08 -05:00
Alex Gleason
d8a01c9432
Merge remote-tracking branch 'upstream/develop' into hide-reactions
2020-07-29 12:43:39 -05:00
lain
d249f91b3f
Descriptions: Update with admin frontend info
2020-07-29 16:27:11 +02:00
lain
dc36d6e9d2
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-bundles-admin
2020-07-29 16:24:22 +02:00
lain
79f9ddd8b7
Merge branch 'by-approval' into 'develop'
...
Registrations "by approval" mode
Closes #1931
See merge request pleroma/pleroma!2757
2020-07-29 11:27:26 +00:00
lain
e2f82968e8
Config: Update frontend config example
2020-07-29 13:04:29 +02:00
Alex Gleason
3c90f7f715
SimpleMRF: Let instances be silenced
2020-07-28 19:06:42 -05:00
Alex Gleason
3b7c454418
Let favourites and emoji reactions optionally be hidden
2020-07-28 14:58:30 -05:00
Mark Felder
bee29f6610
Clarify location of frontends directory
2020-07-28 12:10:04 -05:00
lain
08732e8a03
Docs: Add frontend info to cheat sheet.
2020-07-28 17:46:37 +02:00
Roman Chvanikov
d64c976390
Add description for configuration.
2020-07-28 17:40:21 +02:00
Alex Gleason
520dce857e
Add :registration_reason_length to description.exs
2020-07-27 15:24:20 -05:00
Alex Gleason
6f44a0ee84
Add configurable registration_reason limit
2020-07-27 15:13:34 -05:00
Alex Gleason
6747bf2e16
Merge remote-tracking branch 'upstream/develop' into by-approval
2020-07-27 12:29:18 -05:00
lain
2a3abfd326
Merge branch 'issue/1934-welcome-email' into 'develop'
...
[#1934 ] welcome email
See merge request pleroma/pleroma!2786
2020-07-27 12:34:36 +00:00
Alex Gleason
6931dbfa58
Merge remote-tracking branch 'upstream/develop' into by-approval
2020-07-26 15:46:14 -05:00
Angelina Filippova
4d80cf5409
Update types in Pleroma.Formatter group
2020-07-26 01:48:50 +03:00
Maksim Pechnikov
61ef1fca4b
remove duplicate module
2020-07-24 08:35:06 +03:00
Maksim Pechnikov
67ab9a7928
Merge branch 'develop' into issue/1934-welcome-email
2020-07-23 16:36:27 +03:00
Angelina Filippova
188b0dc72d
Add related_policy field
2020-07-22 18:15:30 +03:00
Maksim Pechnikov
5879d36854
fix sender for welcome email
2020-07-22 15:34:47 +03:00
Maksim Pechnikov
b620290dd9
update description
2020-07-22 09:20:00 +03:00
lain
5b1eeb06d8
Revert "Merge branch 'revert-2b5d9eb1' into 'develop'"
...
This reverts merge request !2784
2020-07-21 22:18:17 +00:00
lain
696c13ce54
Revert "Merge branch 'linkify' into 'develop'"
...
This reverts merge request !2677
2020-07-21 22:17:34 +00:00
Maksim Pechnikov
3edaecae96
added welcome email
2020-07-21 09:25:53 +03:00
Ivan Tashkinov
bdf57b8ef4
Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
...
# Conflicts:
# config/config.exs
# lib/pleroma/web/media_proxy/media_proxy.ex
# mix.lock
# test/web/media_proxy/media_proxy_test.exs
2020-07-19 20:05:37 +03:00
