Maksim Pechnikov
|
67cb46e15d
|
Merge branch 'develop' into issue/1383
|
5 years ago |
|
Maksim Pechnikov
|
652cc6ba4b
|
updated ScheduledActivity
|
5 years ago |
|
Maksim Pechnikov
|
0937895182
|
updated fetch_favorites
|
5 years ago |
|
Maksim Pechnikov
|
9da4c88b49
|
fix test
|
5 years ago |
|
Maksim Pechnikov
|
4beb3ce5c5
|
/api/v1/favourites: added sorting for activites by adds to favorites
|
5 years ago |
|
Steven Fuchs
|
94627baa5c
|
New rate limiter
|
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 |
|
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 |
|
Thibaut Girka
|
427d0c2a00
|
Store private announcements in object.data["announcements"], filter them on display
|
5 years ago |
|
Thibaut Girka
|
4c1f158f5d
|
Allow users to announce privately, including own private notes
|
5 years ago |
|
Egor Kislitsyn
|
36a34c36fe
|
Extract poll actions from `MastodonAPIController` to `PollController`
|
5 years ago |
|
Egor Kislitsyn
|
e7aef27c00
|
Fix merge
|
5 years ago |
|
Maksim Pechnikov
|
1053319cd6
|
Merge branch 'develop' into tests/mastodon_api_controller.ex
|
5 years ago |
|
Haelwenn (lanodan) Monnier
|
9202904da9
|
status_controller.ex: Posting media status without content defined
|
5 years ago |
|
Egor Kislitsyn
|
5ea5c58a85
|
Move view logic from StatusController.context to StatusView and add a test
|
5 years ago |
|
Egor Kislitsyn
|
98d1347a4e
|
Extract status actions from `MastodonAPIController` into `StatusController`
|
5 years ago |
