Ivan Tashkinov
|
10ff01acd9
|
[#1304] Moved all non-mutes / non-blocks fields from User.Info to User. WIP.
|
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
|
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
|
0c6009dd2e
|
Extract mascot actions from `MastodonAPIController` to MascotController
|
5 years ago |
|
Egor Kislitsyn
|
3c5ecb70b4
|
Add PleromaAPI.AccountController
|
5 years ago |
|
Ariadne Conill
|
1d7cbdaf7b
|
change new scrobble endpoint
|
5 years ago |
|
Ariadne Conill
|
e653edd182
|
split scrobble functions into their own controller
|
5 years ago |
|
Ariadne Conill
|
a6e1469767
|
router: change scrobble timeline route from now-playing to scrobbles
|
5 years ago |
|
Ariadne Conill
|
7cad6ea67a
|
pleroma api: hook up scrobbler controller
|
5 years ago |
|
rinpatch
|
e9d1aa75d5
|
Revert subscription refactoring.
As discussed in pleroma-meta#2
This reverts commit eb9aa7aa10, reversing
changes made to c4fbb56984.
|
5 years ago |
|
Roman Chvanikov
|
b4b147000c
|
Merge develop
|
5 years ago |
|
Ekaterina Vaartis
|
118d6dcdf4
|
Fix nodeinfo handling
|
5 years ago |
|
Ekaterina Vaartis
|
ba9d35a904
|
Add an API endpoint for listing remote packs
|
5 years ago |
|
vaartis
|
a6e85215e1
|
Credo fix (remove parens on function definition)
|
5 years ago |
|
vaartis
|
f21dbbc021
|
Move emoji_dir_path & cache_seconds_per_file
|
5 years ago |
|
Ekaterina Vaartis
|
cdbe7cd37a
|
When listing emoji packs, be sure to create the directory
|
5 years ago |
|
Maksim Pechnikov
|
1a858134ed
|
Merge branch 'develop' into issue/1218
|
5 years ago |
|
Ekaterina Vaartis
|
e63f167f01
|
Also pretty print pack.json
|
5 years ago |
|
rinpatch
|
6b3d5ed6db
|
Emoji API Controller: Follow phoenix directory structure
|
5 years ago |
|
Roman Chvanikov
|
9fa2586abd
|
Refactor SubscriptionNotificationView
|
5 years ago |
|
Roman Chvanikov
|
e9f69a3eb7
|
Move pleroma_api controllers into controllers sub-folders
|
5 years ago |
