Commit Graph

259 Commits

Author SHA1 Message Date
Maksim Pechnikov bd261309cc added `unread_notifications_count` for `/api/v1/accounts/verify_credentials` 2020-05-06 15:08:38 +03:00
Maksim Pechnikov 8b97b6f5ba Merge branch 'develop' into issue/1276-2 2020-05-06 14:47:50 +03:00
lain a716543267 Merge branch 'openapi/subscriptions' into 'develop'
Add OpenAPI spec for SubscriptionController

See merge request pleroma/pleroma!2444
2020-05-06 09:10:17 +00:00
lain 61ea8f1f5a Merge branch 'openapi/markers' into 'develop'
Add OpenAPI spec for MarkerController

See merge request pleroma/pleroma!2386
2020-05-06 09:06:50 +00:00
lain 0a88bf6a9d Merge branch 'openapi/follow_requests' into 'develop'
Add OpenAPI spec for FollowRequestController

See merge request pleroma/pleroma!2448
2020-05-06 09:00:39 +00:00
lain 957172a307 Merge branch 'openapi/filters' into 'develop'
Add OpenAPI spec for FilterController

See merge request pleroma/pleroma!2382
2020-05-06 08:51:10 +00:00
lain 1ee34d4acb Merge branch 'openapi/instance' into 'develop'
Add OpenAPI spec for InstanceController

See merge request pleroma/pleroma!2450
2020-05-06 08:46:14 +00:00
lain 7fdc7078ae Merge branch 'openapi/lists' into 'develop'
Add OpenAPI spec for ListController

See merge request pleroma/pleroma!2453
2020-05-06 08:43:21 +00:00
lain 76c1a7a34b Merge branch 'openapi/conversations' into 'develop'
Add OpenAPI spec for ConversationController

See merge request pleroma/pleroma!2445
2020-05-06 08:40:04 +00:00
Maksim Pechnikov fb38b7339c Merge branch 'develop' into issue/1276-2 2020-05-06 05:55:39 +03:00
Egor Kislitsyn 332e016bcd
Add OpenAPI spec for ScheduledActivityController 2020-05-05 23:42:24 +04:00
Egor Kislitsyn 3a45952a3a
Add OpenAPI spec for ConversationController 2020-05-05 17:44:46 +04:00
Egor Kislitsyn 46aae346f8
Move single used schemas to Filter operation schema 2020-05-05 17:41:01 +04:00
Egor Kislitsyn 7e7a3e1544
Add OpenAPI spec for FilterController 2020-05-05 17:41:01 +04:00
Egor Kislitsyn ec1e4b4f1a
Add OpenAPI spec for FollowRequestController 2020-05-05 17:40:00 +04:00
Egor Kislitsyn 88a14da817
Add OpenAPI spec for InstanceController 2020-05-05 17:24:16 +04:00
Egor Kislitsyn 5ec6aad567
Add OpenAPI spec for ListController 2020-05-05 17:05:34 +04:00
Egor Kislitsyn babcae7130
Move single used schemas to Marker operation schema 2020-05-05 16:45:34 +04:00
Egor Kislitsyn 8096565653
Add OpenAPI spec for MarkerController 2020-05-05 16:44:16 +04:00
Egor Kislitsyn d861b0790a
Add OpenAPI spec for SubscriptionController 2020-05-05 16:43:00 +04:00
Maksim Pechnikov fe7a0d660e Merge branch 'develop' into issue/1276-2 2020-05-04 06:08:49 +03:00
rinpatch 3126f8a334 Merge branch 'feature/1710-consolidate-instance-info' into 'develop'
Feature/1710 consolidate instance info

Closes #1710

See merge request pleroma/pleroma!2430
2020-05-02 16:44:55 +00:00
rinpatch e7b1df7252 Fix sporadic test compilation failure caused by unused alias 2020-05-01 22:50:40 +03:00
lain 3370bb0e46 Merge branch 'openapi/notifications' into 'develop'
Add OpenAPI spec for NotificationController

See merge request pleroma/pleroma!2437
2020-05-01 13:09:36 +00:00
lain 607e06c245 Merge branch 'openapi/reports' into 'develop'
Add OpenAPI spec for ReportController

See merge request pleroma/pleroma!2434
2020-05-01 12:48:56 +00:00
Maksim Pechnikov a92c713d9c Merge branch 'develop' into issue/1276-2 2020-05-01 06:21:59 +03:00
Egor Kislitsyn 7b0c8f0fde
Add tests for account registration with captcha enabled and improve errors 2020-04-29 21:26:07 +04:00
Egor Kislitsyn 5238ae3dd3
Add OpenAPI spec for NotificationController 2020-04-28 21:27:54 +04:00
Egor Kislitsyn 560f2c1979
Add OpenAPI spec for ReportController 2020-04-28 16:50:37 +04:00
Egor Kislitsyn dda65f7799
Move single used schemas to operation schema 2020-04-27 22:55:05 +04:00
Egor Kislitsyn 2efc00b3cf
Use `json_response_and_validate_schema/2` in tests to validate OpenAPI schema 2020-04-27 20:46:52 +04:00
lain 3635a9c9c2 InstanceController: Add extensions to `/api/v1/instance` 2020-04-27 14:28:08 +02:00
Egor Kislitsyn f1ca917bb0
Merge branch 'develop' into openapi/account 2020-04-27 14:33:00 +04:00
Egor Kislitsyn f362836742
Support validation for inline OpenAPI schema and automatic tests for examples 2020-04-24 15:16:15 +04:00
rinpatch 25eec6d72d Merge branch 'bugfix/null-scheduled-at' into 'develop'
StatusController: Ignore nil scheduled_at parameters.

Closes #1699

See merge request pleroma/pleroma!2412
2020-04-23 11:22:30 +00:00
Egor Kislitsyn 6c26feed01
Merge branch 'develop' into openapi/account 2020-04-22 20:18:12 +04:00
lain 5b39526198 AccountController: Use code 400 for self-follow. 2020-04-22 15:04:26 +02:00
lain c10485db16 StatusController: Ignore nil scheduled_at parameters. 2020-04-22 14:26:19 +02:00
lain 3c828016d9 Merge branch 'openapi/custom-emojis' into 'develop'
Add OpenAPI spec for CustomEmojiController

See merge request pleroma/pleroma!2375
2020-04-21 10:13:50 +00:00
Egor Kislitsyn 736fead494 Merge branch 'develop' into openapi/account 2020-04-20 18:40:02 +04:00
lain 28165dad3a Merge branch 'cleanup-subscription-controller' into 'develop'
Cleanup SubscriptionController

See merge request pleroma/pleroma!2393
2020-04-20 13:01:17 +00:00
Egor Kislitsyn 163341857a
Improve OpenAPI errors 2020-04-17 19:27:22 +04:00
Haelwenn a17bfb5fab Merge branch 'feature/1584-client-captcha-options' into 'develop'
Creating trusted app from adminFE & mix task

Closes #1584

See merge request pleroma/pleroma!2252
2020-04-17 09:19:35 +00:00
Egor Kislitsyn cf4ebba774
Cleanup SubscriptionController 2020-04-15 23:14:47 +04:00
Maksim Pechnikov 4b3b1fec4e added an endpoint for getting unread notification count 2020-04-15 21:19:43 +03:00
Ivan Tashkinov bedf92e064 Merge remote-tracking branch 'remotes/origin/develop' into authenticated-api-oauth-check-enforcement 2020-04-15 19:20:34 +03:00
lain 4576520461 Revert "Merge branch 'issue/1276' into 'develop'"
This reverts merge request !1877
2020-04-14 16:32:22 +00:00
Egor Kislitsyn 247e6fcb90
Merge branch 'develop' into openapi/account 2020-04-14 19:45:22 +04:00
Haelwenn 60cc7d6c9a Merge branch 'issue/1276' into 'develop'
[#1276] An endpoint for getting unread notification count

Closes #1276

See merge request pleroma/pleroma!1877
2020-04-14 06:38:56 +00:00
Egor Kislitsyn 4dca712e90
Add OpenAPI spec for DomainBlockController 2020-04-13 22:44:52 +04:00