summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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 ↵Ivan Tashkinov
follow-request-notifications
2020-05-01Merge branch 'fix/sporadic-test-failure-alias' into 'develop'rinpatch
Fix sporadic test compilation failure caused by unused alias See merge request pleroma/pleroma!2460
2020-05-01Merge branch 'fix/notificatons-follow-request-validation' into 'develop'rinpatch
OpenAPI: Add `follow_request` to notification types Closes #1731 See merge request pleroma/pleroma!2459
2020-05-01OpenAPI: Add `follow_request` to notification typesrinpatch
Closes #1731
2020-05-01signature.ex: Remove the use of ObjectID typerinpatch
It is not in stable yet
2020-05-01Fix sporadic test compilation failure caused by unused aliasrinpatch
2020-05-01Merge branch 'bugfix/1727-fix-signature-decoding' into 'develop'rinpatch
Bugfix/1727 fix signature decoding Closes #1727 See merge request pleroma/pleroma!2454
2020-05-01Update AdminFE build in preparation for the 2.0.3 releaseMark Felder
2020-05-01Merge branch 'fix/openapi-limit' into 'develop'lain
OpenAPI: Remove max pagination limit from the spec See merge request pleroma/pleroma!2457
2020-05-01OpenAPI: Remove max pagination limit from the specrinpatch
In an ideal world clients wouldn't try to request more than the max hardcoded limit, but SubwayTooter does.
2020-05-01Merge branch 'bugfix/1727-fix-signature-decoding' into 'develop'rinpatch
Bugfix/1727 fix signature decoding Closes #1727 See merge request pleroma/pleroma!2454
2020-05-01Restricted embedding of relationships where applicable (statuses / ↵Ivan Tashkinov
notifications / accounts rendering). Added support for :skip_notifications for accounts listing (index.json). Adjusted tests.
2020-05-01Merge branch 'fix-notifications-loading-in-pleroma-fe' into 'develop'lain
Notifications loading fix (PleromaFE) See merge request pleroma/pleroma!2455
2020-05-01Updated PleromaFE bundle to prevent notifications loading issue due to ↵Ivan Tashkinov
unsupported parameter (`with_move`).
2020-05-01MappedSignatureToIdentityPlug: Fix.lain
2020-05-01Signature: Handle non-ap ids in key ids.lain
Mastodon and Gab sometimes send the format `acct:name@server`.
2020-05-01credo fixAlexander Strizhakov
2020-05-01Merge branch 'openapi/notifications' into 'develop'lain
Add OpenAPI spec for NotificationController See merge request pleroma/pleroma!2437
2020-05-01Merge branch 'openapi/reports' into 'develop'lain
Add OpenAPI spec for ReportController See merge request pleroma/pleroma!2434
2020-05-01Merge branch 'issue/1577' into 'develop'lain
[#1577] fix mediaType of object See merge request pleroma/pleroma!2372
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
Fix account registration when captcha is enabled but not provided Closes #1712 See merge request pleroma/pleroma!2438
2020-05-01Merge branch 'feature/delete-validator' of ↵lain
git.pleroma.social:pleroma/pleroma into feature/delete-validator
2020-05-01DeleteValidator: Only allow deletion of certain types.lain
2020-05-01Merge branch 'following-relationships-optimizations' into 'develop'rinpatch
FollowingRelationship storage & performance optimizations See merge request pleroma/pleroma!2332
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
Added need_reboot endpoint to admin api Closes #1677 See merge request pleroma/pleroma!2373
2020-05-01Uploads: Sandbox them in the CSP.lain
2020-04-30Merge branch 'update/admin-fe-20200429' into 'develop'rinpatch
Update AdminFE build in preparation for the 2.0.3 release See merge request pleroma/pleroma!2442
2020-04-30Merge branch 'tests/more-apc2s' into 'develop'lain
Increase tests on AP C2S See merge request pleroma/pleroma!2449
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 ↵Ivan Tashkinov
when password is provided. Refactored plugs skipping functionality.
2020-05-01Merge branch 'authenticated-api-oauth-check-enforcement' into 'develop'rinpatch
Enforcement of OAuth scopes check for authenticated API endpoints See merge request pleroma/pleroma!2349
2020-05-01Merge branch 'fix-object_age_policy' into 'develop'lain
Fix ObjectAgePolicy See merge request pleroma/pleroma!2404
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
Stats: Ignore internal users for user count. Closes #1670 See merge request pleroma/pleroma!2414
2020-05-01Merge branch 'fix/follow-and-blocks-import' into 'develop'Haelwenn
Fix follower/blocks import when nicknames starts with @ Closes #1698 See merge request pleroma/pleroma!2416
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 ↵eugenijm
follow request doesn't exist when calling `POST /api/v1/follow_requests/:id/authorize`
2020-05-01Deactivate local users on deletion instead of deleting the recordrinpatch
Prevents the possibility of re-registration, which allowed to read DMs of the deleted account. Also includes a migration that tries to find any already deleted accounts and insert skeletons for them. Closes pleroma/pleroma#1687
2020-04-30Merge branch 'develop' of ssh://git.pleroma.social/pleroma/pleroma into ↵Lain Soykaf
feature/delete-validator
2020-04-30DeleteValidator: Don't federate local deletions of remote objects.lain
Closes #1497
2020-04-30Merge branch 'dismiss-notification-on-follow-request-rejection' into 'develop'lain
Dismiss the follow request notification on rejection See merge request pleroma/pleroma!2447
2020-04-30ActivityPub: Remove `delete` function.lain
This is handled by the common pipeline now.