12266 Commits (6d850c46dc439e018323fb3580e708131247457b)

 

All Branches   

Search

Author	SHA1	Message	Date
lain	6d850c46dc	AdminEmail: Use AP id as user url.	4 years ago
lain	d8d4e96230	Merge branch 'default-mrf' into 'develop' ... Add TagPolicy as default MRF See merge request pleroma/pleroma!2834	4 years ago
lain	78cea44553	Merge branch 'ejabberd-pleroma-auth' into 'develop' ... Add ejabberd auth document See merge request pleroma/pleroma!3074	4 years ago
lain	4800ee656b	Merge branch 'features/federation-status' into 'develop' ... Add a federation_status endpoint showing unreachable instances See merge request pleroma/pleroma!3086	4 years ago
lain	5db4c823b2	Merge branch 'restrict-domain' into 'develop' ... View a remote server's timeline See merge request pleroma/pleroma!2713	4 years ago
Haelwenn	9c09ea01aa	Merge branch '2284-voters-count' into 'develop' ... Always return voters_count in polls See merge request pleroma/pleroma!3120	4 years ago
lain	eb1e1e7494	Changelog: Add info about federation status endpoint	4 years ago
lain	504a829edb	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/federation-status	4 years ago
lain	cb3cd3a761	TopicsTest: Small addition.	4 years ago
lain	329aa19c9f	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma-restrict-domain	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	92d252f364	Poll Schema: Update and fix.	4 years ago
lain	f09bb814a9	Changelog: Add info about poll view changes	4 years ago
lain	1cfc3278c0	Poll View: Always return `voters_count`.	4 years ago
lain	ba3f3a5a56	Merge branch 'chores/pleroma-favicon-logo' into 'develop' ... favicon: Use images/pleroma_logo_vector_bg_32.png from pleroma.social Closes #2270 See merge request pleroma/pleroma!3115	4 years ago
lain	f7a3dcd320	Merge branch 'patch-4' into 'develop' ... ConversationView: add current user to conversations, according to Mastodon behaviour, fix last_status.account being not filled Closes #2217 See merge request pleroma/pleroma!3089	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
Haelwenn (lanodan) Monnier	179936609f	favicon: Update to pleroma logo, provided by @shpuld ... Closes: https://git.pleroma.social/pleroma/pleroma/-/issues/2270	4 years ago
Haelwenn	0d8cc0905a	Merge branch 'fix/get_report_with_notes' into 'develop' ... Permit fetching individual reports with notes preloaded See merge request pleroma/pleroma!3118	4 years ago
feld	0fd2830fe1	Merge branch 'chore/deps-from-git' into 'develop' ... Ensure URLs for git repos end in .git for older git clients like on CentOS 7 See merge request pleroma/pleroma!3119	4 years ago
Mark Felder	2f2281fdf1	Ensure URLs for git repos end in .git for older git clients like on CentOS 7	4 years ago
Mark Felder	53dd048590	Test the note is returned when fetching a single report	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
feld	37e8e8bf8e	Merge branch 'idempotency-key-optimistic-posting' into 'develop' ... Add `idempotency_key` to the chat message entity Closes #2126 See merge request pleroma/pleroma!3015	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	a2a7a1f2ff	Merge remote-tracking branch 'origin/develop' into feature/account-export	4 years ago
feld	4fbdd1c8a1	Merge branch 'remove-unused-aliases' into 'develop' ... Remove unused aliases See merge request pleroma/pleroma!3111	4 years ago
Egor Kislitsyn	d2113428c0	Merge remote-tracking branch 'origin/develop' into feature/account-export	4 years ago
Egor Kislitsyn	1a98476f48	Remove unused aliases	4 years ago
Alibek Omarov	1042c30fa5	ConversationViewTest: fix test	4 years ago
Alibek Omarov	d63ec02f31	ConversationView: fix formatting	4 years ago
Alibek Omarov	0552a08dfd	ConversationControllerTest: fix test, fix formatting	4 years ago
Alibek Omarov	5591dc0248	Add entry in changelog	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	630eb0f939	ConversationViewTest: fix test #2	4 years ago
Alibek Omarov	149589c842	ConversationViewTest: fix test	4 years ago
Alibek Omarov	390a12d4c8	ConversationControllerTest: fix test	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	a326a56371	Merge branch 'fix/frontend-cli-docs' into 'develop' ... Fix formatting and typos in "Managing frontends" guide See merge request pleroma/pleroma!3098	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