Commit graph

900 commits

Author SHA1 Message Date
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 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
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
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
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
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
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
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
2020-08-12 16:18:40 +00: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
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
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