summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-05-22[#2497] Specified SHELL in .gitlab-ci.yml as required for `exexec`.Ivan Tashkinov
2020-05-21[#2497] Customized `exexec` launch to support root operation (currently ↵Ivan Tashkinov
required by Gitlab CI).
2020-05-21[#2497] Image preview proxy: image resize & background color fix with ffmpeg ↵Ivan Tashkinov
-filter_complex.
2020-05-20Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
2168-media-preview-proxy
2020-05-20[#2497] Image preview proxy: implemented ffmpeg-based resizing, removed eimp ↵Ivan Tashkinov
& mogrify-based resizing.
2020-05-20Merge branch 'openapi/pleroma-api/emojis' into 'develop'lain
Add OpenAPI spec for EmojiPackController See merge request pleroma/pleroma!2549
2020-05-20Merge branch 'feature/1734-user-deletion' into 'develop'lain
User deletion Closes #1734 See merge request pleroma/pleroma!2493
2020-05-20Merge branch 'openapi/fix-spec' into 'develop'lain
Add `background_image` to `InstanceOperation` See merge request pleroma/pleroma!2562
2020-05-20Add `background_image` to `InstanceOperation`Egor Kislitsyn
2020-05-20Merge branch 'exposed-background-image' into 'develop'Haelwenn
InstanceView: Expose background image link. See merge request pleroma/pleroma!2545
2020-05-20Merge branch 'issue/1509' into 'develop'lain
[#1509] purge media from cache after delete See merge request pleroma/pleroma!2539
2020-05-20Changelog: Add background to instancelain
2020-05-20Docs: Add background_image in instancelain
2020-05-20InstanceOperation: Add background image to examplelain
2020-05-20Merge branch 'mastofe/bundle-2020-05-20' into 'develop'lain
MastoFE: update to bundle-2020-05-20 See merge request pleroma/pleroma!2561
2020-05-20MastoFE: update to bundle-2020-05-20Haelwenn (lanodan) Monnier
2020-05-20Apply suggestion to installation/nginx-cache-purge.sh.exampleMaksim
2020-05-20Merge branch 'openapi/pleroma-api/scrobble' into 'develop'Haelwenn
Add OpenAPI spec for PleromaAPI.ScrobbleController See merge request pleroma/pleroma!2559
2020-05-20update purge scriptMaksim Pechnikov
2020-05-19Merge branch 'recipients-query-speedup' into 'develop'rinpatch
Greatly speed up recipients query See merge request pleroma/pleroma!2558
2020-05-19Fix summaryEgor Kislitsyn
2020-05-19User.Query: Remove superfluous `distinct`lain
2020-05-19UserTest: Hide warning in tests.lain
2020-05-19Move Scrobble views to ScrobbleViewEgor Kislitsyn
2020-05-19Add OpenAPI spec for PleromaAPI.ScrobbleControllerEgor Kislitsyn
2020-05-19User.Query: Speed up recipients query.lain
2020-05-19Merge branch 'deps/update-crypt' into 'develop'lain
Update crypt library See merge request pleroma/pleroma!2557
2020-05-19Update crypt libraryRoman Chvanikov
2020-05-19Fix typoEgor Kislitsyn
2020-05-19Merge branch 'openapi/pleroma-api/mascot' into 'develop'Haelwenn
Add OpenAPI spec for MascotController See merge request pleroma/pleroma!2553
2020-05-19Merge branch 'issue/1667' into 'develop'Haelwenn
[#1667] fix api/v1/accounts/update_credentials See merge request pleroma/pleroma!2556
2020-05-19Merge branch 'support/docs' into 'develop'Haelwenn
fix docs See merge request pleroma/pleroma!2555
2020-05-19fix api/v1/accounts/update_credentialsMaksim Pechnikov
2020-05-19removed Quantum from docsMaksim Pechnikov
2020-05-19added testsMaksim Pechnikov
2020-05-18Fix API documentationEgor Kislitsyn
2020-05-18Add OpenAPI spec for MascotControllerEgor Kislitsyn
2020-05-18Merge branch 'openapi/use-boolean-like-in-requests' into 'develop'rinpatch
[OpenAPI] Use BooleanLike in all request bodies Closes #1782 See merge request pleroma/pleroma!2551
2020-05-18[OpenAPI] Use BooleanLike in all request bodiesEgor Kislitsyn
2020-05-18Merge branch 'direct-timeline-with-muted-param-fix' into 'develop'lain
Fixed missing support for `with_muted` param in direct timeline See merge request pleroma/pleroma!2548
2020-05-18Fixed missing support for `with_muted` param in direct timeline.Ivan Tashkinov
2020-05-18Rename EmojiAPIController to EmojiPackControllerEgor Kislitsyn
2020-05-18Cleanup Pleroma.Emoji.PackEgor Kislitsyn
2020-05-18Add OpenAPI spec for PleromaAPI.EmojiAPIControllerEgor Kislitsyn
2020-05-18Merge branch 'copyright' into 'develop'lain
Copyright update See merge request pleroma/pleroma!2547
2020-05-18copyright updateAlexander Strizhakov
2020-05-18Merge branch '1778-benchmark-fix' into 'develop'lain
Load Testing: adjust to new CommonAPI.post format. Closes #1778 See merge request pleroma/pleroma!2546
2020-05-18Merge branch 'docs/storing-remote-media' into 'develop'lain
Document how to store remote media permanently See merge request pleroma/pleroma!1871
2020-05-18Load Testing: adjust to new CommonAPI.post format.lain
2020-05-18InstanceView: Expose background image link.lain
This will make it easier for more clients to support this feature.