pleroma

Commit Graph

Author	SHA1	Message	Date
lain	294628d981	Merge branch 'feature/expire-mutes' into 'develop' Expiring mutes for users and activities Closes #1817 See merge request pleroma/pleroma!2971	3 years ago
lain	9b2ed14277	Docs: Add info about expiring mutes.	3 years ago
lain	4e7418d963	Merge branch 'stats-genserver-fix' into 'develop' don't run Stats GenServer updates in tests See merge request pleroma/pleroma!2976	3 years ago
lain	5ddf0be208	Changelog: Add info about admin email user link changes.	3 years ago
lain	6d850c46dc	AdminEmail: Use AP id as user url.	3 years ago
lain	d8d4e96230	Merge branch 'default-mrf' into 'develop' Add TagPolicy as default MRF See merge request pleroma/pleroma!2834	3 years ago
lain	7bbc328d66	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into stats-genserver-fix	3 years ago
lain	dd2b3a8da9	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/expire-mutes	3 years ago
lain	78cea44553	Merge branch 'ejabberd-pleroma-auth' into 'develop' Add ejabberd auth document See merge request pleroma/pleroma!3074	3 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	3 years ago
lain	5db4c823b2	Merge branch 'restrict-domain' into 'develop' View a remote server's timeline See merge request pleroma/pleroma!2713	3 years ago
Haelwenn	9c09ea01aa	Merge branch '2284-voters-count' into 'develop' Always return voters_count in polls See merge request pleroma/pleroma!3120	3 years ago
lain	eb1e1e7494	Changelog: Add info about federation status endpoint	3 years ago
lain	504a829edb	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/federation-status	3 years ago
lain	cb3cd3a761	TopicsTest: Small addition.	3 years ago
rinpatch	7058cac1c2	Merge branch '2257-self-chat' into 'develop' Resolve "Can't message yourself in a chat (but can start it)" Closes #2257 See merge request pleroma/pleroma!3099	3 years ago
feld	6c8469664a	Merge branch 'chore/elixir-1.11' into 'develop' Elixir 1.11 compatibility / Phoenix 1.5+ See merge request pleroma/pleroma!3059	3 years ago
lain	329aa19c9f	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma-restrict-domain	3 years ago
feld	49b43e668e	Merge branch 'instance-docs' into 'develop' AdminAPI: Allow to modify Terms of Service and Instance Panel via Admin API Closes #1516 See merge request pleroma/pleroma!2931	3 years ago
feld	fa6ad67397	Merge branch 'tesla-get-to-pleroma' into 'develop' Use Pleroma.HTTP instead of Tesla Closes #2275 See merge request pleroma/pleroma!3113	3 years ago
lain	bc4d9c4ffc	Merge branch 'hide-muted-chats' into 'develop' Hide chats from muted users Closes #2230 See merge request pleroma/pleroma!3116	3 years ago
Egor Kislitsyn	ca95cbe0b4	Add `with_muted` param to ChatController.index/2	3 years ago
lain	c7bcbfbc1d	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/local-only-scope	3 years ago
lain	92d252f364	Poll Schema: Update and fix.	3 years ago
lain	f09bb814a9	Changelog: Add info about poll view changes	3 years ago
lain	1cfc3278c0	Poll View: Always return `voters_count`.	3 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	3 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	3 years ago
lain	c37118e6f2	Conversations: A few refactors	3 years ago
lain	91f6c32430	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into a1batross/pleroma-patch-4	3 years ago
Haelwenn (lanodan) Monnier	179936609f	favicon: Update to pleroma logo, provided by @shpuld Closes: https://git.pleroma.social/pleroma/pleroma/-/issues/2270	3 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	3 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	3 years ago
Mark Felder	2f2281fdf1	Ensure URLs for git repos end in .git for older git clients like on CentOS 7	3 years ago
Mark Felder	53dd048590	Test the note is returned when fetching a single report	3 years ago
Mark Felder	7efc074ead	Permit fetching individual reports with notes preloaded	3 years ago
Egor Kislitsyn	be52819a11	Hide chats from muted users	3 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	3 years ago
Haelwenn (lanodan) Monnier	4caad4e910	side_effects: Don’t increase_replies_count when it’s an Answer	3 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	3 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.	3 years ago
feld	38b481d112	Merge branch 'feature/account-export' into 'develop' Add account export Closes #847 See merge request pleroma/pleroma!2918	3 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	3 years ago
eugenijm	8e41baff40	Add idempotency_key to the chat_message entity.	3 years ago
Egor Kislitsyn	d1698267a2	Fix credo warning	3 years ago
Egor Kislitsyn	a2a7a1f2ff	Merge remote-tracking branch 'origin/develop' into feature/account-export	3 years ago
feld	4fbdd1c8a1	Merge branch 'remove-unused-aliases' into 'develop' Remove unused aliases See merge request pleroma/pleroma!3111	3 years ago
Egor Kislitsyn	d2113428c0	Merge remote-tracking branch 'origin/develop' into feature/account-export	3 years ago
Egor Kislitsyn	1a98476f48	Remove unused aliases	3 years ago
Alibek Omarov	1042c30fa5	ConversationViewTest: fix test	3 years ago

1 2 3 4 5 ...

12401 Commits (3eaa5335c97e0b2697a692614d73897092df0d58) All Branches Search

12401 Commits (3eaa5335c97e0b2697a692614d73897092df0d58)

All Branches