summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-04-28Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
remake-remodel-dms
2020-04-28Merge branch 'openapi/account' into 'develop'rinpatch
Add OpenAPI specs for AccountController See merge request pleroma/pleroma!2374
2020-04-28SideEffects: Use Object.normalize to get the object.lain
2020-04-28Recipient Type: Cast all elements as ObjectIDs.lain
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-27Credo fixes.lain
2020-04-27Docs: Align chat api changes with docs.lain
2020-04-27Chat API: Align more to Pleroma/Mastodon API.lain
2020-04-27ChatView: Add actor_account_idlain
2020-04-27Credo fixes.lain
2020-04-27Docs: Add chat motivation and api description.lain
2020-04-27Chat Schemas: Inline unimportant Schemas.lain
2020-04-27Merge branch 'develop' into openapi/accountEgor Kislitsyn
2020-04-27ChatControllerTest: Use new schema testing functions.lain
2020-04-27Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
remake-remodel-dms
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-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
2020-04-24Reply Filtering: Refactor.lain
2020-04-24Merge branch 'openapi-improvements' into 'develop'lain
Support validation for inline OpenAPI schema and automatic tests for examples Closes #1696 See merge request pleroma/pleroma!2421
2020-04-24Apply suggestion to CHANGELOG.mdlain
2020-04-24Update differences_in_mastoapi_responses.mdlain
2020-04-24bench syncAlexander Strizhakov
2020-04-24updating benchmarksAlexander Strizhakov
2020-04-24formattingAlexander
2020-04-24reply filteringAlexander
2020-04-24Announcements: Prevent race condition.lain
2020-04-24Merge branch 'feature/remove-unused-like-code' into 'develop'lain
ActivitPub: Remove `like` function. See merge request pleroma/pleroma!2422
2020-04-24Credo fixes.lain
2020-04-24ActivitPub: Remove `like` function.lain
We don't need another way to build likes.
2020-04-24Support validation for inline OpenAPI schema and automatic tests for examplesEgor Kislitsyn
2020-04-23Docs: Add documentation about chatmessageslain
2020-04-23ChatMessage: Correctly ingest emoji tags.lain
2020-04-23Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
remake-remodel-dms
2020-04-23Merge branch 'bugfix/repeating-announce' into 'develop'rinpatch
CommonAPI: Don't make repeating announces possible See merge request pleroma/pleroma!2418
2020-04-23CommonAPI: Don't make repeating announces possiblelain
2020-04-23Merge branch 'bugfix/null-scheduled-at' into 'develop'rinpatch
StatusController: Ignore nil scheduled_at parameters. Closes #1699 See merge request pleroma/pleroma!2412
2020-04-22Merge branch 'bugfix/1629-fav-race-condition' into 'develop'lain
SideEffects: Run in transaction. Closes #1629 See merge request pleroma/pleroma!2417