summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-08-27Try to trick ffmpeg into working with this named pipeMark Felder
2020-08-27ffmpeg needs input from fifo path, not stdinMark Felder
2020-08-27Attempt at supporting video thumbnails via ffmpegMark Felder
2020-08-27Merge branch '2078-list-fixes' into 'develop'Haelwenn
Resolve "List timeline returns incorrectly assigned Account for replies and repeats" Closes #2070 and #2078 See merge request pleroma/pleroma!2923
2020-08-27Follow redirects.Mark Felder
I think we should be using some global adapter options here, though.
2020-08-27Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
pleroma-2.1-rc0
2020-08-27Merge branch '2081-deleted-user-chats' into 'develop'lain
ChatController: Don't die if the recipient is gone. Closes #2081 See merge request pleroma/pleroma!2926
2020-08-27ChatController: Don't die if the recipient is gone.lain
2020-08-27Merge branch 'update/admin-fe-20200826' into 'develop'rinpatch
Update AdminFE build in preparation for 2.1.0 release See merge request pleroma/pleroma!2925
2020-08-26Move arg for images to the list so we can reuse these fifo functions for videosMark Felder
2020-08-26Rename to make it obvious this is for images not videosMark Felder
2020-08-26Merge branch 'develop' into feld-2168-media-preview-proxyMark Felder
2020-08-26Ensure GIFs are redirected to the original or they become static.Mark Felder
2020-08-26Update AdminFE build in preparation for 2.1.0 releaseMark Felder
2020-08-26Change method of convert using stdout, make progressive jpegsMark Felder
2020-08-26Remove auto-orient; don't use it on previews, only originalsMark Felder
2020-08-26Use mkfifo to feed ImageMagickhref
2020-08-26Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
pleroma-2.1-rc0
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-26Changelog: Add info about list fixes.lain
2020-08-26TimelineController: Keys are atoms now.lain
Closes #2078 Closes #2070
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 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
pleroma-2.1-rc0
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-25Try specifying fd0, force jpg outMark Felder
2020-08-25Allow both stdin and stdoutMark Felder
2020-08-25Redirects for videos right nowMark Felder
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-25Switch to imagemagick, only support videosMark Felder
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-25Merge branch 'develop' into feld-2168-media-preview-proxyMark Felder
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
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-25Apply 1 suggestion(s) to 1 file(s)Maksim
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-24added testsMaksim Pechnikov
2020-08-22Use the image thumbnail for rich metadata (OGP/Twittercards)Mark Felder
2020-08-22updated errors on add emojiMaksim Pechnikov
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-16 01:49:29 +0000