summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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-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-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
2020-04-28Document DELETE /api/v1/notifications/destroy_multipleMark Felder
2020-04-28Merge branch 'openapi/account' into 'develop'rinpatch
Add OpenAPI specs for AccountController See merge request pleroma/pleroma!2374
2020-04-28Merge branch 'mongoose-secure' into 'develop'lain
mongoose auth endpoint worked for deactivated accounts See merge request pleroma/pleroma!2432
2020-04-28formatingfence
2020-04-27Move single used schemas to operation schemaEgor Kislitsyn
2020-04-27mongooseim test: explicitly set password for the deactivated usedfence
2020-04-27requested changes to mongoose testfence
2020-04-27requested changes to mongoose_im_controller.exfence
2020-04-27Use `json_response_and_validate_schema/2` in tests to validate OpenAPI schemaEgor Kislitsyn
2020-04-27add tests for deactivated users for mongoose authfence
2020-04-27secure mongoose auth endpointfence
2020-04-27Merge branch 'develop' into openapi/accountEgor Kislitsyn
2020-04-26Merge branch 'img-src-blob' into 'develop'rinpatch
Let blob: pass CSP See merge request pleroma/pleroma!2427
2020-04-26Let blob: pass CSPAlex Gleason
2020-04-25Merge branch '1706-dm-timeline-failure-fix' into 'develop'lain
[#1706] Prevented error on unresolved activity actors for timeline actions Closes #1706 See merge request pleroma/pleroma!2425
2020-04-25[#1706] Formatting fix.Ivan Tashkinov
2020-04-25[#1706] Prevented error on unresolved activity actors for timeline actions.Ivan Tashkinov
2020-04-24[#2409] Made `GET /api/v1/accounts/:id/favourites` auth-optional, adjusted ↵Ivan Tashkinov
tests.
2020-04-24Merge branch 'bugfix/announce-race-condition' into 'develop'rinpatch
Announcements: Prevent race condition. See merge request pleroma/pleroma!2423
2020-04-24Merge branch 'reply-filtering-refactor' into 'develop'lain
Reply filtering refactor See merge request pleroma/pleroma!2424
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-01 00:31:51 +0000