lain
|
0c491b904d
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
2020-04-29 13:19:04 +02:00 |
|
Ivan Tashkinov
|
908cf22a6c
|
Merge remote-tracking branch 'remotes/origin/develop' into automatic-authentication-and-instance-publicity-checks
# Conflicts:
# lib/pleroma/web/mastodon_api/controllers/account_controller.ex
|
2020-04-28 19:56:20 +03:00 |
|
lain
|
b5dc59c8fa
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
2020-04-28 14:16:21 +02: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 |
|
Egor Kislitsyn
|
f1ca917bb0
|
Merge branch 'develop' into openapi/account
|
2020-04-27 14:33:00 +04:00 |
|
lain
|
c86143ed73
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
2020-04-27 12:07:08 +02:00 |
|
Ivan Tashkinov
|
00e62161f6
|
[#2409] Tested all auth setup configs in AuthTestControllerTest. Adjusted :skip_plug definitions for some endpoints.
|
2020-04-24 16:52:38 +03:00 |
|
Egor Kislitsyn
|
f362836742
|
Support validation for inline OpenAPI schema and automatic tests for examples
|
2020-04-24 15:16:15 +04:00 |
|
lain
|
ec7335535d
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
2020-04-23 15:47:08 +02: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 |
|
Haelwenn
|
468cc977be
|
Merge branch 'bugfix/following-fix-status-code' into 'develop'
AccountController: Use code 400 for self-follow.
Closes #1674
See merge request pleroma/pleroma!2413
|
2020-04-22 15:33:04 +00: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
|
5102468d0f
|
Polls: Persist and show voters' count
|
2020-04-22 14:06:39 +02:00 |
|
lain
|
a185b5455f
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
2020-04-21 14:24:27 +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 |
|
lain
|
5165287ff4
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
2020-04-21 12:00:33 +02: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 |
|
lain
|
c845820911
|
Notifications: Create a chat notification.
|
2020-04-17 16:55:01 +02:00 |
|
lain
|
8c2c325598
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
2020-04-17 15:51:24 +02: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 |
|
rinpatch
|
badd888ccb
|
Merge branch 'authenticated-api-oauth-check-enforcement' into 'develop'
Enforcement of OAuth scopes check for authenticated API endpoints
See merge request pleroma/pleroma!2349
|
2020-04-16 21:58:57 +00:00 |
|
rinpatch
|
942d7467ca
|
Merge branch 'develop' into features/remove-user-source_data
|
2020-04-16 21:28:52 +03:00 |
|
lain
|
ca598e9c27
|
AccountView: Return user ap_id.
|
2020-04-16 15:27:35 +02:00 |
|
Egor Kislitsyn
|
cf4ebba774
|
Cleanup SubscriptionController
|
2020-04-15 23:14:47 +04:00 |
|
lain
|
6ace22b56a
|
Chat: Add views, don't return them in timeline queries.
|
2020-04-15 18:23:16 +02: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 |
|
Maksim Pechnikov
|
a16b3dbcbf
|
Merge branch 'develop' into issue/1276
|
2020-04-13 21:19:27 +03:00 |
|
Egor Kislitsyn
|
c28aaf9d82
|
Add OpenAPI spec for CustomEmojiController
|
2020-04-13 21:21:04 +04:00 |
|
Egor Kislitsyn
|
7e0b42d99f
|
Add specs for AccountController.mutes, AccountController.blocks, AccountController.mutes, AccountController.endorsements
|
2020-04-13 18:17:09 +04:00 |
|
Egor Kislitsyn
|
ab185d3ea4
|
Add spec for AccountController.follows
|
2020-04-13 18:17:09 +04:00 |
|
Egor Kislitsyn
|
68a979b824
|
Add specs for AccountController.block and AccountController.unblock
|
2020-04-13 18:17:08 +04:00 |
|
Egor Kislitsyn
|
e4195d4a68
|
Add specs for AccountController.mute and AccountController.unmute
|
2020-04-13 18:17:08 +04:00 |
|
Egor Kislitsyn
|
aa958a6dda
|
Add spec for AccountController.unfollow
|
2020-04-13 18:17:08 +04:00 |
|
Egor Kislitsyn
|
854780c72b
|
Add spec for AccountController.follow
|
2020-04-13 18:17:08 +04:00 |
|
Egor Kislitsyn
|
1b680a98ae
|
Add spec for AccountController.lists
|
2020-04-13 18:17:07 +04:00 |
|
Egor Kislitsyn
|
e105cc12b6
|
Add spec for AccountController.following
|
2020-04-13 18:17:07 +04:00 |
|
Egor Kislitsyn
|
bd6e2b300f
|
Add spec for AccountController.followers
|
2020-04-13 18:17:07 +04:00 |
|
Egor Kislitsyn
|
03124c96cc
|
Add spec for AccountController.statuses
|
2020-04-13 18:17:07 +04:00 |
|
Egor Kislitsyn
|
d7d6a83233
|
Add spec for AccountController.relationships
|
2020-04-13 18:16:07 +04:00 |
|
Egor Kislitsyn
|
ab400b2ddb
|
Add specs for ActorType and VisibilityScope
|
2020-04-13 18:16:07 +04:00 |
|
Egor Kislitsyn
|
260cbddc94
|
Add spec for AccountController.update_credentials
|
2020-04-13 18:16:07 +04:00 |
|