Mark Felder
9e54ef086b
Merge branch 'develop' into feature/account-export
4 years ago
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
4 years ago
feld
e062329a17
Merge branch 'develop' into 'feature/autofollowing'
...
# Conflicts:
# CHANGELOG.md
4 years ago
feld
d6907e6e0c
Merge branch 'chore/elixir-1.11' into 'develop'
...
Elixir 1.11 compatibility / Phoenix 1.5+
See merge request pleroma/pleroma!3059
4 years ago
Egor Kislitsyn
e87901c424
Merge remote-tracking branch 'origin/develop' into feature/account-export
4 years ago
Ivan Tashkinov
50d4280880
[ #1668 ] Formatting fix.
4 years ago
Egor Kislitsyn
ad605e3e16
Rename `Pleroma.Backup` to `Pleroma.User.Backup`
4 years ago
Ivan Tashkinov
3a28aa8814
[ #1668 ] Added :prometheus group config to config/description.exs.
4 years ago
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.
4 years ago
Ivan Tashkinov
9ea31b373f
Merge remote-tracking branch 'remotes/origin/develop' into chore/elixir-1.11
4 years ago
Mark Felder
efd6572ffb
Remove suggestions
4 years ago
Mark Felder
405f27b4f8
The suggestions are problematic as they need to be real local account names
4 years ago
Mark Felder
1b8fd7e65a
Adds feature to permit e.g., local admins and community moderators to automatically follow all newly registered accounts
4 years ago
Mark Felder
1fb9452131
Merge branch 'develop' into feature/account-export
4 years ago
Mark Felder
b738f70953
Merge branch 'develop' into feature/gen-magic
4 years ago
Mark Felder
64553ebae2
Merge branch 'develop' into chore/elixir-1.11
4 years ago
Alexander Strizhakov
3be8ab5103
RemoteIp module name
4 years ago
Mark Felder
04b514c567
Merge branch 'develop' into feature/gen-magic
4 years ago
Haelwenn
74be4de3f6
Merge branch 'fix/2209-remoteip' into 'develop'
...
#2209 RemoteIP CIDR helper, config and doc improvements
See merge request pleroma/pleroma!3057
4 years ago
Mark Felder
87fc5a40f4
instrumenters has no effect in Endpoint anymore
4 years ago
Mark Felder
fddea9e3ce
:pubsub is deprecated and replaced wit :pubsub_server
4 years ago
Egor Kislitsyn
e52dd62e14
Add configurable temporary directory
4 years ago
Egor Kislitsyn
3ad7492f9d
Add config for Pleroma.Backup
4 years ago
Egor Kislitsyn
a0ad9bd734
Add BackupWorker
4 years ago
Mark Felder
b90eda3d8b
Improve description yet again
4 years ago
Mark Felder
e08eb4aba0
Don't leak internal variables in the docs. They're useless to users.
4 years ago
Mark Felder
b8c05f4876
Improve descriptions for reserved and proxies
4 years ago
Mark Felder
d43d05005a
Move hardcoded default configuration into config.exs
4 years ago
Mark Felder
7aff2b47c5
Fix docs for default headers used by RemoteIp. We only use X-Forwarded-For by default.
4 years ago
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
4 years ago
Alexander Strizhakov
cbdaabad34
web push http_client fix
4 years ago
Angelina Filippova
d96b8923f6
Fix typo
4 years ago
Angelina Filippova
fe19750644
Fix comma typo
4 years ago
Angelina Filippova
1b2f7139c8
Apply 1 suggestion(s) to 1 file(s)
4 years ago
Angelina Filippova
0e57f13365
Apply 1 suggestion(s) to 1 file(s)
4 years ago
Angelina Filippova
7ac4d1e7ee
Remove extra nesting and add labels in `:frontends` setting
4 years ago
Roman Chvanikov
8f5589cf66
Merge develop
4 years ago
Mark Felder
7b2bf381e9
Chase the Autolinker rename from !2677
4 years ago
Roman Chvanikov
4987ee6256
Merge branch 'develop' into feature/expire-mutes
4 years ago
feld
6c052bd5b6
Merge branch 'media-preview-proxy-nostream' into 'develop'
...
Media preview proxy
See merge request pleroma/pleroma!3001
4 years ago
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
4 years ago
Steven Fuchs
f2ef9735c5
Federate data through persistent websocket connections
4 years ago
Sergey Suprunenko
226fa3e486
Make WebPushEncryption use Pleroma.HTTP as an HTTP adapter
4 years ago
Ivan Tashkinov
7cdbd91d83
[ #2497 ] Configurability of :min_content_length (preview proxy). Refactoring, documentation, tests.
4 years ago
Roman Chvanikov
44e8b6037a
Merge branch 'develop' into feature/expire-mutes
4 years ago
Ivan Tashkinov
2f155fb89f
Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy-nostream
4 years ago
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
4 years ago
Roman Chvanikov
c5830ac037
Merge develop
4 years ago
Ivan Tashkinov
0bda85857e
Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy
...
# Conflicts:
# lib/pleroma/instances/instance.ex
4 years ago
Mark Felder
55562ca936
Merge branch 'develop' into feature/gen-magic
4 years ago
Alexander Strizhakov
2c2094d4b2
configurable lifetime for ephemeral activities
4 years ago
Alexander Strizhakov
629a8de9cb
deprecation warning
...
changed namespace for activity expiration configuration
4 years ago
Alexander Strizhakov
9bf1065a06
schedule activity expiration in Oban
4 years ago
Alexander Strizhakov
7dd986a563
expire mfa tokens through Oban
4 years ago
Alexander Strizhakov
3ce658b930
schedule expired oauth tokens deletion with Oban
4 years ago
Mark Felder
4ee99dafcc
Merge branch 'develop' into media-preview-proxy
4 years ago
Mark Felder
14d07081fd
Feed provider only generates a redirect, so always activate it.
...
Making this configurable is misleading.
4 years ago
Mark Felder
630444ee08
Do not make RelMe metadata provider optional.
...
There's really no sound reason to turn this off anyway.
4 years ago
Haelwenn (lanodan) Monnier
788dececff
test: remove extraneous :instances_favicons config bits
4 years ago
Roman Chvanikov
880a92ccc7
Merge branch 'develop' into feature/expire-mutes
4 years ago
Roman Chvanikov
c56e3d4f3b
Add expires_in param for account mutes
4 years ago
Alexander Strizhakov
696bf09433
passing adapter options directly without adapter key
4 years ago
Alexander Strizhakov
a83916fdac
adapter options unification
...
not needed options deletion
4 years ago
Alexander Strizhakov
ee67c98e55
removing Stats worker from Oban cron jobs
4 years ago
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.
4 years ago
Mark Felder
b529616e11
Increase pool and timeout for preview so it catches slow media pool responses
4 years ago
Mark Felder
6141eb94ab
Fetch preview requests through the MediaProxy. Separate connection options are not needed.
...
Use a separate pool for preview requests
4 years ago
Mark Felder
85446cc30c
Merge branch 'develop' into media-preview-proxy
4 years ago
rinpatch
19691389b9
Rich media: Add failure tracking
4 years ago
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
4 years ago
Mark Felder
899ea2da3e
Switch to imagemagick, only support videos
4 years ago
Mark Felder
479578b148
Merge branch 'develop' into feld-2168-media-preview-proxy
4 years ago
lain
6d6e43fd09
Description: Update description.
4 years ago
lain
c1d51944c7
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-bundles-downloads
4 years ago
Angelina Filippova
6e5678b5af
Add Pleroma.Web.Preload to description.exs
4 years ago
Ivan Tashkinov
aa0a5ffb48
[ #2497 ] Media preview proxy: added `quality` config setting, adjusted width/height defaults.
4 years ago
Ivan Tashkinov
4ee15e991e
[ #2497 ] Media preview proxy config refactoring & documentation.
4 years ago
Haelwenn
3d5d8c05c9
Merge branch '2064-image-blanking' into 'develop'
...
Resolve "Make default image description blank"
Closes #2064
See merge request pleroma/pleroma!2899
4 years ago
Ivan Tashkinov
da116d81fb
[ #2497 ] Added video preview proxy. Switched from exexec to Port.
4 years ago
Ivan Tashkinov
27e7999a15
Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
4 years ago
lain
83cef25794
Merge branch 'chore/improve-descriptions' into 'develop'
...
Improve description for mediaproxy cache invalidation settings
See merge request pleroma/pleroma!2891
4 years ago
lain
52a79506c7
Test config: Default to filename for descriptions
4 years ago
lain
aabc26a573
Pleroma.Upload: Set default upload name / description based on config.
4 years ago
Mark Felder
6c3130ef47
Improve description for mediaproxy cache invalidation settings
4 years ago
Ivan Tashkinov
95529ab709
[ #2046 ] Defaulted pleroma/restrict_unauthenticated basing on instance privacy setting (i.e. restrict on private instances only by default).
4 years ago
feld
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
4 years ago
Ivan Tashkinov
2def3cbf41
Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
...
# Conflicts:
# config/config.exs
# mix.lock
4 years ago
lain
d0fc48ea67
Merge branch 'develop' into 'feat/floki-fast-html-2'
...
# Conflicts:
# config/config.exs
4 years ago
Mark Felder
54e2af8293
Merge branch 'develop' into fix/ldap-auth-issues
4 years ago
Angelina Filippova
f21b6ebd5d
Merge branch 'feature/update-welcome-setting-in-description' of git.pleroma.social:pleroma/pleroma into feature/update-welcome-setting-in-description
4 years ago
Angelina Filippova
8e1f7a3eff
Add new `image` type to settings whose values are image urls
4 years ago
rinpatch
325c7c924b
Make Floki use fast_html
4 years ago
lain
3f88366e2a
Apply 1 suggestion(s) to 1 file(s)
4 years ago
Maksim Pechnikov
8e90cc58e7
Merge branch 'develop' into feature/update-welcome-setting-in-description
4 years ago
Maksim Pechnikov
6e6276b4f8
added test
4 years ago
Ivan Tashkinov
1298a2ea2c
Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
...
# Conflicts:
# mix.lock
4 years ago
Alex Gleason
e639eee82e
restricted_nicknames: Add names from MastoAPI endpoints
4 years ago
lain
03da653a12
Description: Refactor.
4 years ago
lain
bf95dfb240
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-bundles-downloads
4 years ago
Mark Felder
d5e4d8a6f3
Define default authenticator in the config
4 years ago
lain
532d6f94ae
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-bundles-downloads
4 years ago
Angelina Filippova
8bb5441547
Update descriptions in :frontends group
4 years ago
lain
988ca4ab6a
Test Config: Don't have any MRFs by default
4 years ago
lain
28584bb224
Merge branch 'email-blacklist' into 'develop'
...
Add email blacklist, fixes #1404
Closes #1404
See merge request pleroma/pleroma!2837
4 years ago
Angelina Filippova
63b1ca6a07
Add label to :restrict_unauthenticated setting, fix typos
4 years ago
Angelina Filippova
ae95472dcc
Update :welcome settings description
4 years ago
Angelina Filippova
1489c2ae5f
Fix :args settings description in Upload.Filter.Mogrify group
4 years ago
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
4 years ago
Ilja
13e5540c2c
Apply 1 suggestion(s) to 1 file(s)
4 years ago
lain
187d9bda0f
Description: Add new fields for frontend configuration.
4 years ago
lain
56b5b9aa27
Merge branch 'follower-mrf-again' into 'develop'
...
Follower mrf again
See merge request pleroma/pleroma!2833
4 years ago
lain
66ebd88634
Merge branch 'config/default_ok_oldage' into 'develop'
...
config: :mrf, :policies default to ObjectAgePolicy
Closes #2000
See merge request pleroma/pleroma!2814
4 years ago
Alex Gleason
dc88b6f091
Add email blacklist, fixes #1404
4 years ago
Alex Gleason
e9cff69bce
Add TagPolicy as default MRF, #2010
4 years ago
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
4 years ago
Alex Gleason
cb1e3893aa
SimpleMRF: Add missing :followers_only to config.exs
4 years ago
lain
4b18a07392
Revert "Merge branch 'revert-1ac0969c' into 'develop'"
...
This reverts merge request !2825
4 years ago
lain
010d77ec85
Revert "Merge branch 'mrf-silence-2' into 'develop'"
...
This reverts merge request !2820
4 years ago
lain
1ac0969c72
Merge branch 'mrf-silence-2' into 'develop'
...
MRF silencing alternative solution
See merge request pleroma/pleroma!2820
4 years ago
Haelwenn (lanodan) Monnier
0309514656
Default MRF to ObjectAgePolicy, 7 days threshold
4 years ago
lain
7bcd2e948e
Config: Default to Hackney again
...
Gun is still acting up.
4 years ago
lain
99bfdffb1d
Config: Add kenoma as available frontend.
4 years ago
lain
4ce4d799fd
Config: Add frontend information.
4 years ago
Alex Gleason
702f0fb822
Merge remote-tracking branch 'upstream/develop' into mrf-silence
4 years ago
Alex Gleason
93638935d7
SimpleMRF: :silence --> :followers_only
4 years ago
Alex Gleason
d8a01c9432
Merge remote-tracking branch 'upstream/develop' into hide-reactions
4 years ago
lain
d249f91b3f
Descriptions: Update with admin frontend info
4 years ago
lain
dc36d6e9d2
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-bundles-admin
4 years ago
lain
79f9ddd8b7
Merge branch 'by-approval' into 'develop'
...
Registrations "by approval" mode
Closes #1931
See merge request pleroma/pleroma!2757
4 years ago
lain
e2f82968e8
Config: Update frontend config example
4 years ago
Alex Gleason
3c90f7f715
SimpleMRF: Let instances be silenced
4 years ago
Alex Gleason
3b7c454418
Let favourites and emoji reactions optionally be hidden
4 years ago
Mark Felder
bee29f6610
Clarify location of frontends directory
4 years ago
lain
08732e8a03
Docs: Add frontend info to cheat sheet.
4 years ago
Roman Chvanikov
d64c976390
Add description for configuration.
4 years ago
Alex Gleason
520dce857e
Add :registration_reason_length to description.exs
4 years ago
Alex Gleason
6f44a0ee84
Add configurable registration_reason limit
4 years ago
Alex Gleason
6747bf2e16
Merge remote-tracking branch 'upstream/develop' into by-approval
4 years ago
lain
2a3abfd326
Merge branch 'issue/1934-welcome-email' into 'develop'
...
[#1934 ] welcome email
See merge request pleroma/pleroma!2786
4 years ago
Alex Gleason
6931dbfa58
Merge remote-tracking branch 'upstream/develop' into by-approval
4 years ago
Angelina Filippova
4d80cf5409
Update types in Pleroma.Formatter group
4 years ago
Maksim Pechnikov
61ef1fca4b
remove duplicate module
4 years ago
Maksim Pechnikov
67ab9a7928
Merge branch 'develop' into issue/1934-welcome-email
4 years ago
Angelina Filippova
188b0dc72d
Add related_policy field
4 years ago
Maksim Pechnikov
5879d36854
fix sender for welcome email
4 years ago
Maksim Pechnikov
b620290dd9
update description
4 years ago
lain
5b1eeb06d8
Revert "Merge branch 'revert-2b5d9eb1' into 'develop'"
...
This reverts merge request !2784
4 years ago
lain
696c13ce54
Revert "Merge branch 'linkify' into 'develop'"
...
This reverts merge request !2677
4 years ago
Maksim Pechnikov
3edaecae96
added welcome email
4 years ago
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
4 years ago