Ivan Tashkinov
|
6fd4f58ead
|
Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
|
4 years ago |
Haelwenn
|
94ba5a7802
|
Merge branch 'exposed-background-image' into 'develop'
InstanceView: Expose background image link.
See merge request pleroma/pleroma!2545
|
4 years ago |
Egor Kislitsyn
|
6609714d66
|
Move Scrobble views to ScrobbleView
|
4 years ago |
lain
|
188b32145e
|
InstanceView: Expose background image link.
This will make it easier for more clients to support this feature.
|
4 years ago |
Ivan Tashkinov
|
e4b12494d7
|
Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
# Conflicts:
# mix.lock
|
4 years ago |
Ivan Tashkinov
|
fd2fb2bb2e
|
Merge remote-tracking branch 'remotes/origin/develop' into restricted-relations-embedding
# Conflicts:
# lib/pleroma/web/mastodon_api/controllers/status_controller.ex
# lib/pleroma/web/mastodon_api/controllers/timeline_controller.ex
# test/web/mastodon_api/controllers/timeline_controller_test.exs
# test/web/mastodon_api/views/status_view_test.exs
|
4 years ago |
Egor Kislitsyn
|
7803a85d2c
|
Add OpenAPI spec for StatusController
|
4 years ago |
Ivan Tashkinov
|
63a1a82f38
|
[#2456] Added support for `embed_relationships` param, nailed down endpoints which should support it. Fixed :source_mutes relationships subset fetching.
|
4 years ago |
Ivan Tashkinov
|
aee88d11be
|
[#2456] Removed support for embedded relationships in account view.
|
4 years ago |
Ivan Tashkinov
|
ac4250a18c
|
[#2456] Clarified `skip_relationships` option (and its default of `false`) for MastodonAPI.AccountView.
|
4 years ago |
Ivan Tashkinov
|
14a49a0483
|
[#2456] Dropped support for embedded `pleroma/account/relationship` in statuses and notifications.
|
4 years ago |
Ivan Tashkinov
|
bbdad85568
|
Initial implementation of image preview proxy. Media proxy tests refactoring.
|
4 years ago |
Ivan Tashkinov
|
b2924ab1fb
|
Merge remote-tracking branch 'remotes/origin/develop' into restricted-relations-embedding
|
4 years ago |
Maksim Pechnikov
|
4d71c4b805
|
fixed 'source' object in verify_credentials
|
4 years ago |
Maksim Pechnikov
|
bd261309cc
|
added `unread_notifications_count` for `/api/v1/accounts/verify_credentials`
|
4 years ago |
Maksim Pechnikov
|
8b97b6f5ba
|
Merge branch 'develop' into issue/1276-2
|
4 years ago |
lain
|
61ea8f1f5a
|
Merge branch 'openapi/markers' into 'develop'
Add OpenAPI spec for MarkerController
See merge request pleroma/pleroma!2386
|
4 years ago |
Egor Kislitsyn
|
46aae346f8
|
Move single used schemas to Filter operation schema
|
4 years ago |
Egor Kislitsyn
|
7e7a3e1544
|
Add OpenAPI spec for FilterController
|
4 years ago |
Egor Kislitsyn
|
babcae7130
|
Move single used schemas to Marker operation schema
|
4 years ago |
Maksim Pechnikov
|
fe7a0d660e
|
Merge branch 'develop' into issue/1276-2
|
4 years ago |
rinpatch
|
3126f8a334
|
Merge branch 'feature/1710-consolidate-instance-info' into 'develop'
Feature/1710 consolidate instance info
Closes #1710
See merge request pleroma/pleroma!2430
|
4 years ago |
Ivan Tashkinov
|
d5cdc907e3
|
Restricted embedding of relationships where applicable (statuses / notifications / accounts rendering).
Added support for :skip_notifications for accounts listing (index.json).
Adjusted tests.
|
4 years ago |
Maksim Pechnikov
|
a92c713d9c
|
Merge branch 'develop' into issue/1276-2
|
4 years ago |
lain
|
3635a9c9c2
|
InstanceController: Add extensions to `/api/v1/instance`
|
4 years ago |
Egor Kislitsyn
|
f1ca917bb0
|
Merge branch 'develop' into openapi/account
|
4 years ago |
Ivan Tashkinov
|
e16437ff19
|
[#1706] Formatting fix.
|
4 years ago |
Ivan Tashkinov
|
0d05e1fe39
|
[#1706] Prevented error on unresolved activity actors for timeline actions.
|
4 years ago |
Egor Kislitsyn
|
6c26feed01
|
Merge branch 'develop' into openapi/account
|
4 years ago |
lain
|
5102468d0f
|
Polls: Persist and show voters' count
|
4 years ago |
Egor Kislitsyn
|
736fead494
|
Merge branch 'develop' into openapi/account
|
4 years ago |
lain
|
28165dad3a
|
Merge branch 'cleanup-subscription-controller' into 'develop'
Cleanup SubscriptionController
See merge request pleroma/pleroma!2393
|
4 years ago |
Ivan Tashkinov
|
6e6f95c6ae
|
Merge remote-tracking branch 'remotes/origin/develop' into 1559-follow-request-notifications
# Conflicts:
# CHANGELOG.md
|
5 years ago |
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
|
5 years ago |
rinpatch
|
942d7467ca
|
Merge branch 'develop' into features/remove-user-source_data
|
5 years ago |
Egor Kislitsyn
|
cf4ebba774
|
Cleanup SubscriptionController
|
5 years ago |
Maksim Pechnikov
|
4b3b1fec4e
|
added an endpoint for getting unread notification count
|
5 years ago |
lain
|
4576520461
|
Revert "Merge branch 'issue/1276' into 'develop'"
This reverts merge request !1877
|
5 years ago |
Egor Kislitsyn
|
247e6fcb90
|
Merge branch 'develop' into openapi/account
|
5 years ago |
Maksim Pechnikov
|
a16b3dbcbf
|
Merge branch 'develop' into issue/1276
|
5 years ago |
Egor Kislitsyn
|
03124c96cc
|
Add spec for AccountController.statuses
|
5 years ago |
Ivan Tashkinov
|
a21baf89d8
|
Merge remote-tracking branch 'remotes/origin/develop' into output-of-relationships-in-statuses
|
5 years ago |
rinpatch
|
5e365448f3
|
Merge branch 'following-relationships-optimizations' into 'develop'
FollowingRelationship storage & performance optimizations
See merge request pleroma/pleroma!2332
|
5 years ago |
Haelwenn (lanodan) Monnier
|
9172d719cc
|
profile emojis in User.emoji instead of source_data
|
5 years ago |
Ivan Tashkinov
|
ac672a9d6b
|
[#1559] Addressed code review requests.
|
5 years ago |
Ivan Tashkinov
|
1a4875adfa
|
[#1559] Support for "follow_request" notifications (configurable).
(Not currently supported by PleromaFE, thus disabled by default).
|
5 years ago |
Maksim Pechnikov
|
2b7d7bbd2d
|
Merge branch 'develop' into issue/1276
|
5 years ago |
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
|
5 years ago |
Ivan Tashkinov
|
aa78325117
|
[#2323] Fixed a typo causing /accounts/relationships to render default relationships. Improved the tests.
|
5 years ago |
Maksim Pechnikov
|
dbcfac11b4
|
Merge branch 'develop' into issue/1276
|
5 years ago |