feld
|
b3e9c87724
|
Update emoji_api_controller.ex
|
2020-01-30 14:09:41 +00:00 |
|
Alexander Strizhakov
|
e7fee0d6fa
|
emoji api error on not writable dir
|
2020-01-29 15:31:34 +03:00 |
|
lain
|
b3a877d6c9
|
Emoji Reactions: Correctly handle deleted users
|
2020-01-29 11:43:36 +01:00 |
|
lain
|
a802e07241
|
Emoji Reactions: Add reacted field to emoji reactions
|
2020-01-29 11:39:06 +01:00 |
|
lain
|
347f3ed2c6
|
Emoji reactions: Change api format once more
|
2020-01-24 10:52:24 +01:00 |
|
lain
|
dd3fc50ea4
|
Emoji reactions: Change cache and reply format
|
2020-01-22 13:57:42 +01:00 |
|
lain
|
5fddf988ea
|
Pleroma API: emoji_reactions_by does not need authorization
|
2020-01-20 13:05:35 +01:00 |
|
Ivan Tashkinov
|
7973cbdb9f
|
OAuthScopesPlug: disallowed nil token (unless with :fallback option). WIP: controller tests modification: OAuth scopes usage.
|
2019-12-15 22:32:42 +03:00 |
|
Ivan Tashkinov
|
835ac2157c
|
Merge remote-tracking branch 'remotes/upstream/develop' into 1427-oauth-admin-scopes
# Conflicts:
# CHANGELOG.md
|
2019-12-10 08:55:14 +03:00 |
|
Ivan Tashkinov
|
40e1817f70
|
[#1427] Fixes / improvements of admin scopes support. Added tests.
|
2019-12-06 20:33:47 +03:00 |
|
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).
|
2019-12-06 00:25:44 +03:00 |
|
Ivan Tashkinov
|
51111e286b
|
[#1427] Initial support for OAuth admin scopes.
|
2019-11-29 18:57:19 +03:00 |
|
Ivan Tashkinov
|
de892d2fe1
|
[#1335] Reorganized users.subscribers as UserRelationship. Added tests for UserRelationship-related functionality.
|
2019-11-20 15:46:11 +03:00 |
|
rinpatch
|
6085c71bd1
|
Merge branch 'reactions' into 'develop'
Emoji Reactions
See merge request pleroma/pleroma!1662
|
2019-11-14 08:47:10 +00:00 |
|
Steven Fuchs
|
94627baa5c
|
New rate limiter
|
2019-11-11 12:13:06 +00:00 |
|
lain
|
b22ee9d966
|
Merge remote-tracking branch 'origin/develop' into reactions
|
2019-11-08 13:27:11 +01:00 |
|
lain
|
2480200759
|
Merge branch 'refactor/following-relationships' into 'develop'
Move following relationships to a separate table
Closes #1233
See merge request pleroma/pleroma!1814
|
2019-10-28 07:27:45 +00:00 |
|
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`.
|
2019-10-26 02:29:18 +03:00 |
|
Egor Kislitsyn
|
4c1dd55c48
|
Merge remote-tracking branch 'upstream/develop' into refactor/following-relationships
|
2019-10-24 14:55:36 +07:00 |
|
Egor Kislitsyn
|
4ea1a61b00
|
Merge branch 'develop' into refactor/following-relationships
|
2019-10-21 14:19:15 +07:00 |
|
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
|
2019-10-20 20:43:18 +03:00 |
|
eugenijm
|
52ed2f8f2d
|
Pleroma API: POST /api/v1/pleroma/conversations/read to mark all user's conversations as read
|
2019-10-19 15:24:06 +03:00 |
|
Ivan Tashkinov
|
10ff01acd9
|
[#1304] Moved all non-mutes / non-blocks fields from User.Info to User. WIP.
|
2019-10-16 21:59:21 +03:00 |
|
Egor Kislitsyn
|
059005ff82
|
Replace user.following with Pleroma.FollowingRelationship
|
2019-10-11 02:35:32 +07:00 |
|
lain
|
d580eedfe9
|
Linting.
|
2019-10-07 12:40:33 +02:00 |
|
lain
|
73b6512907
|
Merge remote-tracking branch 'origin/develop' into reactions
|
2019-10-07 12:30:59 +02:00 |
|
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
|
2019-10-06 17:12:17 +03:00 |
|
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
|
2019-10-02 20:42:40 +03:00 |
|
lain
|
4cb603e1df
|
PleromaAPI: Add unreacting.
|
2019-10-02 18:19:16 +02:00 |
|
lain
|
391c736292
|
PleromaAPI: Fix emoji_reactions_by
|
2019-10-02 18:13:10 +02:00 |
|
lain
|
557223b2b5
|
Merge remote-tracking branch 'origin/develop' into reactions
|
2019-10-02 13:27:55 +02:00 |
|
lain
|
6068d2254e
|
PleromaAPIController: Fixes and refactoring.
|
2019-09-30 15:13:25 +02:00 |
|
Egor Kislitsyn
|
0c6009dd2e
|
Extract mascot actions from MastodonAPIController to MascotController
|
2019-09-30 19:32:43 +07:00 |
|
Egor Kislitsyn
|
3c5ecb70b4
|
Add PleromaAPI.AccountController
|
2019-09-30 19:10:55 +07:00 |
|
lain
|
b923842e96
|
Merge remote-tracking branch 'origin/develop' into reactions
|
2019-09-30 13:57:54 +02:00 |
|
Ariadne Conill
|
1d7cbdaf7b
|
change new scrobble endpoint
|
2019-09-30 10:39:48 +00:00 |
|
Ariadne Conill
|
e653edd182
|
split scrobble functions into their own controller
|
2019-09-30 10:39:48 +00:00 |
|
Ariadne Conill
|
a6e1469767
|
router: change scrobble timeline route from now-playing to scrobbles
|
2019-09-30 10:39:48 +00:00 |
|
Ariadne Conill
|
7cad6ea67a
|
pleroma api: hook up scrobbler controller
|
2019-09-30 10:39:17 +00:00 |
|
rinpatch
|
e9d1aa75d5
|
Revert subscription refactoring.
As discussed in pleroma-meta#2
This reverts commit eb9aa7aa10, reversing
changes made to c4fbb56984.
|
2019-09-29 18:43:27 +03:00 |
|
Egor Kislitsyn
|
6c7c35dbe1
|
Fix SubscriptionNotificationView
|
2019-09-27 11:55:47 +07:00 |
|
Roman Chvanikov
|
b4b147000c
|
Merge develop
|
2019-09-26 10:38:54 +03:00 |
|
Ekaterina Vaartis
|
118d6dcdf4
|
Fix nodeinfo handling
|
2019-09-25 12:32:19 +02:00 |
|
Ekaterina Vaartis
|
ba9d35a904
|
Add an API endpoint for listing remote packs
|
2019-09-25 12:32:19 +02:00 |
|
vaartis
|
a6e85215e1
|
Credo fix (remove parens on function definition)
|
2019-09-25 12:32:19 +02:00 |
|
vaartis
|
f21dbbc021
|
Move emoji_dir_path & cache_seconds_per_file
|
2019-09-25 12:32:19 +02:00 |
|
Ekaterina Vaartis
|
cdbe7cd37a
|
When listing emoji packs, be sure to create the directory
|
2019-09-25 12:32:19 +02:00 |
|
Maksim Pechnikov
|
1a858134ed
|
Merge branch 'develop' into issue/1218
|
2019-09-25 12:24:12 +03:00 |
|
Ekaterina Vaartis
|
e63f167f01
|
Also pretty print pack.json
|
2019-09-24 00:37:27 +03:00 |
|
rinpatch
|
6b3d5ed6db
|
Emoji API Controller: Follow phoenix directory structure
|
2019-09-23 21:14:51 +03:00 |
|
Ekaterina Vaartis
|
b585134c90
|
Get the nodeinfo address from the well-known
|
2019-09-19 00:16:34 +03:00 |
|
Ekaterina Vaartis
|
a1325d5fd9
|
Change path from nodeinfo to metadata->features
|
2019-09-19 00:16:34 +03:00 |
|
Ekaterina Vaartis
|
d51e5e447e
|
Move emoji reloading to admin api
|
2019-09-19 00:16:33 +03:00 |
|
Ekaterina Vaartis
|
7680aec17d
|
Move emoji api to pleroma api dir
|
2019-09-19 00:16:33 +03:00 |
|
Roman Chvanikov
|
9fa2586abd
|
Refactor SubscriptionNotificationView
|
2019-09-17 17:44:10 +03:00 |
|
Roman Chvanikov
|
e9f69a3eb7
|
Move pleroma_api controllers into controllers sub-folders
|
2019-09-17 16:52:23 +03:00 |
|
Roman Chvanikov
|
7d1773bc6b
|
Rename SubscriptionNotificationController list and get actions to index and show
|
2019-09-17 16:48:24 +03:00 |
|
Roman Chvanikov
|
a76168e743
|
Cleanup PleromaAPIController
|
2019-09-17 16:44:54 +03:00 |
|
Roman Chvanikov
|
f9be517c7f
|
Apply suggestion to lib/pleroma/web/pleroma_api/subscription_notification_controller.ex
|
2019-09-17 13:42:40 +00:00 |
|
Roman Chvanikov
|
c0f776faec
|
Apply suggestion to lib/pleroma/web/pleroma_api/subscription_notification_controller.ex
|
2019-09-17 13:42:36 +00:00 |
|
Roman Chvanikov
|
2688b876ab
|
Apply suggestion to lib/pleroma/web/pleroma_api/subscription_notification_controller.ex
|
2019-09-17 13:42:28 +00:00 |
|
Roman Chvanikov
|
6042e21b25
|
Move subscription notifications to a separate controller
|
2019-09-16 21:59:49 +03:00 |
|
Ivan Tashkinov
|
efbc2edba1
|
[#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
# Conflicts:
# lib/pleroma/web/activity_pub/activity_pub_controller.ex
# lib/pleroma/web/router.ex
|
2019-09-15 18:52:27 +03:00 |
|
Ivan Tashkinov
|
e6f43a831b
|
[#1234] Permissions-related fixes / new functionality (Masto 2.4.3 scopes).
|
2019-09-15 18:22:08 +03:00 |
|
Roman Chvanikov
|
d7457c9165
|
Merge branch 'develop' into refactor/subscription
|
2019-09-14 18:29:51 +03:00 |
|
Roman Chvanikov
|
0bd2b85edb
|
Separate Subscription Notifications from regular Notifications
|
2019-09-13 18:25:27 +03:00 |
|
lain
|
3ff5532220
|
Linting.
|
2019-09-13 16:41:30 +02:00 |
|
lain
|
a7f31bf06c
|
Merge remote-tracking branch 'origin/develop' into reactions
|
2019-09-13 16:31:27 +02:00 |
|
lain
|
05e9776517
|
PleromaAPIController: Add endpoint to fetch emoji reactions.
|
2019-09-12 18:48:25 +02:00 |
|
Egor Kislitsyn
|
40b3289c26
|
Refactor add_link_headers/7 -> add_link_headers/3
|
2019-09-06 17:08:47 +07:00 |
|
lain
|
99ea990a16
|
PleromaAPIController: Add emoji reactions.
|
2019-09-04 12:20:35 -05:00 |
|
rinpatch
|
c2b6c1b089
|
Extend /api/pleroma/notifications/read to mark multiple notifications
as read and make it respond with Mastoapi entities
|
2019-09-04 12:38:27 +03:00 |
|
lain
|
d3af9e19ed
|
Conversations: Load relations in one query.
|
2019-08-14 17:01:11 +02:00 |
|
lain
|
f73212b2a3
|
Conversation: Render new participation on update.
|
2019-08-14 15:56:15 +02:00 |
|
lain
|
511ccea5aa
|
ConversationView: Align parameter names with other views.
|
2019-08-12 14:23:06 +02:00 |
|
lain
|
60231ec7bd
|
Conversation: Add endpoint to get a conversation by id.
|
2019-08-12 13:58:04 +02:00 |
|
lain
|
d6fe220e32
|
Linting.
|
2019-08-05 16:11:23 +02:00 |
|
lain
|
3af6d14da7
|
Pleroma Conversations API: Add a way to set recipients.
|
2019-08-05 15:09:19 +02:00 |
|
lain
|
eee98aaa73
|
Pleroma API: Add endpoint to get conversation statuses.
|
2019-08-02 19:53:08 +02:00 |
|