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 |
|
lain
|
139b9d1338
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
2020-04-20 12:37:17 +02:00 |
|
lain
|
970b74383b
|
Credo fixes.
|
2020-04-20 12:29:19 +02: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 |
|
Ivan Tashkinov
|
6e6f95c6ae
|
Merge remote-tracking branch 'remotes/origin/develop' into 1559-follow-request-notifications
# Conflicts:
# CHANGELOG.md
|
2020-04-17 16:23:58 +03: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 |
|
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 |
|
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
|
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 |
|
rinpatch
|
5e365448f3
|
Merge branch 'following-relationships-optimizations' into 'develop'
FollowingRelationship storage & performance optimizations
See merge request pleroma/pleroma!2332
|
2020-04-11 19:46:04 +00: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 |
|
Ivan Tashkinov
|
ac672a9d6b
|
[#1559] Addressed code review requests.
|
2020-04-09 15:13:37 +03: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 |
|
Ivan Tashkinov
|
1a4875adfa
|
[#1559] Support for "follow_request" notifications (configurable).
(Not currently supported by PleromaFE, thus disabled by default).
|
2020-04-07 21:52:32 +03:00 |
|
Maksim Pechnikov
|
2b7d7bbd2d
|
Merge branch 'develop' into issue/1276
|
2020-04-07 14:09:43 +03: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 |
|
Ivan Tashkinov
|
3fa51f7272
|
Merge remote-tracking branch 'remotes/origin/2323-accounts-relationships-hotfix' into output-of-relationships-in-statuses
# Conflicts:
# lib/pleroma/web/mastodon_api/views/account_view.ex
# lib/pleroma/web/mastodon_api/views/status_view.ex
|
2020-04-02 19:38:39 +03:00 |
|
Ivan Tashkinov
|
aa78325117
|
[#2323] Fixed a typo causing /accounts/relationships to render default relationships. Improved the tests.
|
2020-04-02 19:23:30 +03:00 |
|
Maksim Pechnikov
|
dbcfac11b4
|
Merge branch 'develop' into issue/1276
|
2020-04-02 14:47:17 +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 |
|
Haelwenn (lanodan) Monnier
|
185520d1b4
|
Provide known-good user.uri, remove User.profile_url/1
|
2020-03-31 23:55:29 +02:00 |
|