Ivan Tashkinov
|
835ac2157c
|
Merge remote-tracking branch 'remotes/upstream/develop' into 1427-oauth-admin-scopes
# Conflicts:
# CHANGELOG.md
|
5 years ago |
Ivan Tashkinov
|
40e1817f70
|
[#1427] Fixes / improvements of admin scopes support. Added tests.
|
5 years ago |
Ivan Tashkinov
|
af42c00cff
|
[#1427] Reworked admin scopes support.
Requalified users.is_admin flag as legacy accessor to admin actions in case token lacks admin scope(s).
|
5 years ago |
Ivan Tashkinov
|
51111e286b
|
[#1427] Initial support for OAuth admin scopes.
|
5 years ago |
Ivan Tashkinov
|
de892d2fe1
|
[#1335] Reorganized users.subscribers as UserRelationship. Added tests for UserRelationship-related functionality.
|
5 years ago |
rinpatch
|
6085c71bd1
|
Merge branch 'reactions' into 'develop'
Emoji Reactions
See merge request pleroma/pleroma!1662
|
5 years ago |
Steven Fuchs
|
94627baa5c
|
New rate limiter
|
5 years ago |
lain
|
b22ee9d966
|
Merge remote-tracking branch 'origin/develop' into reactions
|
5 years ago |
lain
|
2480200759
|
Merge branch 'refactor/following-relationships' into 'develop'
Move following relationships to a separate table
Closes #1233
See merge request pleroma/pleroma!1814
|
5 years ago |
eugenijm
|
0580654485
|
Mark the conversations with the blocked user as read and update the blocking user's `unread_conversation_count`.
Since the conversations with the blocked user are invisible, they are excluded
from the blocking user's `unread_conversation_count`.
|
5 years ago |
Egor Kislitsyn
|
4c1dd55c48
|
Merge remote-tracking branch 'upstream/develop' into refactor/following-relationships
|
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 |
eugenijm
|
52ed2f8f2d
|
Pleroma API: `POST /api/v1/pleroma/conversations/read` to mark all user's conversations as read
|
5 years ago |
Ivan Tashkinov
|
10ff01acd9
|
[#1304] Moved all non-mutes / non-blocks fields from User.Info to User. WIP.
|
5 years ago |
Egor Kislitsyn
|
059005ff82
|
Replace `user.following` with Pleroma.FollowingRelationship
|
5 years ago |
lain
|
d580eedfe9
|
Linting.
|
5 years ago |
lain
|
73b6512907
|
Merge remote-tracking branch 'origin/develop' into reactions
|
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 |
lain
|
4cb603e1df
|
PleromaAPI: Add unreacting.
|
5 years ago |
lain
|
391c736292
|
PleromaAPI: Fix emoji_reactions_by
|
5 years ago |
lain
|
557223b2b5
|
Merge remote-tracking branch 'origin/develop' into reactions
|
5 years ago |
lain
|
6068d2254e
|
PleromaAPIController: Fixes and refactoring.
|
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 |
lain
|
b923842e96
|
Merge remote-tracking branch 'origin/develop' into reactions
|
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 |
Egor Kislitsyn
|
6c7c35dbe1
|
Fix SubscriptionNotificationView
|
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 |
Ekaterina Vaartis
|
b585134c90
|
Get the nodeinfo address from the well-known
|
5 years ago |
Ekaterina Vaartis
|
a1325d5fd9
|
Change path from nodeinfo to metadata->features
|
5 years ago |
Ekaterina Vaartis
|
d51e5e447e
|
Move emoji reloading to admin api
|
5 years ago |
Ekaterina Vaartis
|
7680aec17d
|
Move emoji api to pleroma api dir
|
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 |
Roman Chvanikov
|
7d1773bc6b
|
Rename SubscriptionNotificationController list and get actions to index and show
|
5 years ago |
Roman Chvanikov
|
a76168e743
|
Cleanup PleromaAPIController
|
5 years ago |