Egor Kislitsyn
|
f1ca917bb0
|
Merge branch 'develop' into openapi/account
|
2020-04-27 14:33:00 +04:00 |
|
lain
|
d89cd0a197
|
Reply Filtering: Refactor.
|
2020-04-24 18:25:26 +02:00 |
|
Alexander
|
6e625a427c
|
reply filtering
|
2020-04-24 15:43:49 +03: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 |
|
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 |
|
Egor Kislitsyn
|
cf4ebba774
|
Cleanup SubscriptionController
|
2020-04-15 23:14:47 +04: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 |
|
Egor Kislitsyn
|
247e6fcb90
|
Merge branch 'develop' into openapi/account
|
2020-04-14 19:45:22 +04:00 |
|
Egor Kislitsyn
|
4dca712e90
|
Add OpenAPI spec for DomainBlockController
|
2020-04-13 22:44:52 +04: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
|
278b3fa0ad
|
Add spec for AccountController.show
|
2020-04-13 18:16:07 +04:00 |
|
Egor Kislitsyn
|
d7d6a83233
|
Add spec for AccountController.relationships
|
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 |
|
Egor Kislitsyn
|
b08ded6c2f
|
Add spec for AccountController.create
|
2020-04-13 17:38:59 +04:00 |
|
Ivan Tashkinov
|
a21baf89d8
|
Merge remote-tracking branch 'remotes/origin/develop' into output-of-relationships-in-statuses
|
2020-04-13 09:16:51 +03:00 |
|
Haelwenn (lanodan) Monnier
|
9172d719cc
|
profile emojis in User.emoji instead of source_data
|
2020-04-10 06:20:02 +02:00 |
|
Egor Kislitsyn
|
d545b883eb
|
Add /api/v1/notifications/:id/dismiss endpoint
|
2020-04-09 17:08:43 +04:00 |
|
lain
|
d2e21fbc96
|
Merge branch 'open-api' into 'develop'
Add OpenAPI
Closes pleroma-meta#19
See merge request pleroma/pleroma!2345
|
2020-04-09 09:48:56 +00:00 |
|
lain
|
349b9d86dc
|
Merge branch 'remake-remodel-2' into 'develop'
Ingestion Pipeline Revamp
See merge request pleroma/pleroma!2315
|
2020-04-06 11:59:01 +00:00 |
|
Ivan Tashkinov
|
fc81e5a49c
|
Enforcement of OAuth scopes check for authenticated API endpoints, :skip_plug plug to mark a plug explicitly skipped (disabled).
|
2020-04-06 10:20:44 +03:00 |
|
Egor Kislitsyn
|
23219e6fb3
|
Add OpenAPI
|
2020-04-01 23:13:08 +04:00 |
|
Ivan Tashkinov
|
2f2bd7fe72
|
Ability to control the output of account/pleroma/relationship in statuses in order to improve the rendering performance.
See `[:extensions, output_relationships_in_statuses_by_default]` setting and `with_relationships` param.
|
2020-04-01 19:49:09 +03:00 |
|
Ivan Tashkinov
|
012d428e1f
|
Merge remote-tracking branch 'remotes/origin/develop' into 1364-notifications-sending-control
|
2020-03-25 09:05:17 +03:00 |
|
Ivan Tashkinov
|
e743c22329
|
Fixed incorrect usage of "relations" as a short form of "relationships".
|
2020-03-25 09:04:00 +03:00 |
|
lain
|
1d75d0ed7a
|
Merge branch 'admin-api-change-password' into 'develop'
Admin API: `PATCH /api/pleroma/admin/users/:nickname/update_credentials`
See merge request pleroma/pleroma!2149
|
2020-03-24 17:34:13 +00:00 |
|
Alexander Strizhakov
|
a6ee6784bc
|
creating trusted app from adminFE & mix task
|
2020-03-23 10:44:47 +03:00 |
|
Alexander Strizhakov
|
fe15f0ba15
|
restrict_unauthenticated setting
|
2020-03-20 16:36:20 +03:00 |
|
lain
|
3c2c32b460
|
Merge branch 'remake-remodel' into develop
|
2020-03-19 18:00:55 +01:00 |
|
eugenijm
|
13cce9c0de
|
Admin API: PATCH /api/pleroma/admin/users/:nickname/credentials, GET /api/pleroma/admin/users/:nickname/credentials.
|
2020-03-16 20:42:37 +03:00 |
|
rinpatch
|
38f796a5c6
|
Merge branch 'feature/mastofe-admin-scope' into 'develop'
auth_controller.ex: Add admin scope to MastoFE
See merge request pleroma/pleroma!2256
|
2020-03-13 18:58:52 +00:00 |
|
|
|
2019f3b3ff
|
Merge branch 'fix/signup-without-email' into 'develop'
Allow account registration without an email
See merge request pleroma/pleroma!2246
|
2020-03-11 16:53:05 +00:00 |
|
lain
|
4bce13fa2f
|
MastodonController: Return 404 errors correctly.
|
2020-03-04 18:09:06 +01:00 |
|
