Egor Kislitsyn
|
4c1dd55c48
|
Merge remote-tracking branch 'upstream/develop' into refactor/following-relationships
|
5 years ago |
|
Ivan Tashkinov
|
8cc809e44e
|
Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation
# Conflicts:
# lib/pleroma/notification.ex
|
5 years ago |
|
Maksim Pechnikov
|
243719a965
|
Merge branch 'develop' into feature/masto_api_markers
|
5 years ago |
|
Egor Kislitsyn
|
4ea1a61b00
|
Merge branch 'develop' into refactor/following-relationships
|
5 years ago |
|
Ivan Tashkinov
|
c6fdfbc4f1
|
Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation
# Conflicts:
# CHANGELOG.md
# lib/pleroma/notification.ex
# lib/pleroma/user.ex
# lib/pleroma/user/info.ex
# lib/pleroma/web/activity_pub/activity_pub.ex
# lib/pleroma/web/admin_api/admin_api_controller.ex
# lib/pleroma/web/ostatus/handlers/follow_handler.ex
# lib/pleroma/web/ostatus/ostatus.ex
# lib/pleroma/web/salmon/salmon.ex
# lib/pleroma/web/websub/websub.ex
# test/web/admin_api/admin_api_controller_test.exs
# test/web/federator_test.exs
# test/web/mastodon_api/controllers/conversation_controller_test.exs
# test/web/ostatus/ostatus_controller_test.exs
# test/web/ostatus/ostatus_test.exs
# test/web/salmon/salmon_test.exs
# test/web/websub/websub_test.exs
|
5 years ago |
|
Ivan Tashkinov
|
e8843974cb
|
[#1304] Moved remaining fields from User.Info to User.
Misc. fixes / improvements.
|
5 years ago |
|
kaniini
|
7511f3d192
|
Merge branch 'fix-streaming-with-sec-websocket-protocol' into 'develop'
Fix streaming websocket handshake with `Sec-WebSocket-Protocol`
See merge request pleroma/pleroma!1847
|
5 years ago |
|
kaniini
|
733b73b71c
|
Apply suggestion to lib/pleroma/web/mastodon_api/websocket_handler.ex
|
5 years ago |
|
Maksim Pechnikov
|
66b5d0ff55
|
add Markers /api/v1/markers
|
5 years ago |
|
Ivan Tashkinov
|
10ff01acd9
|
[#1304] Moved all non-mutes / non-blocks fields from User.Info to User. WIP.
|
5 years ago |
|
kPherox
|
5bd0717de2
|
Add `Sec-WebSocket-Protocol` to response header
|
5 years ago |
|
eugenijm
|
a97b642289
|
Mastodon API: Add `exclude_visibilities` parameter to the timeline and notification endpoints
|
5 years ago |
|
Egor Kislitsyn
|
059005ff82
|
Replace `user.following` with Pleroma.FollowingRelationship
|
5 years ago |
|
eugenijm
|
580a67f5ca
|
Mastodon API: Return `pleroma.direct_conversation_id` when viewing a status (`GET /api/v1/statuses/:id`)
|
5 years ago |
|
Ivan Tashkinov
|
b93856874d
|
[#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
# Conflicts:
# CHANGELOG.md
# lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex
# lib/pleroma/web/router.ex
|
5 years ago |
|
Ivan Tashkinov
|
06b3bb54c5
|
Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
# Conflicts:
# CHANGELOG.md
# lib/pleroma/web/mastodon_api/controllers/account_controller.ex
# lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex
# lib/pleroma/web/router.ex
|
5 years ago |
|
Haelwenn
|
9e34919dcd
|
Merge branch 'fix-prameter-name-of-accounts-update-credentials' into 'develop'
Fix custom fields of accounts update credentials
See merge request pleroma/pleroma!1597
|
5 years ago |
|
kaniini
|
7a318d74e6
|
Merge branch 'split-masto-api/leftovers' into 'develop'
[#1278] Move a few more actions from MastodonAPIController
See merge request pleroma/pleroma!1761
|
5 years ago |
|
eugenijm
|
8249924485
|
Mastodon API: Add `pleroma.unread_conversation_count` to the Account entity
|
5 years ago |
|
kaniini
|
e07e9cb75e
|
Revert "Merge branch 'user-info-unread-direct-conversation' into 'develop'"
This reverts merge request !1737
|
5 years ago |
|
kaniini
|
5c04e81724
|
Merge branch 'user-info-unread-direct-conversation' into 'develop'
Add the `unread_conversation_count` field to the user info
See merge request pleroma/pleroma!1737
|
5 years ago |
|
lain
|
01da6344b9
|
Merge branch 'bugfix/notification-nil-actor' into 'develop'
notification_view.ex: Make sure `account` isn’t empty
See merge request pleroma/pleroma!1779
|
5 years ago |
|
Haelwenn (lanodan) Monnier
|
5dc14c89ce
|
notification_view.ex: Make sure `account` isn’t empty
Related: https://git.pleroma.social/pleroma/pleroma/issues/1203
|
5 years ago |
|
eugenijm
|
06d9df79c5
|
Mastodon API: Add `pleroma.unread_conversation_count` to the Account entity
|
5 years ago |
|
Ivan Tashkinov
|
64095961fe
|
[#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
# Conflicts:
# CHANGELOG.md
# lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex
# lib/pleroma/web/router.ex
|
5 years ago |
|
Egor Kislitsyn
|
e0c68eeb02
|
Move `:favourites` and `:bookmarks` actions to StatusController
|
5 years ago |
|
Egor Kislitsyn
|
7f2bc57725
|
Move `follows`, `mutes` and `blocks` actions to AccountController
|
5 years ago |
|
Egor Kislitsyn
|
d3c404af12
|
Add MastoFEController
|
5 years ago |
|
Egor Kislitsyn
|
1c6e1055c8
|
Add CustomEmojiController
|
5 years ago |
|
Egor Kislitsyn
|
c8b01f6667
|
Extract instance actions from `MastodonAPIController` to `InstanceController`
|
5 years ago |
|
kaniini
|
8557176808
|
Merge branch 'split-masto-api/auth' into 'develop'
Extract auth actions from `MastodonAPIController` to `AuthController`
See merge request pleroma/pleroma!1759
|
5 years ago |
|
kaniini
|
9b38bf4af4
|
Merge branch 'features/private-reblogs' into 'develop'
Allow receiving private self-announces over ActivityPub
See merge request pleroma/pleroma!1766
|
5 years ago |
|
feld
|
1255ec888d
|
Revert "Add upload limits to /api/v1/instance"
This reverts commit db27c0dd8b18763ff2abb124ee8d641a4580cdaa.
|
5 years ago |
|
Thibaut Girka
|
427d0c2a00
|
Store private announcements in object.data["announcements"], filter them on display
|
5 years ago |
|
Thibaut Girka
|
43e3db0951
|
Fix returned visibility of announces in MastodonAPI
|
5 years ago |
|
Thibaut Girka
|
4c1f158f5d
|
Allow users to announce privately, including own private notes
|
5 years ago |
|
Egor Kislitsyn
|
af690d1033
|
Extract auth actions from `MastodonAPIController` to `AuthController`
|
5 years ago |
|
Egor Kislitsyn
|
2dad6dd020
|
Extract apps actions from `MastodonAPIController` to `AppController`
|
5 years ago |
|
Egor Kislitsyn
|
39695c4436
|
Extract suggestions actions from `MastodonAPIController` to `SuggestionController`
|
5 years ago |
|
Egor Kislitsyn
|
585bc57edb
|
Extract media actions from `MastodonAPIController` to `MediaController`
|
5 years ago |
|
Egor Kislitsyn
|
36a34c36fe
|
Extract poll actions from `MastodonAPIController` to `PollController`
|
5 years ago |
|
kPherox
|
a0f101ee80
|
Merge remote-tracking branch 'upstream/develop' into fix-prameter-name-of-accounts-update-credentials
|
5 years ago |
|
Egor Kislitsyn
|
0c6009dd2e
|
Extract mascot actions from `MastodonAPIController` to MascotController
|
5 years ago |
|
Egor Kislitsyn
|
987e0b8be8
|
Move update_credentials to MastodonAPI.AccountController
|
5 years ago |
|
Egor Kislitsyn
|
c0ce2d5faf
|
Move account_register, relationships and verify_credentials to MastodonAPI.AccountController
|
5 years ago |
|
Egor Kislitsyn
|
3c5ecb70b4
|
Add PleromaAPI.AccountController
|
5 years ago |
|
Egor Kislitsyn
|
e7aef27c00
|
Fix merge
|
5 years ago |
|
kaniini
|
0e356cc800
|
Merge branch 'split-masto-api/reports' into 'develop'
Extract report actions from `MastodonAPIController` to `ReportController`
See merge request pleroma/pleroma!1744
|
5 years ago |
|
kaniini
|
74d8fadf37
|
Merge branch 'split-masto-api/conversations' into 'develop'
Extract conversation actions from `MastodonAPIController` to ConversationController
See merge request pleroma/pleroma!1743
|
5 years ago |
|
Egor Kislitsyn
|
b7f27a4f58
|
Extract report actions from `MastodonAPIController` to `ReportController`
Update MastodonAPI.ReportView
|
5 years ago |
