Haelwenn (lanodan) Monnier
|
6da6540036
|
Bump copyright years of files changed after 2020-01-07
Done via the following command:
git diff fcd5dd259a --stat --name-only | xargs sed -i '/Pleroma Authors/c# Copyright © 2017-2020 Pleroma Authors <https:\/\/pleroma.social\/>'
|
5 years ago |
|
lain
|
314928333a
|
Pleroma API: Add endpoint to get reaction information on a single emoji
|
5 years ago |
|
Lain Soykaf
|
4538a1ee01
|
EmojiReactions: Remove old API endpoints
|
5 years ago |
|
Lain Soykaf
|
f875b9650a
|
EmojiReactions: Add Mastodon-aligned reaction endpoints, change response
|
5 years ago |
|
feld
|
e2f2602fdc
|
Merge branch 'emoji-api-errors' into 'develop'
Emoji api error if emoji dir is not writable
Closes admin-fe#62
See merge request pleroma/pleroma!2161
|
5 years ago |
|
Alexander Strizhakov
|
e7fee0d6fa
|
emoji api error on not writable dir
|
5 years ago |
|
lain
|
b3a877d6c9
|
Emoji Reactions: Correctly handle deleted users
|
5 years ago |
|
lain
|
a802e07241
|
Emoji Reactions: Add `reacted` field to emoji reactions
|
5 years ago |
|
lain
|
347f3ed2c6
|
Emoji reactions: Change api format once more
|
5 years ago |
|
lain
|
dd3fc50ea4
|
Emoji reactions: Change cache and reply format
|
5 years ago |
|
lain
|
5fddf988ea
|
Pleroma API: `emoji_reactions_by` does not need authorization
|
5 years ago |
|
Ivan Tashkinov
|
39ce894a07
|
Merge remote-tracking branch 'remotes/origin/develop' into 1478-oauth-admin-scopes-tweaks
# Conflicts:
# lib/pleroma/user.ex
|
5 years ago |
|
Ivan Tashkinov
|
6c94b7498b
|
[#1478] OAuth admin tweaks: enforced OAuth admin scopes usage by default, migrated existing OAuth records. Adjusted tests.
|
5 years ago |
|
Ivan Tashkinov
|
455e072d27
|
[#2068] Introduced proper OAuth tokens usage to controller tests.
|
5 years ago |
|
Ivan Tashkinov
|
7973cbdb9f
|
OAuthScopesPlug: disallowed nil token (unless with :fallback option). WIP: controller tests modification: OAuth scopes usage.
|
5 years ago |
|
lain
|
e9993acdbb
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel
|
5 years ago |
|
lain
|
b22ee9d966
|
Merge remote-tracking branch 'origin/develop' into reactions
|
5 years ago |
|
lain
|
1bd1f62af5
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel
|
5 years ago |
|
Ivan Tashkinov
|
ee04fbc35a
|
[#1304]. Post-merge fixes. Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1304-user-info-deprecation
# Conflicts:
# CHANGELOG.md
# lib/pleroma/notification.ex
# lib/pleroma/user.ex
# lib/pleroma/user/info.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
|
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 |
|
lain
|
6e4f52f8a2
|
Introduce new ingestion pipeline structure, implement internal Likes with it.
|
5 years ago |
|
lain
|
61097ba6ab
|
Merge branch 'develop' into 'reactions'
# Conflicts:
# CHANGELOG.md
|
5 years ago |
|
eugenijm
|
8249924485
|
Mastodon API: Add `pleroma.unread_conversation_count` to the Account entity
|
5 years ago |
|
lain
|
1ed8fbc4d9
|
Merge remote-tracking branch 'origin/develop' into reactions
|
5 years ago |
|
kaniini
|
e07e9cb75e
|
Revert "Merge branch 'user-info-unread-direct-conversation' into 'develop'"
This reverts merge request !1737
|
5 years ago |
|
lain
|
d9aaea44ff
|
Merge remote-tracking branch 'origin/develop' into reactions
|
5 years ago |
|
eugenijm
|
06d9df79c5
|
Mastodon API: Add `pleroma.unread_conversation_count` to the Account entity
|
5 years ago |
|
lain
|
4cb603e1df
|
PleromaAPI: Add unreacting.
|
5 years ago |
|
lain
|
557223b2b5
|
Merge remote-tracking branch 'origin/develop' into reactions
|
5 years ago |
|
lain
|
19bc0b8c79
|
.
|
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
|
211008ae2f
|
test: fix scrobble controller tests
|
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 |
|
rinpatch
|
6b3d5ed6db
|
Emoji API Controller: Follow phoenix directory structure
|
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
|
015597c2ab
|
Apply suggestion to test/web/pleroma_api/subscription_notification_controller_test.exs
|
5 years ago |
|
Roman Chvanikov
|
6042e21b25
|
Move subscription notifications to a separate controller
|
5 years ago |
|
lain
|
a7f31bf06c
|
Merge remote-tracking branch 'origin/develop' into reactions
|
5 years ago |
|
lain
|
e5b3ad3d04
|
ActivityPub: Use is_unicode_emoji? function.
|
5 years ago |
|
lain
|
05e9776517
|
PleromaAPIController: Add endpoint to fetch emoji reactions.
|
5 years ago |
|
lain
|
99ea990a16
|
PleromaAPIController: Add emoji reactions.
|
5 years ago |
|
rinpatch
|
c2b6c1b089
|
Extend `/api/pleroma/notifications/read` to mark multiple notifications
as read and make it respond with Mastoapi entities
|
5 years ago |
|
lain
|
60231ec7bd
|
Conversation: Add endpoint to get a conversation by id.
|
5 years ago |
|
lain
|
23c46f7e72
|
Conversations: Use 'recipients' for accounts in conversation view.
According to gargron, this is the intended usage.
|
5 years ago |
|
lain
|
d6fe220e32
|
Linting.
|
5 years ago |
|
lain
|
3af6d14da7
|
Pleroma Conversations API: Add a way to set recipients.
|
5 years ago |
|
lain
|
eee98aaa73
|
Pleroma API: Add endpoint to get conversation statuses.
|
5 years ago |
