Commit graph

296 commits

Author SHA1 Message Date
Alex Gleason
520dce857e
Add :registration_reason_length to description.exs 2020-07-27 15:24:20 -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
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
Alex Gleason
6fdaee7cae
description.exs typofixes 2020-07-16 14:52:48 -05:00
Alex Gleason
38425ebdbf
Merge remote-tracking branch 'upstream/develop' into linkify 2020-07-16 14:51:36 -05:00
rinpatch
007843b75e Add documentation for new connection pool settings and remove some
`:retry_timeout` and `:retry` got removed because reconnecting on failure is
something the new pool intentionally doesn't do.

`:max_overflow` had to go in favor of `:max_waiting`, I didn't reuse the key because
the settings are very different in their behaviour.

`:checkin_timeout` got removed in favor of `:connection_acquisition_wait`,
I didn't reuse the key because the settings are somewhat different.

I didn't do any migrations/deprecation warnings/changelog entries because
these settings were never in stable.
2020-07-15 15:26:35 +03:00
Alex Gleason
48983e9421
Merge remote-tracking branch 'upstream/develop' into by-approval 2020-07-14 18:56:40 -05:00
3f65f2ea79 Merge branch 'feature/1922-media-proxy-whitelist' into 'develop'
Support for hosts with scheme in MediaProxy whitelist setting

Closes #1922

See merge request pleroma/pleroma!2754
2020-07-14 18:07:44 +00:00
Mark Felder
ce314e6fe2 Clarify description and suggestion 2020-07-14 11:24:58 -05:00
Ivan Tashkinov
9b225db7d8 [#1940] Applied rate limit for requests with bad admin_token. Added doc warnings on admin_token setting. 2020-07-14 11:58:41 +03:00
5d215fd81f Merge branch 'config-behaviours-runtime' into 'develop'
Config/Docs: Expand behaviour suggestions modules at runtime

Closes #1941

See merge request pleroma/pleroma!2755
2020-07-13 15:45:25 +00:00
db529d454e Merge branch 'fix/mediaproxy-cache-settings-types' into 'develop'
Update types for :headers and :options settings in Pleroma.Web.MediaProxy.Invalidation.Http

See merge request pleroma/pleroma!2735
2020-07-13 15:38:56 +00:00
Alex Gleason
51ab8d0128
Add account_approval_required instance setting 2020-07-12 20:27:58 -05:00
href
4347d2de5e Config/Docs: Expand behaviour suggestions at runtime 2020-07-12 17:23:33 +02:00
Alexander Strizhakov
b376442325
MediaProxy whitelist setting now supports hosts with scheme
added deprecation warning about using bare domains
2020-07-12 12:41:40 +03:00
Angelina Filippova
0eeeaa37e8 Update types in MRF Keyword group 2020-07-12 01:38:16 +03:00
Angelina Filippova
98c56ff477 Remove :regex from types 2020-07-11 04:32:44 +03:00
Angelina Filippova
02b2747d42 Update types for :params, :match_actor and :replace settings 2020-07-11 04:17:21 +03:00
d6f67fa91b Merge branch 'issue/1790-updated-oban' into 'develop'
[#1790] updated oban to 2.0.0

See merge request pleroma/pleroma!2674
2020-07-10 17:39:46 +00:00
Mark Felder
3c0c1fd2ef Merge branch 'develop' into issue/1790-updated-oban 2020-07-10 11:34:53 -05:00
Alexander Strizhakov
b1b8f5f11a
docs and descriptions for s3 settings 2020-07-10 09:16:53 +03:00
Angelina Filippova
ac9f18de11 Update type for :replace settings 2020-07-10 03:32:53 +03:00
Angelina Filippova
6b9210e886 Update type for :groups setting 2020-07-10 03:07:55 +03:00
lain
f4469dc741 Merge branch 'features/favicons' into 'develop'
Add support for remote favicons

See merge request pleroma/pleroma!2261
2020-07-09 13:09:31 +00:00
Angelina Filippova
33e6285636 Update types for :headers and :options settings in MediaProxy Invalidation group 2020-07-09 01:33:23 +03:00
Haelwenn (lanodan) Monnier
312fc55f14
Add [:instances_favicons, :enabled] setting, defaults to false 2020-07-08 06:28:40 +02:00
Ivan Tashkinov
20461137a3 [#1895] Documentation hints on private instances and instance/restrict_unauthenticated setting. 2020-07-07 20:44:16 +03:00
DYM
a784c09db8 added hyper:// to default protocols 2020-07-07 09:05:54 +02:00
Mark Felder
4695bdd81b Merge branch 'develop' into issue/1790-updated-oban 2020-07-03 10:36:41 -05:00
Mark Felder
80076f1974 Lint, long lines 2020-07-02 10:33:27 -05:00
Mark Felder
d169e51b7e Improve descriptions, move primary MRF settings to top for AdminFE ordering 2020-07-02 10:27:15 -05:00
Mark Felder
6b5563ed2c Merge branch 'develop' into feature/1885-MRF-metadata 2020-07-02 09:57:57 -05:00
lain
d884b6f704 Merge branch 'feature/update-description' into 'develop'
Update settings descriptions and labels

See merge request pleroma/pleroma!2709
2020-07-02 08:43:32 +00:00
Angelina Filippova
df2d6564d5 Add labels, update descriptions and labels 2020-07-01 03:01:15 +03:00
Alex Gleason
8daacc9114
AutoLinker --> Linkify, update to latest version
https://git.pleroma.social/pleroma/elixir-libraries/linkify
2020-06-30 16:39:15 -05:00
Alexander Strizhakov
f89390110b
added tab & labels for mrf policies 2020-06-27 12:18:34 +03:00
Alexander Strizhakov
e7bc0273e5
additional data to MRF policies in descriptions 2020-06-26 15:22:08 +03:00
Alexander Strizhakov
91cd023720
Pleroma.Upload.Filter.Mogrify args description 2020-06-26 09:03:07 +03:00
lain
1d0804b49f Merge branch 'chore/remove-reference-to-distsn' into 'develop'
Remove reference to defunct distsn.org

See merge request pleroma/pleroma!2675
2020-06-25 10:42:57 +00:00
lain
f585622f85 Apply suggestion to config/description.exs 2020-06-25 10:17:16 +00:00
Maksim Pechnikov
cc837f9d15 fixed config/descpiption.exs 2020-06-24 21:21:33 +03:00
Haelwenn
c7d69e9256 Merge branch 'feature/1631-redesign-mrf-configuration' into 'develop'
Moving mrf settings from instance to separate mrf group

Closes #1631

See merge request pleroma/pleroma!2320
2020-06-23 16:38:27 +00:00
Mark Felder
54039100fe Remove reference to defunct distsn.org 2020-06-23 11:17:26 -05:00
Mark Felder
3462d4b995 Merge branch 'develop' into issue/1855 2020-06-17 12:50:06 -05:00
Alexander Strizhakov
ed189568f3
moving mrf settings from instance to separate group 2020-06-16 18:32:18 +03:00
href
f124f68205 Switch from gen_magic to majic, use Majic.Plug, remove Pleroma.MIME 2020-06-16 15:27:27 +02:00
href
ec1452fd1c Pleroma.MIME: use gen_magic 2020-06-16 15:15:50 +02:00
Maksim Pechnikov
579763126f Merge branch 'develop' into issue/1855 2020-06-15 15:24:55 +03:00
Egor Kislitsyn
58e4e3db8b
Merge remote-tracking branch 'origin/develop' into merge-ogp-twitter-parsers 2020-06-15 16:03:40 +04:00
Maksim Pechnikov
2e8a236cef fix invalidates media url's 2020-06-14 21:02:57 +03:00
href
cb7be6eef2 Remove use of atoms in MRF.UserAllowListPolicy 2020-06-13 12:08:46 +03:00
Egor Kislitsyn
697cf92024
Merge remote-tracking branch 'origin/develop' into merge-ogp-twitter-parsers 2020-06-12 18:25:29 +04:00
lain
4655407451 Apply suggestion to config/description.exs 2020-06-12 14:03:33 +00:00
Egor Kislitsyn
1f35acce54
Merge OGP parser with TwitterCard 2020-06-11 17:57:31 +04:00
Egor Kislitsyn
a7627bdc7a
Merge remote-tracking branch 'origin/develop' into global-status-expiration 2020-06-01 15:48:51 +04:00
Roman Chvanikov
8eb1dfadca Update CHANGELOG and docs 2020-05-22 18:30:13 +03:00
eugenijm
b7fc61e17b Added the ability to upload background, logo, default user avatar, instance thumbnail, and the NSFW hiding image via AdminFE 2020-05-21 04:41:42 +03:00
Mark Felder
4c48626585 Also add new sidebarRight setting 2020-05-20 12:22:31 -05:00
lain
64b3d81e50 Merge branch 'feature/remove-settings-that-shouldnt-be-altered' into 'develop'
Remove settings that shouldn't be altered

Closes admin-fe#110

See merge request pleroma/pleroma!2540
2020-05-17 07:48:52 +00:00
Angelina Filippova
4a925b964a Remove description of the settings that should't be altered 2020-05-16 20:39:42 +03:00
Mark Felder
54b4824186 Lint 2020-05-13 17:07:14 -05:00
Mark Felder
6f53d8815e Clarify where the Features panel is 2020-05-13 16:57:33 -05:00
Mark Felder
2560a4aa56 Formatting 2020-05-13 16:51:23 -05:00
Mark Felder
0c82a967ec Add missing showFeaturesPanel setting 2020-05-13 16:49:56 -05:00
Mark Felder
5131149056 add postContentType setting 2020-05-13 16:45:16 -05:00
Mark Felder
52a95a0265 Add missing nsfwCensorImage option 2020-05-13 16:40:04 -05:00
Mark Felder
923ab78807 Add missing hideSitename setting 2020-05-13 16:36:33 -05:00
Mark Felder
c86cdb76a7 Add hideFilteredStatuses and hideMutedPosts settings 2020-05-13 16:35:12 -05:00
Mark Felder
7f00698c3b Add greentext option 2020-05-13 16:32:38 -05:00
Mark Felder
38fb5eaf6a formattingOptionsEnabled no longer exists 2020-05-13 16:31:15 -05:00
Mark Felder
4bdde143f9 Add disableChat option 2020-05-13 16:30:24 -05:00
Mark Felder
2420d7f439 Spelling/grammar 2020-05-13 16:26:49 -05:00
Mark Felder
4aad764c1d enableEmojiPicker is not a setting 2020-05-13 16:24:37 -05:00
Mark Felder
2e28b50132 scopeOptionsEnabled has been replaced with minimalScopesMode 2020-05-13 16:23:42 -05:00
Mark Felder
e2c80e62f1 Stickers setting does not exist 2020-05-13 16:19:17 -05:00
Mark Felder
1e48aee50e Alpha sort FE config descriptions 2020-05-13 16:18:26 -05:00
Mark Felder
1b93581162 Synchronize suggestions with all available static/config.json settings 2020-05-13 16:03:42 -05:00
Alexander Strizhakov
da6a38d205
copy/paste fix for descriptions 2020-05-11 09:35:20 +03:00
lain
7ca83e71a9 Merge branch 'shortening-modules-name' into 'develop'
Descriptions that module names are shortened

See merge request pleroma/pleroma!2428
2020-05-10 09:05:22 +00:00
Mark Felder
c9344b5f2d Minor grammar nit 2020-05-08 14:36:59 -05:00
Maksim
3d0c567fbc Pleroma.Web.TwitterAPI.TwoFactorAuthenticationController -> Pleroma.Web.PleromaAPI.TwoFactorAuthenticationController 2020-05-07 08:14:54 +00:00
rinpatch
5482a1f6ef Merge branch 'openapi/validation-plug' into 'develop'
Ignore unexpected query params and ENUM values

Closes #1719

See merge request pleroma/pleroma!2468
2020-05-05 12:08:58 +00:00
Egor Kislitsyn
cc922e7d8c
Document configuration for Pleroma.Web.ApiSpec.CastAndValidate 2020-05-05 15:01:33 +04:00
Egor Kislitsyn
decaa64f75
Merge branch 'develop' into global-status-expiration 2020-05-05 14:28:54 +04:00
b1c29e2de8 Merge branch 'feature/update-labels-for-activating-settings' into 'develop'
Fix inconsistency in language for activating settings in description.exs

Closes admin-fe#108

See merge request pleroma/pleroma!2469
2020-05-04 20:24:08 +00:00
Angelina Filippova
2ab52d5224 Fix inconsistency in language for activating settings 2020-05-04 22:41:14 +03:00
Ivan Tashkinov
92efb888c7 Made follow request notifications non-optional (removed config switch). 2020-05-01 09:51:41 +03:00
Alexander Strizhakov
66acfa6882
descriptions that module names are shortened 2020-04-27 10:28:05 +03:00
Egor Kislitsyn
c56c0a3d23
Merge branch 'develop' into global-status-expiration 2020-04-24 18:37:58 +04:00
Egor Kislitsyn
364eecc49f
Merge branch 'develop' into global-status-expiration 2020-04-20 20:37:56 +04:00
Alex Gleason
bedc558809
Merge remote-tracking branch 'upstream/develop' into accept-deletes 2020-04-20 10:15:40 -05:00
Alex Gleason
b54c8813d6
Add :reject_deletes option to SimplePolicy 2020-04-20 10:11:06 -05:00
Egor Kislitsyn
7f692343c8
Merge branch 'develop' into global-status-expiration 2020-04-10 14:20:48 +04:00
Ivan Tashkinov
1a4875adfa [#1559] Support for "follow_request" notifications (configurable).
(Not currently supported by PleromaFE, thus disabled by default).
2020-04-07 21:52:32 +03:00
Alexander Strizhakov
f497cf2f7c
Merge branch 'develop' into gun 2020-03-30 12:15:23 +03:00
Ivan Tashkinov
012d428e1f Merge remote-tracking branch 'remotes/origin/develop' into 1364-notifications-sending-control 2020-03-25 09:05:17 +03:00
Ivan Tashkinov
e743c22329 Fixed incorrect usage of "relations" as a short form of "relationships". 2020-03-25 09:04:00 +03:00
Egor Kislitsyn
80e1571610
Merge branch 'develop' into global-status-expiration 2020-03-20 22:08:34 +04:00
Alexander Strizhakov
9bae9b1b1b
Merge branch 'develop' into gun 2020-03-20 20:47:54 +03:00
Alexander Strizhakov
fe15f0ba15
restrict_unauthenticated setting 2020-03-20 16:36:20 +03:00
Egor Kislitsyn
421e35b578
Merge branch 'develop' into global-status-expiration 2020-03-16 15:31:31 +04:00
Alexander Strizhakov
f0651730bd
Merge branch 'develop' into gun 2020-03-16 14:25:55 +03:00
Alexander Strizhakov
ba90a6d3e5
removing from descriptions.exs deprecated settings 2020-03-16 14:01:35 +03:00
rinpatch
e87a32bcd7 rip out fetch_initial_posts
Every time someone tries to use it, it goes mad and tries to scrape the
entire fediverse for no visible reason, it's better to just remove it
than continue shipping it in it's current state.

idea acked by lain and feld on irc

Closes #1595 #1422
2020-03-15 15:59:17 +03:00
Alexander Strizhakov
b34bc669b9
adding descriptions 2020-03-04 20:09:18 +03:00
Egor Kislitsyn
0f386110c6
Merge remote-tracking branch 'origin/develop' into global-status-expiration 2020-03-03 00:32:34 +04:00
Alexander Strizhakov
d9e4b77f8b
Merge branch 'develop' into gun 2020-03-01 12:48:49 +03:00
rinpatch
ffcebe7e22 timeline controller: rate limit timelines to 3 requests per 500ms per timeline per ip/user 2020-03-01 01:13:08 +03:00
Alexander Strizhakov
814b275af7
Merge branch 'develop' into gun 2020-02-29 11:34:50 +03:00
Alexander Strizhakov
04b03e4762
streamer group & Oban crontab child 2020-02-29 11:26:34 +03:00
Alexander Strizhakov
2076c9f8c8
unnecessary groups 2020-02-26 19:50:07 +03:00
Egor Kislitsyn
011ede4536
Update documentation 2020-02-21 14:42:43 +04:00
Alexander Strizhakov
13918cb545
Merge branch 'develop' into gun 2020-02-21 10:02:37 +03:00
Ivan Tashkinov
0c65a8c3d0 Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation
# Conflicts:
#	config/config.exs
2020-02-20 15:00:48 +03:00
lain
e0b2de6385 Merge branch 'feature/new-registrations-digest' into 'develop'
New users digest email

Closes #1514

See merge request pleroma/pleroma!2128
2020-02-20 11:58:37 +00:00
Ivan Tashkinov
61d9f43e46 Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation 2020-02-18 17:46:09 +03:00
Alexander Strizhakov
514c899275
adding gun adapter 2020-02-18 08:19:01 +03:00
Ivan Tashkinov
269d592181 [#1505] Restricted max thread distance for fetching replies on incoming federation (in addition to reply-to depth restriction). 2020-02-15 20:41:38 +03:00
Egor Kislitsyn
0ddcd67d32
Update cheatsheet.md and config/description.exs 2020-02-14 16:53:53 +04:00
Mark Felder
0afff36cda Formatting got me again 2020-02-13 12:09:11 -06:00
Mark Felder
21dc3e3812 Even more description improvements 2020-02-13 12:01:13 -06:00
Mark Felder
aac7f30eb2 Add missing Oban job for attachments_cleanup 2020-02-13 11:49:19 -06:00
Mark Felder
1c52cf933f More description cleanup work 2020-02-13 11:45:58 -06:00
Mark Felder
9218f893d7 More description cleanups 2020-02-13 11:31:02 -06:00
b312c36b8e Merge branch 'develop' into 'fix/rename-no_attachment_links-setting'
# Conflicts:
#   config/description.exs
2020-02-13 14:37:55 +00:00
Mark Felder
571a475c7e Formatting 2020-02-13 08:02:33 -06:00
Mark Felder
9b778dc54a Formatting 2020-02-13 08:01:39 -06:00
4f5ee26f2d Update description.exs 2020-02-13 14:00:33 +00:00
e4016f4dbd Apply suggestion to config/description.exs 2020-02-13 13:59:47 +00:00
Mark Felder
ff9fd4ca89 Fix the confusingly named and inverted logic of "no_attachment_links"
The setting is now simply "attachment_links" and the boolean value does
what you expect. A double negative is never possible and describing the
functionality is no longer a philospher's worst nightmare.
2020-02-11 15:39:19 -06:00
Mark Felder
9581d57382 First round at cleaning up descriptions 2020-02-11 15:21:36 -06:00
Egor Kislitsyn
6875ccb6bf
Merge branch 'develop' into feature/new-registrations-digest 2020-02-11 13:54:55 +04:00
Maksim Pechnikov
6813c0302c Merge branch 'develop' into issue/1383 2020-02-10 20:49:20 +03:00
Ivan Tashkinov
4e6bbdc7b5 Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation 2020-02-08 19:59:37 +03:00
Ivan Tashkinov
d458f4fdca [#1505] Added tests, changelog entry, tweaked config settings related to replies output on outgoing federation. 2020-02-08 19:58:02 +03:00
Alexander Strizhakov
7a2e153a8d
description change 2020-02-06 13:15:23 +03:00
Alexander Strizhakov
bdf0a87be9
dropdown type 2020-02-06 12:50:37 +03:00
b21e59da5f Merge branch 'remove-linker-scheme-option' into 'develop'
Remove AutoLinker `scheme` option from the config

See merge request pleroma/pleroma!2176
2020-02-05 20:32:45 +00:00
Egor Kislitsyn
3909b5b7b3
Remove AutoLinker scheme option from the config 2020-02-05 21:13:56 +04:00
Ivan Tashkinov
e84fee5b86 Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation 2020-02-05 07:56:36 +03:00
Roman Chvanikov
8057157ee3 Make attachments cleanup optional 2020-01-31 01:20:37 +03:00
Maksim Pechnikov
21a2a05407 Merge branch 'develop' into issue/1383 2020-01-28 20:39:20 +03:00