385 commits

Author	SHA1	Message	Date
Alexander Strizhakov	485697d96c	config descriptions for custom MRF policies	2020-11-10 19:20:14 +03:00
lain	bae48c98e3	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma-block-behavior	2020-11-04 16:18:11 +01:00
Egor Kislitsyn	d2113428c0	Merge remote-tracking branch 'origin/develop' into feature/account-export	2020-10-30 19:34:02 +04:00
Mark Felder	89c356d19f	Improve Keyword descriptions for AdminFE	2020-10-29 14:22:07 -05:00
Egor Kislitsyn	4a2d7a7a5d	Merge remote-tracking branch 'origin/develop' into feature/account-export	2020-10-28 15:33:36 +04:00
feld	03a318af9a	Merge branch 'develop' into 'feature/autofollowing' ... # Conflicts: # CHANGELOG.md	2020-10-27 22:13:50 +00:00
Mark Felder	291189357b	Merge branch 'develop' into feature/account-export	2020-10-27 12:54:33 -05:00
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
feld	e062329a17	Merge branch 'develop' into 'feature/autofollowing' ... # Conflicts: # CHANGELOG.md	2020-10-27 17:42:24 +00:00
lain	04b7505c75	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma-block-behavior	2020-10-26 17:50:34 +01: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
Mark Felder	efd6572ffb	Remove suggestions	2020-10-16 17:43:44 +00: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	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
Alex Gleason	b3d6cf9022	Merge remote-tracking branch 'upstream/develop' into block-behavior	2020-10-13 19:22:32 -05: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
Alex Gleason	2fc7ce3e1e	Blocks: add blockers_visible config	2020-10-10 01:58:57 -05: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
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	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
Angelina Filippova	8bb5441547	Update descriptions in :frontends group	2020-08-04 15:10:44 +03: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
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
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
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	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
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
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	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
feld	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
feld	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
feld	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
feld	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