870 Commits (014f91c1c3504d7e1f4407491d42223c79c0de05)

Author	SHA1	Message	Date
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
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
Maksim Pechnikov	8e90cc58e7	Merge branch 'develop' into feature/update-welcome-setting-in-description	4 years ago
Maksim Pechnikov	6e6276b4f8	added test	4 years ago
Alex Gleason	e639eee82e	restricted_nicknames: Add names from MastoAPI endpoints	4 years ago
Mark Felder	d5e4d8a6f3	Define default authenticator in the config	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	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
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
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
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