5b6818b3e5
CommonAPI: Obey local limit for chat messages.
4 years ago
ce23673ca1
ChatMessageValidator: Don't validate messages that are too long.
4 years ago
c845820911
Notifications: Create a chat notification.
4 years ago
8c2c325598
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
6936854878
Merge branch 'bugfix/1695-user_emoji_miration' into 'develop'
...
migrations/20200406100225_users_add_emoji: Fix tag to Emoji filtering
Closes #1695
See merge request pleroma/pleroma!2398
4 years ago
372614cfd3
ChatView: Add a mastodon api representation of the recipient.
4 years ago
46f051048f
migrations/20200406100225_users_add_emoji: Fix tag to Emoji filtering
4 years ago
d45ae64858
ChatController: Use OAuth scopes.
4 years ago
a17bfb5fab
Merge branch 'feature/1584-client-captcha-options' into 'develop'
...
Creating trusted app from adminFE & mix task
Closes #1584
See merge request pleroma/pleroma!2252
4 years ago
d8142ee6fe
Merge branch 'fix/1694-transfer-task-fix' into 'develop'
...
Fix for logger configuration
Closes #1694
See merge request pleroma/pleroma!2396
4 years ago
9c76d70a47
Merge branch 'feature/1677-need_reboot-flag-endpoint' into 'develop'
...
Added need_reboot endpoint to admin api
Closes #1677
See merge request pleroma/pleroma!2373
4 years ago
304ea09f4c
fix for logger configuration
4 years ago
badd888ccb
Merge branch 'authenticated-api-oauth-check-enforcement' into 'develop'
...
Enforcement of OAuth scopes check for authenticated API endpoints
See merge request pleroma/pleroma!2349
4 years ago
28bcde5d98
Merge branch 'fix/1691-feed-render' into 'develop'
...
Fix for use of `published` field from different entities
Closes #1691
See merge request pleroma/pleroma!2395
4 years ago
942d7467ca
Merge branch 'develop' into features/remove-user-source_data
4 years ago
f8c3ae7a62
ChatController: Handle pagination.
4 years ago
e983f70884
ChatMessagesHandling: Strip HTML of incoming messages.
4 years ago
4d330d9df1
fix for use of published from different entities
4 years ago
252528a4b9
Merge branch 'refactor/remove-upgrade-changeset' into 'develop'
...
Remove User.upgrade_changeset in favor of remote_user_creation
See merge request pleroma/pleroma!2368
4 years ago
77ee64b993
user: remove blank?
4 years ago
41fdcb7282
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
ca598e9c27
AccountView: Return user ap_id.
4 years ago
e2ced04917
ChatMessages: Better validation.
4 years ago
72ef6cc4f2
added need_reboot endpoint to admin api
4 years ago
3d4eca5dd4
CommonAPI: Escape HTML for chat messages.
4 years ago
bde1189c34
[ #2349 ] Made :skip_plug/2 prevent plug from being executed even if explicitly called. Refactoring. Tests.
5 years ago
6ace22b56a
Chat: Add views, don't return them in timeline queries.
5 years ago
bedf92e064
Merge remote-tracking branch 'remotes/origin/develop' into authenticated-api-oauth-check-enforcement
5 years ago
b1c1d2e5e1
Merge branch 'fix/1659-rate-limiter' into 'develop'
...
remote_ip plug adds remote_ip_found flag
Closes #1659
See merge request pleroma/pleroma!2390
5 years ago
44bfb491ea
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
5 years ago
22bde21c4f
remote_ip plug adds remote_ip_found flag
5 years ago
6bc76df287
Uploads: Sandbox them in the CSP.
5 years ago
96eae62995
Merge branch 'fix/openapi-form-mimetype' into 'develop'
...
openapi: add application/x-www-form-urlencoded to body types
Closes #1683
See merge request pleroma/pleroma!2387
5 years ago
cc4ff19e34
openapi: add application/x-www-form-urlencoded to body types
...
Closes #1683
5 years ago
3bf78f2be7
Fix Oban not receiving :ok from RichMediaHelper job
5 years ago
4576520461
Revert "Merge branch 'issue/1276' into 'develop'"
...
This reverts merge request !1877
5 years ago
bf3afbc1a1
Merge branch 'logger-configuration' into 'develop'
...
Fix for logger configuration through admin-fe
See merge request pleroma/pleroma!2365
5 years ago
5fc6ce30ac
Merge branch 'chore/spelling' into 'develop'
...
Fix spelling in log message
See merge request pleroma/pleroma!2378
5 years ago
2eae5793cd
Merge branch 'fix/issue_1679' into 'develop'
...
[#1679 ] fixed logs
See merge request pleroma/pleroma!2379
5 years ago
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
c4e7ed660c
fix logger message
5 years ago
f3725b8fc4
Fix spelling
5 years ago
4dca712e90
Add OpenAPI spec for DomainBlockController
5 years ago
a16b3dbcbf
Merge branch 'develop' into issue/1276
5 years ago
a21baf89d8
Merge remote-tracking branch 'remotes/origin/develop' into output-of-relationships-in-statuses
5 years ago
a050f3e015
fix for logger configuration through admin-fe
5 years ago
5e365448f3
Merge branch 'following-relationships-optimizations' into 'develop'
...
FollowingRelationship storage & performance optimizations
See merge request pleroma/pleroma!2332
5 years ago
c077ad0b33
Remove User.upgrade_changeset in favor of remote_user_creation
...
The two changesets had the same purpose, yet some changes were updated
in one, but not the other (`uri`, for example).
Also makes `Transmogrifier.upgrade_user_from_ap_id` be called from
`ActivityPub.make_user_from_ap_id` only when the user is actually
not AP enabled yet.
I did not bother rewriting tests that used `User.insert_or_update`
to use the changeset instead because they seemed to just test the implementation,
rather than behavior.
5 years ago
64c78581fe
Chat: Only create them for valid users for now.
5 years ago
cf2a0574e7
Merge branch 'develop' into fix/support-conversations-pagination
5 years ago
lain