Commit Graph

12514 Commits (cc2fc2e423bf7abf2e03a584754e82e1c140765b)
 

Author SHA1 Message Date
rinpatch 6166ecdbc8 CHANGELOG.md: Add an entry for the spoofing fix
4 years ago
rinpatch 5116859f0e Merge branch 'fix/object-attachment-spoof' into 'develop'
4 years ago
Haelwenn 4d693b5e54 Merge branch '2236-no-name' into 'develop'
4 years ago
Mark Felder 79caf3840e phoenix_controller_render_duration is no longer available in telemetry of Phoenix 1.5+
4 years ago
feld 48f7e12e6c Merge branch 'ostatus-controller-no-auth-check-on-non-federating-instances' into 'develop'
4 years ago
feld 86b4149a13 Merge branch '1668-prometheus-access-restrictions' into 'develop'
4 years ago
rinpatch 5f27a39152 Merge branch '2242-nsfw-case' into 'develop'
4 years ago
feld 88dc1d24b9 Merge branch 'issue/2261' into 'develop'
4 years ago
lain 294628d981 Merge branch 'feature/expire-mutes' into 'develop'
4 years ago
lain 9b2ed14277 Docs: Add info about expiring mutes.
4 years ago
lain 4e7418d963 Merge branch 'stats-genserver-fix' into 'develop'
4 years ago
lain 5ddf0be208 Changelog: Add info about admin email user link changes.
4 years ago
lain 6d850c46dc AdminEmail: Use AP id as user url.
4 years ago
lain d8d4e96230 Merge branch 'default-mrf' into 'develop'
4 years ago
lain 7bbc328d66 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into stats-genserver-fix
4 years ago
lain dd2b3a8da9 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/expire-mutes
4 years ago
lain 78cea44553 Merge branch 'ejabberd-pleroma-auth' into 'develop'
4 years ago
lain 4800ee656b Merge branch 'features/federation-status' into 'develop'
4 years ago
lain 5db4c823b2 Merge branch 'restrict-domain' into 'develop'
4 years ago
Haelwenn 9c09ea01aa Merge branch '2284-voters-count' into 'develop'
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
rinpatch 7058cac1c2 Merge branch '2257-self-chat' into 'develop'
4 years ago
feld 6c8469664a Merge branch 'chore/elixir-1.11' into 'develop'
4 years ago
lain 329aa19c9f Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma-restrict-domain
4 years ago
feld 49b43e668e Merge branch 'instance-docs' into 'develop'
4 years ago
feld fa6ad67397 Merge branch 'tesla-get-to-pleroma' into 'develop'
4 years ago
lain bc4d9c4ffc Merge branch 'hide-muted-chats' into 'develop'
4 years ago
Egor Kislitsyn ca95cbe0b4
Add `with_muted` param to ChatController.index/2
4 years ago
lain e46c95b826 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-admin-api
4 years ago
lain c7bcbfbc1d Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/local-only-scope
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'
4 years ago
lain f7a3dcd320 Merge branch 'patch-4' into 'develop'
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
4 years ago
Haelwenn 0d8cc0905a Merge branch 'fix/get_report_with_notes' into 'develop'
4 years ago
feld 0fd2830fe1 Merge branch 'chore/deps-from-git' into 'develop'
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'
4 years ago
minibikini 6163fbf553 Merge branch 'develop' into 'frontend-admin-api'
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'
4 years ago