summaryrefslogtreecommitdiff
AgeCommit message (Collapse)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
fix fast_html build errors with gcc 10 by bumping fast_sanitize Closes #2058 See merge request pleroma/pleroma!2922
2020-08-26fix fast_html build errors with gcc 10 by bumping fast_sanitizerinpatch
Closes #2058
2020-08-26Merge branch '2079-welcome-message-docs' into 'develop'rinpatch
Cheatsheet: Remove misleading example Closes #2079 See merge request pleroma/pleroma!2921
2020-08-26Cheatsheet: Remove misleading examplelain
2020-08-26Merge branch 'chore/release-template-merge-back-to-develop' into 'develop'lain
release MR template: add a note about merging stable changes back to develop See merge request pleroma/pleroma!2920
2020-08-26release MR template: add a note about merging stable changes back torinpatch
develop
2020-08-25Merge branch 'buildx-multiarch-arm32v7' into 'develop'Haelwenn
Add multiarch support to docker container, fixes pleroma/pleroma-docker-compose#2 Closes pleroma-docker-compose#2 See merge request pleroma/pleroma!2789
2020-08-25Merge branch 'feature/1952-read-muted-notifications' into 'develop'feld
Automatically mark notifications about statuses from muted users and threads as read Closes #1952 See merge request pleroma/pleroma!2893
2020-08-25Merge branch '2077-fix-bogus-webfinger-ids' into 'develop'Haelwenn
Webfinger: Handle bogus ids better. Closes #2077 See merge request pleroma/pleroma!2919
2020-08-25Webfinger: Handle bogus ids better.lain
2020-08-25Merge branch 'frontend-bundles-downloads' into 'develop'lain
frontend install mix tasks See merge request pleroma/pleroma!2841
2020-08-25Description: Update description.lain
2020-08-25Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
frontend-bundles-downloads
2020-08-25Merge branch 'docs/update-clients' into 'develop'lain
clients.md: Remove Nekonium, Twidere-iOS, Feather; Add DashFE and BloatFE See merge request pleroma/pleroma!2914
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
Add Pleroma.Web.Preload to description.exs See merge request pleroma/pleroma!2913
2020-08-24Add Pleroma.Web.Preload to description.exsAngelina Filippova
2020-08-24Merge branch 'relay-fix-admin-fe' into 'develop'feld
Relay fix for admin-fe See merge request pleroma/pleroma!2902
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
Pipeline Ingestion: Event See merge request pleroma/pleroma!2909
2020-08-21Merge branch 'feature/2071-actor-type' into 'develop'lain
Adding actor type in user show Closes #2071 See merge request pleroma/pleroma!2910
2020-08-21adding actor type in user showAlexander Strizhakov
2020-08-21[#2497] Media preview proxy: added `quality` config setting, adjusted ↵Ivan Tashkinov
width/height defaults.
2020-08-20Pipeline Ingestion: EventHaelwenn (lanodan) Monnier
2020-08-20[#2497] Media preview proxy: added Content-Disposition header with filename ↵Ivan Tashkinov
to response.
2020-08-19[#2497] Media preview proxy config refactoring & documentation.Ivan Tashkinov
2020-08-19Merge branch 'features/validators-audio2' into 'develop'lain
Pipeline Ingestion: Audio (Part 2) See merge request pleroma/pleroma!2903
2020-08-19AudioHandlingTest: Make mock explicitlain
2020-08-19Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
features/validators-audio2
2020-08-19Merge branch 'fix-arm64' into 'develop'lain
CI: Fix release builds once more. See merge request pleroma/pleroma!2907
2020-08-19CI: Fix release builds once more.lain
2020-08-19Merge branch 'email-tests' into 'develop'lain
Fix for sometimes failing email tests See merge request pleroma/pleroma!2906
2020-08-19fix for sometimes failing testsAlexander Strizhakov
2020-08-19Merge branch 'mix-task-fixes' into 'develop'lain
Fixes for mix tasks See merge request pleroma/pleroma!2905
2020-08-19fixes for mix tasksAlexander Strizhakov
- fix for `mix pleroma.database update_users_following_followers_counts` - raise error, if fetch was unsuccessful in emoji tasks - fix for `pleroma.digest test` task
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
Resolve "Make default image description blank" Closes #2064 See merge request pleroma/pleroma!2899
2020-08-18Merge branch 'improve/freebsd-rc-script' into 'develop'feld
Improve FreeBSD rc script See merge request pleroma/pleroma!2901
2020-08-18Improve FreeBSD rc scriptMark Felder
Passes rclint now, $HOME is dynamic, and properly matches process name for signalling shutdown.
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 ↵Ivan Tashkinov
2168-media-preview-proxy
2020-08-18Merge branch 'freebsd-docs' into 'develop'lain
FreeBSD installation process See merge request pleroma/pleroma!2887
2020-08-18Merge branch 'chore/improve-descriptions' into 'develop'lain
Improve description for mediaproxy cache invalidation settings See merge request pleroma/pleroma!2891