summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2020-08-26Merge branch 'develop' into 2168-media-preview-proxy2168-media-preview-proxyMark Felder
2020-08-26Merge branch 'fix/fast_html-build-errors' into 'develop'rinpatch
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 '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-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-22Use the image thumbnail for rich metadata (OGP/Twittercards)Mark Felder
2020-08-21Remove newline for linterhref
2020-08-21Try to warm the cache with the preview image if preview proxy enabledMark Felder
2020-08-21Fix truncated imageshref
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-21[#2497] Media preview proxy: added `quality` config setting, adjusted width/h...Ivan Tashkinov
2020-08-20Pipeline Ingestion: EventHaelwenn (lanodan) Monnier
2020-08-20[#2497] Media preview proxy: added Content-Disposition header with filename t...Ivan Tashkinov
2020-08-19[#2497] Media preview proxy config refactoring & documentation.Ivan Tashkinov
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
2020-08-18Merge branch '2064-image-blanking' into 'develop'Haelwenn
2020-08-18Merge branch 'improve/freebsd-rc-script' into 'develop'feld
2020-08-18Improve FreeBSD rc scriptMark Felder
2020-08-18[#2497] Added video preview proxy. Switched from exexec to Port.Ivan Tashkinov
2020-08-18Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview...Ivan Tashkinov
2020-08-18Merge branch 'freebsd-docs' into 'develop'lain
2020-08-18Merge branch 'chore/improve-descriptions' into 'develop'lain