summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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-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-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.
2020-05-18Merge branch 'show-media-endpoint-fixes' into 'develop'lain
MediaController OAuth scope assignments fix See merge request pleroma/pleroma!2541
2020-05-18Merge branch '1763-password-updates' into 'develop'rinpatch
Authentication Plug: Update bcrypt password on login. Closes #1763 See merge request pleroma/pleroma!2542
2020-05-18MediaController: enforced owner-only access in :show action.Ivan Tashkinov
Improved error response on denied access (now 403). Adjusted tests.
2020-05-18updated docsMaksim Pechnikov
2020-05-17Pleroma Authenticator: Also update passwords here.lain
2020-05-17AuthenticationPlug: Also update crypt passwords.lain
2020-05-17Authentication Plug: Update bcrypt password on login.lain
2020-05-17Merge branch 'weblate-pleroma-pleroma' into 'develop'lain
Translations update from Weblate See merge request pleroma/pleroma!2535
2020-05-17Translated using Weblate (Polish)Jędrzej Tomaszewski
Currently translated at 65.0% (69 of 106 strings) Translation: Pleroma/Pleroma backend Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/pl/
2020-05-17Added translation using Weblate (Dutch)Fristi
2020-05-17Merge branch 'feature/remove-settings-that-shouldnt-be-altered' into 'develop'lain
Remove settings that shouldn't be altered Closes admin-fe#110 See merge request pleroma/pleroma!2540
2020-05-17Merge branch 'pleroma-fe-2020-05-13-with-relationships-support' into 'develop'lain
PleromaFE bundle supporting `with_relationships` param See merge request pleroma/pleroma!2530
2020-05-17Merge branch 'restricted-relations-embedding' into 'develop'lain
Restricted support for embedded relationships See merge request pleroma/pleroma!2456