7215 Commits (504a829edb821f24fe7138380e77533cc9f802e6)

Author	SHA1	Message	Date
lain	504a829edb	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/federation-status	4 years ago
lain	bc4d9c4ffc	Merge branch 'hide-muted-chats' into 'develop' ... Hide chats from muted users Closes #2230 See merge request pleroma/pleroma!3116	4 years ago
Egor Kislitsyn	ca95cbe0b4	Add `with_muted` param to ChatController.index/2	4 years ago
lain	c37118e6f2	Conversations: A few refactors	4 years ago
lain	91f6c32430	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into a1batross/pleroma-patch-4	4 years ago
Mark Felder	7efc074ead	Permit fetching individual reports with notes preloaded	4 years ago
Egor Kislitsyn	be52819a11	Hide chats from muted users	4 years ago
lain	24ce324973	Merge branch 'bugfix/poll_replies_count' into 'develop' ... side_effects: Don’t increase_replies_count when it’s an Answer Closes #2274 See merge request pleroma/pleroma!3114	4 years ago
Haelwenn (lanodan) Monnier	4caad4e910	side_effects: Don’t increase_replies_count when it’s an Answer	4 years ago
feld	9fbe9ef774	Merge branch 'tesla-get-to-pleroma' into 'develop' ... Use Pleroma.HTTP instead of Tesla Closes #2275 See merge request pleroma/pleroma!3113	4 years ago
Ekaterina Vaartis	8f00d90f91	Use Pleroma.HTTP instead of Tesla ... Closes #2275 As discovered in the issue, captcha used Tesla.get instead of Pleroma.HTTP. I've also grep'ed the repo and changed the other place where this was used.	4 years ago
feld	38b481d112	Merge branch 'feature/account-export' into 'develop' ... Add account export Closes #847 See merge request pleroma/pleroma!2918	4 years ago
eugenijm	8e41baff40	Add idempotency_key to the chat_message entity.	4 years ago
Egor Kislitsyn	d1698267a2	Fix credo warning	4 years ago
Egor Kislitsyn	d2113428c0	Merge remote-tracking branch 'origin/develop' into feature/account-export	4 years ago
Alibek Omarov	d63ec02f31	ConversationView: fix formatting	4 years ago
Alibek Omarov	9b93eef715	ConversationView: fix last_status.account being empty, fix current user being included in group conversations	4 years ago
Alibek Omarov	241bd061fc	ConversationView: add current user to conversations, according to Mastodon behaviour	4 years ago
Haelwenn	131f3219e6	Merge branch 'issue/2069' into 'develop' ... [#2069] unread_conversation_count See merge request pleroma/pleroma!2939	4 years ago
feld	1cce1bd729	Merge branch 'issue/2137-user-filters-admin-fe' into 'develop' ... [#2137] admin/users filters See merge request pleroma/pleroma!3016	4 years ago
Egor Kislitsyn	fa902867c0	Merge remote-tracking branch 'origin/develop' into mutes-blocks-pagination	4 years ago
Ivan Tashkinov	9f5f7dc9f9	Fixed User.is_discoverable attribute rendering in Admin API User view.	4 years ago
Ivan Tashkinov	da4a1e57b1	@doc fix.	4 years ago
Ivan Tashkinov	ba50dc05a8	Merge remote-tracking branch 'remotes/origin/develop' into ostatus-controller-no-auth-check-on-non-federating-instances ... # Conflicts: # CHANGELOG.md	4 years ago
Mark Felder	d2b140a525	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into issue/2261	4 years ago
Egor Kislitsyn	4a2d7a7a5d	Merge remote-tracking branch 'origin/develop' into feature/account-export	4 years ago
feld	1204aaa2e3	Merge branch 'feature/autofollowing' into 'develop' ... autofollowing_nicknames See merge request pleroma/pleroma!3087	4 years ago
Haelwenn	d8d4bd15d0	Merge branch '2236-no-name' into 'develop' ... Resolve "Account cannot be fetched by some instances" Closes #2236 See merge request pleroma/pleroma!3101	4 years ago
feld	03a318af9a	Merge branch 'develop' into 'feature/autofollowing' ... # Conflicts: # CHANGELOG.md	4 years ago
Maksim Pechnikov	d28f72a55a	FrontStatic plug: excluded invalid url	4 years ago
Mark Felder	291189357b	Merge branch 'develop' into feature/account-export	4 years ago
Mark Felder	9e54ef086b	Merge branch 'develop' into feature/account-export	4 years ago
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	4 years ago
feld	e062329a17	Merge branch 'develop' into 'feature/autofollowing' ... # Conflicts: # CHANGELOG.md	4 years ago
lain	de6d49c8ce	ActivityPub: Add back debug call + explanation.	4 years ago
lain	9542c5d0f4	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 2236-no-name	4 years ago
Haelwenn	073ad7e6d9	Merge branch 'docs/ap_c2s' into 'develop' ... AP C2S: Document our additional endpoints See merge request pleroma/pleroma!3056	4 years ago
rinpatch	df61071422	Merge branch '2242-nsfw-case' into 'develop' ... Resolve "Posts tagged with #NSFW from GS aren't marked as sensitive" Closes #2242 See merge request pleroma/pleroma!3094	4 years ago
lain	60e379ce0b	User: Correctly handle whitespace names.	4 years ago
feld	d6907e6e0c	Merge branch 'chore/elixir-1.11' into 'develop' ... Elixir 1.11 compatibility / Phoenix 1.5+ See merge request pleroma/pleroma!3059	4 years ago
Ivan Tashkinov	8a68673eed	[#3059] Formatting fix.	4 years ago
Ivan Tashkinov	8a55de1d78	[#3059] Fixed Phoenix 1.5 telemetry processing.	4 years ago
lain	8d251096fe	SideEffects: Correctly handle chat messages sent to yourself	4 years ago
Maksim Pechnikov	ef627b9391	fix module name	4 years ago
Maksim Pechnikov	44e5a57d1a	admin api: added user filters by `actor_types`	4 years ago
Maksim Pechnikov	60663150b5	admin user search: added filter by `actor_type`	4 years ago
Maksim Pechnikov	46b420aa60	need_confirmed -> unconfirmed	4 years ago
Maksim Pechnikov	cf4f393794	added AdminApi.UserController	4 years ago
Maksim Pechnikov	9ef46ce410	added 'unconfirmed' filter to admin/users	4 years ago
Haelwenn	2ca98f2d94	Apply 1 suggestion(s) to 1 file(s)	4 years ago