lain
|
0f0acc740d
|
Chat: Allow posting without content if an attachment is present.
|
4 years ago |
|
lain
|
3cff4e24cd
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
4 years ago |
|
Egor Kislitsyn
|
7803a85d2c
|
Add OpenAPI spec for StatusController
|
4 years ago |
|
lain
|
c0ea5c60e4
|
ChatController: Don't return chats for user you've blocked.
|
4 years ago |
|
lain
|
e44166b510
|
Credo fixes.
|
4 years ago |
|
lain
|
ec72cba43e
|
Chat Controller: Add basic error handling.
|
4 years ago |
|
lain
|
b5aa204eb8
|
ChatController: Support deletion of chat messages.
|
4 years ago |
|
lain
|
8d5597ff68
|
ChatController: Add GET /chats/:id
|
4 years ago |
|
lain
|
7637ef4203
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
4 years ago |
|
lain
|
ef55d24054
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/emojireactvalidator
|
4 years ago |
|
lain
|
fb2d284d28
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
4 years ago |
|
lain
|
7ac0cffb34
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/emojireactvalidator
|
4 years ago |
|
lain
|
f0c22df226
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/undo-validator-reduced
|
4 years ago |
|
Maksim
|
3d0c567fbc
|
Pleroma.Web.TwitterAPI.TwoFactorAuthenticationController -> Pleroma.Web.PleromaAPI.TwoFactorAuthenticationController
|
4 years ago |
|
lain
|
fc9d0b6eec
|
Credo fixes.
|
4 years ago |
|
lain
|
20baa2eaf0
|
ChatMessages: Add attachments.
|
4 years ago |
|
lain
|
b34debe615
|
Undoing: Move undoing reactions to the pipeline everywhere.
|
4 years ago |
|
lain
|
db55dc9445
|
ActivityPub: Remove `react_with_emoji`.
|
4 years ago |
|
lain
|
b04328c3de
|
ChatController: Add mark_as_read
|
4 years ago |
|
lain
|
c40afe5ba0
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
4 years ago |
|
Alexander Strizhakov
|
ddb757f743
|
emoji api packs changes in routes with docs update
|
4 years ago |
|
Alexander Strizhakov
|
342f55fb92
|
refactor emoji api with fixes
|
4 years ago |
|
Alexander Strizhakov
|
5839e67eb8
|
return data only for updated emoji
|
4 years ago |
|
lain
|
0c491b904d
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
4 years ago |
|
lain
|
ad82a216ff
|
Chat API: Align more to Pleroma/Mastodon API.
|
4 years ago |
|
lain
|
d2bbea1a80
|
ChatControllerTest: Use new schema testing functions.
|
4 years ago |
|
Ivan Tashkinov
|
b4139cc547
|
[#2409] Made `GET /api/v1/accounts/:id/favourites` auth-optional, adjusted tests.
|
4 years ago |
|
lain
|
6c8390fa4d
|
ChatControllerTest: Credo fixes.
|
4 years ago |
|
lain
|
66c2eb670b
|
ChatController: Validate parameters.
|
4 years ago |
|
lain
|
97ad0c4597
|
Chats: Add API specs.
|
4 years ago |
|
Ivan Tashkinov
|
f685cbd309
|
Automatic checks of authentication / instance publicity. Definition of missing OAuth scopes in AdminAPIController. Refactoring.
|
4 years ago |
|
lain
|
8c2c325598
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
4 years ago |
|
lain
|
d45ae64858
|
ChatController: Use OAuth scopes.
|
4 years ago |
|
lain
|
f8c3ae7a62
|
ChatController: Handle pagination.
|
4 years ago |
|
lain
|
6ace22b56a
|
Chat: Add views, don't return them in timeline queries.
|
4 years ago |
|
Ivan Tashkinov
|
bedf92e064
|
Merge remote-tracking branch 'remotes/origin/develop' into authenticated-api-oauth-check-enforcement
|
4 years ago |
|
lain
|
44bfb491ea
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
4 years ago |
|
Egor Kislitsyn
|
cf2a0574e7
|
Merge branch 'develop' into fix/support-conversations-pagination
|
5 years ago |
|
lain
|
2cc6841424
|
ChatController: Basic message posting.
|
5 years ago |
|
lain
|
e8fd0dd689
|
ChatController: Basic support for returning messages.
|
5 years ago |
|
lain
|
68abea313d
|
ChatController: Add creation and return of chats.
|
5 years ago |
|
lain
|
349b9d86dc
|
Merge branch 'remake-remodel-2' into 'develop'
Ingestion Pipeline Revamp
See merge request pleroma/pleroma!2315
|
5 years ago |
|
Ivan Tashkinov
|
fc81e5a49c
|
Enforcement of OAuth scopes check for authenticated API endpoints, :skip_plug plug to mark a plug explicitly skipped (disabled).
|
5 years ago |
|
Egor Kislitsyn
|
4a2538967c
|
Support pagination in conversations
|
5 years ago |
|
Ivan Tashkinov
|
1c05f539aa
|
Improved in-test `clear_config/n` applicability (setup / setup_all / in-test usage).
|
5 years ago |
|
lain
|
3c2c32b460
|
Merge branch 'remake-remodel' into develop
|
5 years ago |
|
Ivan Tashkinov
|
ec3719f539
|
Improved in-test config management functions.
|
5 years ago |
|
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 |
|
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
|
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
|
e9f69a3eb7
|
Move pleroma_api controllers into controllers sub-folders
|
5 years ago |
