aboutsummaryrefslogtreecommitdiff
path: root/test
AgeCommit message (Collapse)Author
2020-05-07Merge branch 'openapi/polls' into 'develop'lain
Add OpenAPI spec for PollController See merge request pleroma/pleroma!2476
2020-05-07Merge branch 'streamer-worker-registry' into 'develop'lain
Streamer rework See merge request pleroma/pleroma!2426
2020-05-07Streamer reworkhref
2020-05-07Pleroma.Web.TwitterAPI.TwoFactorAuthenticationController -> ↵Maksim
Pleroma.Web.PleromaAPI.TwoFactorAuthenticationController
2020-05-06Hide the sender when privacy option is enabledMark Felder
2020-05-06Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
remake-remodel-dms
2020-05-06Merge branch 'feature/delete-validator' into 'develop'rinpatch
Move deletions to the common pipeline Closes #1497 See merge request pleroma/pleroma!2441
2020-05-06Credo fixes.lain
2020-05-06ChatMessages: Add attachments.lain
2020-05-06added `unread_notifications_count` for `/api/v1/accounts/verify_credentials`Maksim Pechnikov
2020-05-06Merge branch 'develop' into issue/1276-2Maksim Pechnikov
2020-05-06Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
remake-remodel-dms
2020-05-06Merge branch 'plug-if-unless-func-options-refactoring' into 'develop'lain
Refactoring of :if_func / :unless_func plug options See merge request pleroma/pleroma!2446
2020-05-06Merge branch 'openapi/subscriptions' into 'develop'lain
Add OpenAPI spec for SubscriptionController See merge request pleroma/pleroma!2444
2020-05-06Merge branch 'openapi/markers' into 'develop'lain
Add OpenAPI spec for MarkerController See merge request pleroma/pleroma!2386
2020-05-06Merge branch 'bugfix/sensitive_object' into 'develop'lain
Transmogrifier.set_sensitive/1: Keep sensitive set to true Closes #954 See merge request pleroma/pleroma!2470
2020-05-06Merge branch 'fix/1726-user-pagination' into 'develop'lain
Pagination fix for service users filters in admin api Closes #1726 See merge request pleroma/pleroma!2452
2020-05-06Merge branch 'openapi/follow_requests' into 'develop'lain
Add OpenAPI spec for FollowRequestController See merge request pleroma/pleroma!2448
2020-05-06Merge branch 'openapi/filters' into 'develop'lain
Add OpenAPI spec for FilterController See merge request pleroma/pleroma!2382
2020-05-06Merge branch 'feature/1728-webfinger-acct-scheme' into 'develop'lain
Webfinger: Request account info with the acct scheme Closes #1728 See merge request pleroma/pleroma!2465
2020-05-06Merge branch 'openapi/instance' into 'develop'lain
Add OpenAPI spec for InstanceController See merge request pleroma/pleroma!2450
2020-05-06Merge branch 'openapi/lists' into 'develop'lain
Add OpenAPI spec for ListController See merge request pleroma/pleroma!2453
2020-05-06Merge branch 'openapi/conversations' into 'develop'lain
Add OpenAPI spec for ConversationController See merge request pleroma/pleroma!2445
2020-05-06Merge branch 'develop' into issue/1276-2Maksim Pechnikov
2020-05-05Add OpenAPI spec for ScheduledActivityControllerEgor Kislitsyn
2020-05-05Chat: Fix missing chat id on second 'get'lain
2020-05-05Add OpenAPI spec for PollControllerEgor Kislitsyn
2020-05-05Undoing: Move undoing blocks to the pipeline everywhere.lain
2020-05-05Undoing: Move undoing announcements to the pipeline everywhere.lain
2020-05-05Undoing: Move undoing reactions to the pipeline everywhere.lain
2020-05-05Add OpenAPI spec for ConversationControllerEgor Kislitsyn
2020-05-05Move single used schemas to Filter operation schemaEgor Kislitsyn
2020-05-05Add OpenAPI spec for FilterControllerEgor Kislitsyn
2020-05-05Merge branch 'feature/1720-status-view' into 'develop'lain
Admin API fetch status by id Closes #1720 See merge request pleroma/pleroma!2475
2020-05-05Add OpenAPI spec for FollowRequestControllerEgor Kislitsyn
2020-05-05Add OpenAPI spec for InstanceControllerEgor Kislitsyn
2020-05-05admin_api fetch status by idAlexander Strizhakov
2020-05-05Undoing: Move undoing likes to the pipeline everywhere.lain
2020-05-05Add OpenAPI spec for ListControllerEgor Kislitsyn
2020-05-05Move single used schemas to Marker operation schemaEgor Kislitsyn
2020-05-05Add OpenAPI spec for MarkerControllerEgor Kislitsyn
2020-05-05Add OpenAPI spec for SubscriptionControllerEgor Kislitsyn
2020-05-05UndoValidator: Add UndoValidator.lain
2020-05-05Merge branch 'feature/1737-magic-key-field' into 'develop'rinpatch
User, Webfinger: Remove OStatus vestiges Closes #1737 See merge request pleroma/pleroma!2471
2020-05-05Transmogrifier tests: Extract Undo handlinglain
2020-05-05Merge branch 'develop' into global-status-expirationEgor Kislitsyn
2020-05-05ActivityPub: Remove `react_with_emoji`.lain
2020-05-05Transmogrifier: Move emoji reactions to common pipeline.lain
2020-05-05Transmogrifier: Extract EmojiReact tests.lain
2020-05-05Merge branch 'fix/issue-1729' into 'develop'lain
Only update follower/following stats for actor types of users and bots. Closes #1565 and #1729 See merge request pleroma/pleroma!2464