aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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-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
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-24[#2409] Tested all auth setup configs in AuthTestControllerTest. Adjusted ↵Ivan Tashkinov
:skip_plug definitions for some endpoints.
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-23[#2409] Fixed before-action callback results persistence.Ivan Tashkinov
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
2020-04-22SideEffects: Use less cryptic syntax.lain
2020-04-22Merge branch 'bugfix/1670-user-count' into 'develop'Haelwenn
Stats: Ignore internal users for user count. Closes #1670 See merge request pleroma/pleroma!2414