summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-05-02Merge branch 'bugfix/static-fe.css' into 'develop'Haelwenn
static-fe.css: Restore and move to /priv/static/static-fe See merge request pleroma/pleroma!2458
2020-05-02static-fe.css: Restore and move to /priv/static/static-feHaelwenn (lanodan) Monnier
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-01Fix sporadic test compilation failure caused by unused aliasrinpatch
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-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-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-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-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-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-30Increase tests on AP C2SHaelwenn (lanodan) Monnier
Related: https://git.pleroma.social/pleroma/pleroma/-/issues/954
2020-04-30Merge branch 'emoji-upload' into 'develop'Haelwenn
Updated emoji API endpoints Closes #1649, #1604, and #1545 See merge request pleroma/pleroma!2179
2020-04-30Dismiss the follow request notification on rejectioneugenijm
2020-04-30fix for auth checkAlexander Strizhakov
2020-04-30docs updateAlexander Strizhakov
2020-04-30docs fixAlexander Strizhakov
2020-04-30list of options for pack metadataAlexander Strizhakov
2020-04-30error renameAlexander Strizhakov
2020-04-30changelog entryAlexander Strizhakov
2020-04-30emoji api packs changes in routes with docs updateAlexander Strizhakov
2020-04-30removing entry from changelogAlexander Strizhakov
2020-04-30docs updateAlexander Strizhakov
2020-04-30refactor emoji api with fixesAlexander Strizhakov
2020-04-30return data only for updated emojiAlexander Strizhakov
2020-04-30Merge branch '1364-no-pushes-from-blocked-domains-users' into 'develop'lain
[#1364] [FIX] Disabled notifications on activities from blocked domains (unless actors are followed) See merge request pleroma/pleroma!2367
2020-04-30Merge branch 'develop' into openapi/notificationsEgor Kislitsyn
2020-04-30Merge branch 'develop' into openapi/reportsEgor Kislitsyn
2020-04-29Merge branch 'fix/add-exclude-replies-openapi' into 'develop'rinpatch
Add exlude_replies to OpenAPI spec for account timelines See merge request pleroma/pleroma!2443
2020-04-30Add exlude_replies to OpenAPI spec for account timelinesrinpatch
2020-04-29Update AdminFE build in preparation for the 2.0.3 releaseMark Felder
2020-04-29Change Pleroma.CaptchaTest to be a regular module instead of GenServerEgor Kislitsyn
2020-04-29Add tests for account registration with captcha enabled and improve errorsEgor Kislitsyn
2020-04-29Fix account registration when captcha is enabled but not providedEgor Kislitsyn
2020-04-29Document `captcha_answer_data` parameterEgor Kislitsyn
2020-04-29Merge branch 'automatic-authentication-and-instance-publicity-checks' into ↵lain
'develop' Automatic checks of authentication / authorization / instance publicity See merge request pleroma/pleroma!2409
2020-04-29added testMaksim Pechnikov
2020-04-28Add OpenAPI spec for NotificationControllerEgor Kislitsyn
2020-04-28[#2349] Post-merge fix.Ivan Tashkinov
2020-04-28Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
automatic-authentication-and-instance-publicity-checks # Conflicts: # lib/pleroma/web/mastodon_api/controllers/account_controller.ex
2020-04-28Merge branch 'docs/notification_destroy_multiple' into 'develop'lain
Document DELETE /api/v1/notifications/destroy_multiple Closes #1711 See merge request pleroma/pleroma!2435
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-05 08:29:01 +0000