summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2020-08-28Merge branch 'release/2.1.0' into 'stable'v2.1.0lain
2020-08-28Mix: Update versionlain
2020-08-28Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into pleroma-2.1...lain
2020-08-27Merge branch '2078-list-fixes' into 'develop'Haelwenn
2020-08-27Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into pleroma-2.1...lain
2020-08-27Merge branch '2081-deleted-user-chats' into 'develop'lain
2020-08-27ChatController: Don't die if the recipient is gone.lain
2020-08-27Merge branch 'update/admin-fe-20200826' into 'develop'rinpatch
2020-08-26Update AdminFE build in preparation for 2.1.0 releaseMark Felder
2020-08-26Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into pleroma-2.1...lain
2020-08-26Merge branch 'fix/fast_html-build-errors' into 'develop'rinpatch
2020-08-26Changelog: Add info about list fixes.lain
2020-08-26TimelineController: Keys are atoms now.lain
2020-08-26fix fast_html build errors with gcc 10 by bumping fast_sanitizerinpatch
2020-08-26Merge branch '2079-welcome-message-docs' into 'develop'rinpatch
2020-08-26Cheatsheet: Remove misleading examplelain
2020-08-26Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into pleroma-2.1...lain
2020-08-26Merge branch 'chore/release-template-merge-back-to-develop' into 'develop'lain
2020-08-26release MR template: add a note about merging stable changes back torinpatch
2020-08-25Merge branch 'buildx-multiarch-arm32v7' into 'develop'Haelwenn
2020-08-25Merge branch 'feature/1952-read-muted-notifications' into 'develop'feld
2020-08-25Merge branch '2077-fix-bogus-webfinger-ids' into 'develop'Haelwenn
2020-08-25Webfinger: Handle bogus ids better.lain
2020-08-25Mix: Make rc version explicit.lain
2020-08-25Merge branch 'stable' of git.pleroma.social:pleroma/pleroma into pleroma-2.1-rc0lain
2020-08-25Merge branch 'frontend-bundles-downloads' into 'develop'lain
2020-08-25Description: Update description.lain
2020-08-25Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-bu...lain
2020-08-25Merge branch 'docs/update-clients' into 'develop'lain
2020-08-24clients.md: Remove Nekonium, Twidere-iOS, Feather; Add DashFE and BloatFEHaelwenn (lanodan) Monnier
2020-08-24Merge branch 'feature/add-preload-to-description' into 'develop'feld
2020-08-24Add Pleroma.Web.Preload to description.exsAngelina Filippova
2020-08-24Merge branch 'relay-fix-admin-fe' into 'develop'feld
2020-08-21Merge branch 'features/validators-event' into 'develop'lain
2020-08-21Merge branch 'feature/2071-actor-type' into 'develop'lain
2020-08-21adding actor type in user showAlexander Strizhakov
2020-08-20Pipeline Ingestion: EventHaelwenn (lanodan) Monnier
2020-08-19Merge branch 'features/validators-audio2' into 'develop'lain
2020-08-19AudioHandlingTest: Make mock explicitlain
2020-08-19Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/va...lain
2020-08-19Merge branch 'fix-arm64' into 'develop'lain
2020-08-19CI: Fix release builds once more.lain
2020-08-19Merge branch 'email-tests' into 'develop'lain
2020-08-19fix for sometimes failing testsAlexander Strizhakov
2020-08-19Merge branch 'mix-task-fixes' into 'develop'lain
2020-08-19fixes for mix tasksAlexander Strizhakov
2020-08-19additional changelog entryAlexander Strizhakov
2020-08-19changelog entryAlexander Strizhakov
2020-08-19relay fix for admin-feAlexander Strizhakov
2020-08-19Pipeline Ingestion: Audio (Part 2)Haelwenn (lanodan) Monnier