summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2020-05-02Merge branch 'follow-request-notifications' into 'develop'rinpatch
2020-05-02Merge branch 'pleroma-fe-2020-05-02-5f90b6a3' into 'develop'rinpatch
2020-05-02PleromaFE bundle supporting follow request notifications.Ivan Tashkinov
2020-05-02Merge branch 'bugfix/static-fe.css' into 'develop'Haelwenn
2020-05-02static-fe.css: Restore and move to /priv/static/static-feHaelwenn (lanodan) Monnier
2020-05-02Merge remote-tracking branch 'remotes/origin/develop' into follow-request-not...Ivan Tashkinov
2020-05-01Merge branch 'fix/sporadic-test-failure-alias' into 'develop'rinpatch
2020-05-01Merge branch 'fix/notificatons-follow-request-validation' into 'develop'rinpatch
2020-05-01OpenAPI: Add `follow_request` to notification typesrinpatch
2020-05-01signature.ex: Remove the use of ObjectID typerinpatch
2020-05-01Fix sporadic test compilation failure caused by unused aliasrinpatch
2020-05-01Merge branch 'bugfix/1727-fix-signature-decoding' into 'develop'rinpatch
2020-05-01Update AdminFE build in preparation for the 2.0.3 releaseMark Felder
2020-05-01Merge branch 'fix/openapi-limit' into 'develop'lain
2020-05-01OpenAPI: Remove max pagination limit from the specrinpatch
2020-05-01Merge branch 'bugfix/1727-fix-signature-decoding' into 'develop'rinpatch
2020-05-01Restricted embedding of relationships where applicable (statuses / notificati...Ivan Tashkinov
2020-05-01Merge branch 'fix-notifications-loading-in-pleroma-fe' into 'develop'lain
2020-05-01Updated PleromaFE bundle to prevent notifications loading issue due to unsupp...Ivan Tashkinov
2020-05-01MappedSignatureToIdentityPlug: Fix.lain
2020-05-01Signature: Handle non-ap ids in key ids.lain
2020-05-01credo fixAlexander Strizhakov
2020-05-01Merge branch 'openapi/notifications' into 'develop'lain
2020-05-01Merge branch 'openapi/reports' into 'develop'lain
2020-05-01Merge branch 'issue/1577' into 'develop'lain
2020-05-01AdminApiController: Use common pipeline for user deletion.lain
2020-05-01AdminAPIController: Refactor.lain
2020-05-01User deletion mix task: Use common pipeline.lain
2020-05-01Merge branch 'fix/captcha' into 'develop'lain
2020-05-01Merge branch 'feature/delete-validator' of git.pleroma.social:pleroma/pleroma...lain
2020-05-01DeleteValidator: Only allow deletion of certain types.lain
2020-05-01Merge branch 'following-relationships-optimizations' into 'develop'rinpatch
2020-05-01pagination fix for service users filtersAlexander Strizhakov
2020-05-01Made follow request notifications non-optional (removed config switch).Ivan Tashkinov
2020-05-01Merge branch 'develop' into issue/1276-2Maksim Pechnikov
2020-05-01Merge branch 'feature/1677-need_reboot-flag-endpoint' into 'develop'Haelwenn
2020-05-01Uploads: Sandbox them in the CSP.lain
2020-04-30Merge branch 'update/admin-fe-20200429' into 'develop'rinpatch
2020-04-30Merge branch 'tests/more-apc2s' into 'develop'lain
2020-05-01Fix Oban not receiving :ok from RichMediaHelper jobMark Felder
2020-05-01[#1682] Fixed Basic Auth permissions issue by disabling OAuth scopes checks w...Ivan Tashkinov
2020-05-01Merge branch 'authenticated-api-oauth-check-enforcement' into 'develop'rinpatch
2020-05-01Merge branch 'fix-object_age_policy' into 'develop'lain
2020-05-01mix.exs: Do not bail out when .git doesn’t existsHaelwenn (lanodan) Monnier
2020-05-01Merge branch 'bugfix/1670-user-count' into 'develop'Haelwenn
2020-05-01Merge branch 'fix/follow-and-blocks-import' into 'develop'Haelwenn
2020-05-01CommonAPI: Don't make repeating announces possiblelain
2020-05-01Let blob: pass CSPAlex Gleason
2020-05-01Mastodon API: do not create a following relationship if the corresponding fol...eugenijm
2020-05-01Deactivate local users on deletion instead of deleting the recordrinpatch