Maksim Pechnikov
|
f0fefc4f5c
|
marks notifications as read after mute
|
4 years ago |
|
lain
|
51844b1e42
|
Merge branch 'stable-sync/2.1.0' into 'develop'
Merge stable in develop and bump development version
Closes #1610, #1621, #1613, #1375, #1374, #1614, #1422, #1595, #1620, #1364, #1640, #1643, #1653, #1624, #764, #1687, #1698, #1670, #1677, #1727, #1559, #1746, #1313, #1810, #751, and #866
See merge request pleroma/pleroma!2928
|
4 years ago |
|
lain
|
b41c8cff18
|
Merge branch 'mention-sudo-pleroma-when-updating' into 'develop'
Add mention of sudo -Hu pleroma to update docs
See merge request pleroma/pleroma!2929
|
4 years ago |
|
Shpuld Shpludson
|
35da3be9dd
|
Add mention of sudo -Hu pleroma to docs
|
4 years ago |
|
rinpatch
|
ce387ce730
|
mix.exs: bump development version after 2.1.0 release
|
4 years ago |
|
lain
|
73dd5bdb7d
|
Merge branch 'release/2.1.0' into 'stable'
Release/2.1.0
See merge request pleroma/pleroma!2927
|
4 years ago |
|
lain
|
b141e35d64
|
Mix: Update version
|
4 years ago |
|
lain
|
4e022fc16c
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into pleroma-2.1-rc0
|
4 years ago |
|
Mark Felder
|
5b4d483f52
|
Add a note about the avatars and banners situation
|
4 years ago |
|
Mark Felder
|
67c79394e8
|
Support static avatars and header images with Mediaproxy Preview
|
4 years ago |
|
Mark Felder
|
3a5231ec8f
|
Keep args construction within video/image scopes instead of mangling down in fifo town
|
4 years ago |
|
Mark Felder
|
dd1de994d5
|
Try to trick ffmpeg into working with this named pipe
|
4 years ago |
|
Mark Felder
|
f1218a2b4e
|
ffmpeg needs input from fifo path, not stdin
|
4 years ago |
|
Mark Felder
|
ef9d12fcc5
|
Attempt at supporting video thumbnails via ffmpeg
|
4 years ago |
|
Haelwenn
|
6b01a09a08
|
Merge branch '2078-list-fixes' into 'develop'
Resolve "List timeline returns incorrectly assigned Account for replies and repeats"
Closes #2070 and #2078
See merge request pleroma/pleroma!2923
|
4 years ago |
|
Mark Felder
|
157ecf4022
|
Follow redirects.
I think we should be using some global adapter options here, though.
|
4 years ago |
|
lain
|
82bf27172c
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into pleroma-2.1-rc0
|
4 years ago |
|
lain
|
1c05819c9b
|
Merge branch '2081-deleted-user-chats' into 'develop'
ChatController: Don't die if the recipient is gone.
Closes #2081
See merge request pleroma/pleroma!2926
|
4 years ago |
|
lain
|
78939c1d16
|
ChatController: Don't die if the recipient is gone.
|
4 years ago |
|
rinpatch
|
22050f9ec0
|
Merge branch 'update/admin-fe-20200826' into 'develop'
Update AdminFE build in preparation for 2.1.0 release
See merge request pleroma/pleroma!2925
|
4 years ago |
|
Mark Felder
|
697bea0473
|
Move arg for images to the list so we can reuse these fifo functions for videos
|
4 years ago |
|
Mark Felder
|
9567b96c79
|
Rename to make it obvious this is for images not videos
|
4 years ago |
|
Mark Felder
|
2cfe2dc81b
|
Merge branch 'develop' into feld-2168-media-preview-proxy
|
4 years ago |
|
Mark Felder
|
eead2276e7
|
Ensure GIFs are redirected to the original or they become static.
|
4 years ago |
|
Mark Felder
|
f1b9e3595d
|
Update AdminFE build in preparation for 2.1.0 release
|
4 years ago |
|
Mark Felder
|
2c95533ead
|
Change method of convert using stdout, make progressive jpegs
|
4 years ago |
|
Mark Felder
|
d4d1192341
|
Remove auto-orient; don't use it on previews, only originals
|
4 years ago |
|
href
|
bc94f0c6da
|
Use mkfifo to feed ImageMagick
|
4 years ago |
|
lain
|
5dba3a50fc
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into pleroma-2.1-rc0
|
4 years ago |
|
rinpatch
|
6f17aea066
|
Merge branch 'fix/fast_html-build-errors' into 'develop'
fix fast_html build errors with gcc 10 by bumping fast_sanitize
Closes #2058
See merge request pleroma/pleroma!2922
|
4 years ago |
|
lain
|
5ffd20f3b5
|
Changelog: Add info about list fixes.
|
4 years ago |
|
lain
|
cfc99fe05c
|
TimelineController: Keys are atoms now.
Closes #2078
Closes #2070
|
4 years ago |
|
rinpatch
|
6da17f88d6
|
fix fast_html build errors with gcc 10 by bumping fast_sanitize
Closes #2058
|
4 years ago |
|
rinpatch
|
6ef9db0557
|
Merge branch '2079-welcome-message-docs' into 'develop'
Cheatsheet: Remove misleading example
Closes #2079
See merge request pleroma/pleroma!2921
|
4 years ago |
|
lain
|
b76839e008
|
Cheatsheet: Remove misleading example
|
4 years ago |
|
lain
|
fc42446755
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into pleroma-2.1-rc0
|
4 years ago |
|
lain
|
7975351550
|
Merge branch 'chore/release-template-merge-back-to-develop' into 'develop'
release MR template: add a note about merging stable changes back to develop
See merge request pleroma/pleroma!2920
|
4 years ago |
|
rinpatch
|
dcd06488e0
|
release MR template: add a note about merging stable changes back to
develop
|
4 years ago |
|
Mark Felder
|
a136e7e9b5
|
Try specifying fd0, force jpg out
|
4 years ago |
|
Mark Felder
|
afa03ca8e2
|
Allow both stdin and stdout
|
4 years ago |
|
Mark Felder
|
ddbddc08fc
|
Redirects for videos right now
|
4 years ago |
|
Haelwenn
|
fd04137e18
|
Merge branch 'buildx-multiarch-arm32v7' into 'develop'
Add multiarch support to docker container, fixes pleroma/pleroma-docker-compose#2
Closes pleroma-docker-compose#2
See merge request pleroma/pleroma!2789
|
4 years ago |
|
Mark Felder
|
899ea2da3e
|
Switch to imagemagick, only support videos
|
4 years ago |
|
feld
|
fb33321fa2
|
Merge branch 'feature/1952-read-muted-notifications' into 'develop'
Automatically mark notifications about statuses from muted users and threads as read
Closes #1952
See merge request pleroma/pleroma!2893
|
4 years ago |
|
Haelwenn
|
976094cd7b
|
Merge branch '2077-fix-bogus-webfinger-ids' into 'develop'
Webfinger: Handle bogus ids better.
Closes #2077
See merge request pleroma/pleroma!2919
|
4 years ago |
|
Mark Felder
|
479578b148
|
Merge branch 'develop' into feld-2168-media-preview-proxy
|
4 years ago |
|
lain
|
112bec5225
|
Webfinger: Handle bogus ids better.
|
4 years ago |
|
lain
|
49a436ad3e
|
Mix: Make rc version explicit.
|
4 years ago |
|
lain
|
ea2b5c07e3
|
Merge branch 'stable' of git.pleroma.social:pleroma/pleroma into pleroma-2.1-rc0
|
4 years ago |
|
lain
|
361aa22e28
|
Merge branch 'frontend-bundles-downloads' into 'develop'
frontend install mix tasks
See merge request pleroma/pleroma!2841
|
4 years ago |
