summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2020-11-13AP Controller test: Add test for issue #22982298-weird-follow-issuelain
2020-11-13Merge branch 'fix/oban-in-database-config' into 'develop'rinpatch
2020-11-13remove PurgeExpiredActivity from Oban db configAlexander Strizhakov
2020-11-12Merge branch 'majic-dep' into 'develop'feld
2020-11-12Install file-dev in Dockerfile build stageMichael Walker
2020-11-12Fix object spoofing vulnerability in attachmentsrinpatch
2020-11-12Merge branch 'title-injection-change' into 'develop'Haelwenn
2020-11-11Merge branch 'feature/ingest-blurhash' into 'develop'feld
2020-11-11Fix tests for other attachment typesMark Felder
2020-11-11Ingest blurhash field during transmogrificationMark Felder
2020-11-11Render blurhashes in Mastodon APIMark Felder
2020-11-11Ingest blurhash for attachments if they were federatedMark Felder
2020-11-11Changelog: Add info about title injectionlain
2020-11-11Bundled FE: Remove title taglain
2020-11-11Merge branch 'mrf-config-descriptions' into 'develop'feld
2020-11-11RedirectController: Don't replace title, but inject into the metalain
2020-11-11little changes for MRF config descriptionsAlexander Strizhakov
2020-11-11Merge branch 'feature/2222-config-descriptions-for-custom-modules' into 'deve...feld
2020-11-11making credo happy and test fixAlexander Strizhakov
2020-11-11fix for adminFEAlexander Strizhakov
2020-11-10config descriptions for custom MRF policiesAlexander Strizhakov
2020-11-10Merge branch '2260-wrong-report-link' into 'develop'lain
2020-11-10Merge branch 'fix/html-title-load' into 'develop'lain
2020-11-10Merge branch 'fix/2291-atom-feed-escape' into 'develop'lain
2020-11-10escaping summary and other fields in xml templatesAlexander Strizhakov
2020-11-09Merge branch 'remove/release-env' into 'develop'Haelwenn
2020-11-08Fix title on load of Pleroma HTMLSean King
2020-11-08Remove release_envrinpatch
2020-11-05Merge branch 'feature/expire-mutes' into 'develop'lain
2020-11-05Docs: Add info about expiring mutes.lain
2020-11-04Merge branch 'stats-genserver-fix' into 'develop'lain
2020-11-04Changelog: Add info about admin email user link changes.lain
2020-11-04AdminEmail: Use AP id as user url.lain
2020-11-04Merge branch 'default-mrf' into 'develop'lain
2020-11-04Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into stats-gense...lain
2020-11-04Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/exp...lain
2020-11-04Merge branch 'ejabberd-pleroma-auth' into 'develop'lain
2020-11-04Merge branch 'features/federation-status' into 'develop'lain
2020-11-04Merge branch 'restrict-domain' into 'develop'lain
2020-11-04Merge branch '2284-voters-count' into 'develop'Haelwenn
2020-11-04Changelog: Add info about federation status endpointlain
2020-11-04Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/fe...lain
2020-11-04TopicsTest: Small addition.lain
2020-11-04Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason...lain
2020-11-04Merge branch 'hide-muted-chats' into 'develop'lain
2020-11-04Add `with_muted` param to ChatController.index/2Egor Kislitsyn
2020-11-04Poll Schema: Update and fix.lain
2020-11-04Changelog: Add info about poll view changeslain
2020-11-04Poll View: Always return `voters_count`.lain
2020-11-03Merge branch 'chores/pleroma-favicon-logo' into 'develop'lain