11773 commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
lain	e26f2c9135	Changelog: Update with frontend mix task.	2020-08-03 18:23:26 +02:00
lain	8b1da33a54	Docs: Add info about installing from a local path.	2020-08-03 17:50:53 +02:00
lain	5c2745725e	Docs: Document installation of frontends ... Co-authored-by: Roman Chvanikov <chvanikoff@pm.me>	2020-08-03 17:44:59 +02: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	de3bdc63ad	AccountControllerTest: Add test for message returned.	2020-08-03 15:00:14 +02: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
lain	5876d5123c	Merge branch 'object-age-fix' into 'develop' ... MRF Object Age Policy: Don't break on messages without cc/to See merge request pleroma/pleroma!2840	2020-08-03 12:50:10 +00:00
lain	10c792110e	MRF Object Age Policy: Don't break on messages without cc/to	2020-08-03 14:12:32 +02:00
lain	e45e07d2b5	Merge branch 'indigenous-client' into 'develop' ... Add indigenous to clients See merge request pleroma/pleroma!2835	2020-08-03 11:37:55 +00:00
lain	8fcbfd961d	Merge branch 'reportnote-test' into 'develop' ... ReportNote test Closes #2014 See merge request pleroma/pleroma!2839	2020-08-03 09:55:56 +00:00
Alex Gleason	f9301044ed	Add ReportNote test	2020-08-02 17:45:15 -05:00
Alex Gleason	77b48cb4ce	Factory: Add report_activity_factory	2020-08-02 16:36:55 -05:00
Alex Gleason	dc88b6f091	Add email blacklist, fixes #1404	2020-08-02 14:53:42 -05:00
Alex Gleason	c2c3dd4613	Migrate legacy tags set by AdminFE to match TagPolicy, #2010	2020-08-02 13:42:23 -05:00
swentel	0012894d4e	Add indigenous to clients	2020-08-02 19:33:22 +02: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	70951d042b	Merge branch '1985-unobtrusive-autologin-on-registration' into 'develop' ... [#1985] Prevented force login on registration if account approval and/or email confirmation needed Closes #1985 See merge request pleroma/pleroma!2823	2020-08-01 15:58:17 +00:00
rinpatch	69b9c328c9	Merge branch 'fix/gun-nxdomain-no-error-tuple' into 'develop' ... ConnectionPool: fix gun open errors being returned without an error tuple Closes #2008 See merge request pleroma/pleroma!2832	2020-08-01 15:17:41 +00:00
rinpatch	45be1fe00e	ConnectionPool: fix gun open errors being returned without an error tuple ... When gun shuts down due to the host being unreachable, the worker process shuts down with the same shutdown reason since they are linked. Gun doesn't have error tuples in it's shutdown reason though, so we need to handle it in get_conn. Closes #2008	2020-08-01 18:02:26 +03:00
rinpatch	3a6a4dd77a	Merge branch 'fix/gun-limiter' into 'develop' ... Fix ConnecitonPool deadlocking after reaching the connection limit Closes #1977 See merge request pleroma/pleroma!2830	2020-08-01 10:49:35 +00:00
rinpatch	87180ff817	Fix ConnecitonPool deadlocking after reaching the connection limit ... The issue was with ConcurrentLimiter not decrementing counters on overload. It was fixed in the latest commit, but concurrentlimiter version wasn't updated in Pleroma for some reason. Closes #1977	2020-08-01 12:18:56 +03:00
rinpatch	f1f4b1863f	Merge branch 'fix/user-agent-overriding' into 'develop' ... Don't override user-agent header if it's been set Closes #1923 See merge request pleroma/pleroma!2829	2020-08-01 07:25:32 +00:00
Roman Chvanikov	4bf44b7d65	Don't override user-agent header if it's been set	2020-08-01 10:04:25 +03:00
lain	7e01339ddd	Frontend mix task: Support installation from local file.	2020-07-31 17:58:50 +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	8ca993c789	Merge branch 'revert-1ac0969c' into 'develop' ... Revert "Merge branch 'mrf-silence-2' into 'develop'" See merge request pleroma/pleroma!2825	2020-07-31 15:17:33 +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
Haelwenn (lanodan) Monnier	ac2598307d	Merge remote-tracking branch 'pleroma/develop' into features/poll-validation	2020-07-31 13:57:21 +02:00
Ivan Tashkinov	27b0a8b155	[#1985] Prevented force login on registration if account approval and/or email confirmation needed. ... Refactored login code in OAuthController, reused in AccountController. Added tests.	2020-07-31 14:13:38 +03:00
lain	37b9e5e138	Apply 1 suggestion(s) to 1 file(s)	2020-07-31 10:29:16 +00:00
Haelwenn (lanodan) Monnier	0309514656	Default MRF to ObjectAgePolicy, 7 days threshold	2020-07-31 12:13:08 +02:00
lain	a1a43f39dc	Merge branch 'deactivate-gun-again' into 'develop' ... Config: Default to Hackney again See merge request pleroma/pleroma!2821	2020-07-31 09:11:24 +00:00
lain	7bcd2e948e	Config: Default to Hackney again ... Gun is still acting up.	2020-07-31 10:50:45 +02:00
lain	1dd162a5f7	SimplePolicy: Fix problem with DM leaks.	2020-07-31 09:57:30 +02:00
feld	ac0a8dfdd4	Merge branch 'chore/fix-docs-typo' into 'develop' ... Fix example json response See merge request pleroma/pleroma!2819	2020-07-30 21:25:30 +00:00
Mark Felder	052833f8ee	Fix example json response	2020-07-30 15:57:41 -05:00
feld	09aef71db9	Merge branch 'fix/configdb-otp-instructions' into 'develop' ... OTP users need Pleroma running to execute pleroma_ctl, so reorganize instructions. See merge request pleroma/pleroma!2817	2020-07-30 20:28:28 +00:00
Haelwenn	d1cf1108ac	Merge branch 'render-preview-cards-in-chats' into 'develop' ... Render preview cards in chats See merge request pleroma/pleroma!2816	2020-07-30 20:08:03 +00:00
Haelwenn	87fe31fb5c	Merge branch '1993-confirm-users-on-registration' into 'develop' ... AccountController: Don't explicitly ask to keep users unconfirmed. Closes #1993 See merge request pleroma/pleroma!2809	2020-07-30 20:01:04 +00:00
Mark Felder	24169ae2e6	Merge branch 'develop' into fix/configdb-otp-instructions	2020-07-30 13:04:49 -05:00
lain	a3c37379e9	ChatMessage schema: Add preview cards.	2020-07-30 19:57:45 +02:00
lain	781b270863	ChatMessageReferenceView: Display preview cards.	2020-07-30 19:57:26 +02:00
Mark Felder	cfc6484c40	OTP users need Pleroma running to execute pleroma_ctl, so reorganize instructions.	2020-07-30 12:37:56 -05:00
feld	16b7b494ba	Merge branch 'chore/fix-configdb-docs-formatting' into 'develop' ... Attempt to fix markdown formatting See merge request pleroma/pleroma!2815	2020-07-30 17:29:31 +00:00
Mark Felder	1f24186036	Attempt to fix markdown formatting	2020-07-30 12:01:46 -05:00
lain	873ff5ce14	Merge branch 'hide-reactions' into 'develop' ... Let favourites and emoji reactions optionally be hidden See merge request pleroma/pleroma!2804	2020-07-30 12:41:47 +00:00
lain	e2e66e50d3	SimplePolicyTest: Add test for leaking DMs.	2020-07-30 14:29:00 +02:00