lain
d45ae64858
ChatController: Use OAuth scopes.
4 years ago
lain
f8c3ae7a62
ChatController: Handle pagination.
4 years ago
lain
e983f70884
ChatMessagesHandling: Strip HTML of incoming messages.
4 years ago
lain
ca598e9c27
AccountView: Return user ap_id.
4 years ago
lain
e2ced04917
ChatMessages: Better validation.
4 years ago
lain
3d4eca5dd4
CommonAPI: Escape HTML for chat messages.
4 years ago
lain
6ace22b56a
Chat: Add views, don't return them in timeline queries.
5 years ago
lain
44bfb491ea
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
5 years ago
lain
4576520461
Revert "Merge branch 'issue/1276' into 'develop'"
...
This reverts merge request !1877
5 years ago
feld
bf3afbc1a1
Merge branch 'logger-configuration' into 'develop'
...
Fix for logger configuration through admin-fe
See merge request pleroma/pleroma!2365
5 years ago
Haelwenn
60cc7d6c9a
Merge branch 'issue/1276' into 'develop'
...
[#1276 ] An endpoint for getting unread notification count
Closes #1276
See merge request pleroma/pleroma!1877
5 years ago
Egor Kislitsyn
4dca712e90
Add OpenAPI spec for DomainBlockController
5 years ago
Maksim Pechnikov
a16b3dbcbf
Merge branch 'develop' into issue/1276
5 years ago
Ivan Tashkinov
a21baf89d8
Merge remote-tracking branch 'remotes/origin/develop' into output-of-relationships-in-statuses
5 years ago
Alexander Strizhakov
a050f3e015
fix for logger configuration through admin-fe
5 years ago
rinpatch
5e365448f3
Merge branch 'following-relationships-optimizations' into 'develop'
...
FollowingRelationship storage & performance optimizations
See merge request pleroma/pleroma!2332
5 years ago
Egor Kislitsyn
cf2a0574e7
Merge branch 'develop' into fix/support-conversations-pagination
5 years ago
Haelwenn
4d33e0bd50
Merge branch 'bugfix/apc2s_upload_activity' into 'develop'
...
bugfix: AP C2S activity with attachments
See merge request pleroma/pleroma!2316
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
Egor Kislitsyn
d545b883eb
Add `/api/v1/notifications/:id/dismiss` endpoint
5 years ago
lain
d35e114acd
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
5 years ago
lain
8e637ae1a7
CommonAPI: Basic ChatMessage support.
5 years ago
lain
4b04785071
SideEffects: Extend ChatMessage test.
5 years ago
lain
2e78686686
SideEffects: Handle ChatMessage creation.
5 years ago
lain
b87b798ca1
Merge branch 'fix/1658-invite-send' into 'develop'
...
Error improvement for email_invite endpoint
See merge request pleroma/pleroma!2344
5 years ago
Alexander Strizhakov
9795ff5b01
Apply suggestion to test/web/admin_api/admin_api_controller_test.exs
5 years ago
Alexander Strizhakov
365c34a7a9
Apply suggestion to test/web/admin_api/admin_api_controller_test.exs
5 years ago
lain
d2e21fbc96
Merge branch 'open-api' into 'develop'
...
Add OpenAPI
Closes pleroma-meta#19
See merge request pleroma/pleroma!2345
5 years ago
rinpatch
d067eaa7b3
formatter.ex: Use Phoenix.HTML for mention/hashtag generation
...
Unlike concatenating strings, this makes sure everything is escaped.
Tests had to be changed because Phoenix.HTML runs attributes through
Enum.sort before generation for whatever reason.
5 years ago
lain
3775683a04
ChatMessage: Basic incoming handling.
5 years ago
rinpatch
dd4d10b275
Merge branch 'fix-auto-link-for-profile-fields' into 'develop'
...
Use Pleroma.Formatter.linkify/2 instead
See merge request pleroma/pleroma!2352
5 years ago
Maksim Pechnikov
2b7d7bbd2d
Merge branch 'develop' into issue/1276
5 years ago
kPherox
06471940e0
Apply suggestion to test/web/mastodon_api/controllers/account_controller/update_credentials_test.exs
5 years ago
lain
1d4ab06505
Merge branch 'featureflag/emoji_reactions' into 'develop'
...
Add emoji reactions to features in nodeinfo
See merge request pleroma/pleroma!2313
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
3fa51f7272
Merge remote-tracking branch 'remotes/origin/2323-accounts-relationships-hotfix' into output-of-relationships-in-statuses
...
# Conflicts:
# lib/pleroma/web/mastodon_api/views/account_view.ex
# lib/pleroma/web/mastodon_api/views/status_view.ex
5 years ago
Ivan Tashkinov
aa78325117
[ #2323 ] Fixed a typo causing /accounts/relationships to render default relationships. Improved the tests.
5 years ago
Maksim Pechnikov
dbcfac11b4
Merge branch 'develop' into issue/1276
5 years ago
Egor Kislitsyn
23219e6fb3
Add OpenAPI
5 years ago
Alexander Strizhakov
2d64500a9d
error improvement for email_invite endpoint
5 years ago
Ivan Tashkinov
98b96e45ab
Merge remote-tracking branch 'remotes/origin/develop' into output-of-relationships-in-statuses
...
# Conflicts:
# CHANGELOG.md
5 years ago
feld
ef7d2b0f11
Merge branch 'gun' into 'develop'
...
Gun adapter
Closes #945
See merge request pleroma/pleroma!1861
5 years ago
Ivan Tashkinov
2f2bd7fe72
Ability to control the output of account/pleroma/relationship in statuses in order to improve the rendering performance.
...
See `[:extensions, output_relationships_in_statuses_by_default]` setting and `with_relationships` param.
5 years ago
rinpatch
bfec45bf74
Merge branch 'fix/1601-add-new-meta-tag' into 'develop'
...
Restrict remote users from indexing
Closes #1601
See merge request pleroma/pleroma!2341
5 years ago
Alexander Strizhakov
94ddbe4098
restrict remote users from indexing
5 years ago
Haelwenn (lanodan) Monnier
185520d1b4
Provide known-good user.uri, remove User.profile_url/1
5 years ago
Haelwenn (lanodan) Monnier
b30fb1f3bb
User: Fix use of source_data in profile_url/1
5 years ago
Haelwenn (lanodan) Monnier
2553400a66
Initial failing test statement against funkwhale channels
5 years ago