summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
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
2020-04-30Merge branch 'develop' of ssh://git.pleroma.social/pleroma/pleroma into featu...Lain Soykaf
2020-04-30DeleteValidator: Don't federate local deletions of remote objects.lain
2020-04-30Merge branch 'dismiss-notification-on-follow-request-rejection' into 'develop'lain
2020-04-30ActivityPub: Remove `delete` function.lain
2020-04-30User: Use common pipeline to delete user activitieslain
2020-04-30SideEffects: Fix commentlain
2020-04-30SideEffects: On deletion, reduce the reply count cachelain
2020-04-30Increase tests on AP C2SHaelwenn (lanodan) Monnier
2020-04-30Credo fixes.lain
2020-04-30SideEffects: On deletion, reduce the User note count.lain
2020-04-30SideEffectsTest: Test streaming.lain
2020-04-30Merge branch 'emoji-upload' into 'develop'Haelwenn
2020-04-30ObjectValidator: Refactor.lain
2020-04-30SideEffects: Stream out deletes.lain
2020-04-30DeleteValidator: Add internal helper field after validation.lain
2020-04-30StreamerTest: Separate deletion test.lain
2020-04-30Dismiss the follow request notification on rejectioneugenijm
2020-04-30Refactoring of :if_func / :unless_func plug options (general availability). A...Ivan Tashkinov
2020-04-30fix for auth checkAlexander Strizhakov
2020-04-30AP C2S: Use common pipelin for deletes.lain
2020-04-30CommonAPI: Use common pipeline for deletions.lain
2020-04-30Credo fixes.lain