217 Commits (b1fc4fe0ca6abab97be69e0b1bf138e8b5c1c303)

Author	SHA1	Message	Date
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
Maksim Pechnikov	8e90cc58e7	Merge branch 'develop' into feature/update-welcome-setting-in-description	4 years ago
Maksim Pechnikov	6e6276b4f8	added test	4 years ago
Angelina Filippova	8bb5441547	Update descriptions in :frontends group	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
Alex Gleason	dc88b6f091	Add email blacklist, fixes #1404	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
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
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	79f9ddd8b7	Merge branch 'by-approval' into 'develop' ... Registrations "by approval" mode Closes #1931 See merge request pleroma/pleroma!2757	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
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	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	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
Alex Gleason	6fdaee7cae	description.exs typofixes	4 years ago
Alex Gleason	38425ebdbf	Merge remote-tracking branch 'upstream/develop' into linkify	4 years ago
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.	4 years ago
Alex Gleason	48983e9421	Merge remote-tracking branch 'upstream/develop' into by-approval	4 years ago
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	4 years ago
Mark Felder	ce314e6fe2	Clarify description and suggestion	4 years ago
Ivan Tashkinov	9b225db7d8	[#1940] Applied rate limit for requests with bad `admin_token`. Added doc warnings on `admin_token` setting.	4 years ago
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	4 years ago
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	4 years ago
Alex Gleason	51ab8d0128	Add `account_approval_required` instance setting	4 years ago
href	4347d2de5e	Config/Docs: Expand behaviour suggestions at runtime	4 years ago
Alexander Strizhakov	b376442325	MediaProxy whitelist setting now supports hosts with scheme ... added deprecation warning about using bare domains	4 years ago
Angelina Filippova	0eeeaa37e8	Update types in MRF Keyword group	4 years ago
Angelina Filippova	98c56ff477	Remove :regex from types	4 years ago
Angelina Filippova	02b2747d42	Update types for :params, :match_actor and :replace settings	4 years ago
feld	d6f67fa91b	Merge branch 'issue/1790-updated-oban' into 'develop' ... [#1790] updated oban to 2.0.0 See merge request pleroma/pleroma!2674	4 years ago