11090 Commits (0589e9156ac4f77bf158ed65bd352b4725f0ad1c)

 

All Branches   

Search

Author	SHA1	Message	Date
lain	953f71bcfa	App Test: Make more resilient	4 years ago
Roman Chvanikov	56e9bf3393	Unify Config.get behaviour for atom/list key param	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
lain	2f4289d455	Changelog: Add info about email blacklist	4 years ago
Alex Gleason	4f57e85ab9	Email blacklist: Update phrasing again	4 years ago
Alex Gleason	058daf498f	Email blacklist: Update response phrasing	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	cbf8bfc694	Improved WelcomeChatMessageTest ... * Checks if message is the same using ==/2 instead of =~/2	4 years ago
Mark Felder	016d8d6c56	Consolidate construction of Rich Media Parser HTTP requests	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	de3bdc63ad	AccountControllerTest: Add test for message returned.	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
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	4 years ago
lain	10c792110e	MRF Object Age Policy: Don't break on messages without cc/to	4 years ago
lain	e45e07d2b5	Merge branch 'indigenous-client' into 'develop' ... Add indigenous to clients See merge request pleroma/pleroma!2835	4 years ago
lain	8fcbfd961d	Merge branch 'reportnote-test' into 'develop' ... ReportNote test Closes #2014 See merge request pleroma/pleroma!2839	4 years ago
Alex Gleason	f9301044ed	Add ReportNote test	4 years ago
Alex Gleason	77b48cb4ce	Factory: Add report_activity_factory	4 years ago
Alex Gleason	dc88b6f091	Add email blacklist, fixes #1404	4 years ago
Alex Gleason	c2c3dd4613	Migrate legacy tags set by AdminFE to match TagPolicy, #2010	4 years ago
swentel	0012894d4e	Add indigenous to clients	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	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	4 years ago
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	4 years ago
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	4 years ago
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	4 years ago
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	4 years ago
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	4 years ago
Roman Chvanikov	4bf44b7d65	Don't override user-agent header if it's been set	4 years ago
lain	4b18a07392	Revert "Merge branch 'revert-1ac0969c' into 'develop'" ... This reverts merge request !2825	4 years ago
lain	8ca993c789	Merge branch 'revert-1ac0969c' into 'develop' ... Revert "Merge branch 'mrf-silence-2' into 'develop'" See merge request pleroma/pleroma!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	ac2598307d	Merge remote-tracking branch 'pleroma/develop' into features/poll-validation	4 years ago
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.	4 years ago
lain	37b9e5e138	Apply 1 suggestion(s) to 1 file(s)	4 years ago
Haelwenn (lanodan) Monnier	0309514656	Default MRF to ObjectAgePolicy, 7 days threshold	4 years ago
lain	a1a43f39dc	Merge branch 'deactivate-gun-again' into 'develop' ... Config: Default to Hackney again See merge request pleroma/pleroma!2821	4 years ago
lain	7bcd2e948e	Config: Default to Hackney again ... Gun is still acting up.	4 years ago
lain	1dd162a5f7	SimplePolicy: Fix problem with DM leaks.	4 years ago
feld	ac0a8dfdd4	Merge branch 'chore/fix-docs-typo' into 'develop' ... Fix example json response See merge request pleroma/pleroma!2819	4 years ago
Mark Felder	052833f8ee	Fix example json response	4 years ago
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	4 years ago
Haelwenn	d1cf1108ac	Merge branch 'render-preview-cards-in-chats' into 'develop' ... Render preview cards in chats See merge request pleroma/pleroma!2816	4 years ago
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	4 years ago
Mark Felder	24169ae2e6	Merge branch 'develop' into fix/configdb-otp-instructions	4 years ago
lain	a3c37379e9	ChatMessage schema: Add preview cards.	4 years ago
lain	781b270863	ChatMessageReferenceView: Display preview cards.	4 years ago