lain
|
f8c3ae7a62
|
ChatController: Handle pagination.
|
4 years ago |
|
lain
|
e983f70884
|
ChatMessagesHandling: Strip HTML of incoming messages.
|
4 years ago |
|
lain
|
41fdcb7282
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
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
|
2b57f73b77
|
Merge branch 'small-fix-rewrite_policy' into 'develop'
small fix in the rewrite_policy example
See merge request pleroma/pleroma!2391
|
4 years ago |
|
Ilja
|
aa0a4a1e78
|
small fix in the rewrite_policy example
|
4 years ago |
|
lain
|
6ace22b56a
|
Chat: Add views, don't return them in timeline queries.
|
4 years ago |
|
Haelwenn
|
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
|
4 years ago |
|
lain
|
44bfb491ea
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
5 years ago |
|
Alexander Strizhakov
|
22bde21c4f
|
remote_ip plug adds remote_ip_found flag
|
5 years ago |
|
rinpatch
|
ad8630b95a
|
Merge branch 'uploads-csp-changes' into 'develop'
Uploads: Sandbox them in the CSP.
See merge request pleroma/pleroma!2389
|
5 years ago |
|
lain
|
6bc76df287
|
Uploads: Sandbox them in the CSP.
|
5 years ago |
|
rinpatch
|
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 |
|
rinpatch
|
cc4ff19e34
|
openapi: add application/x-www-form-urlencoded to body types
Closes #1683
|
5 years ago |
|
feld
|
6c3e09fbce
|
Merge branch 'fix/richmedia-oban-error' into 'develop'
Attempt at fixing Oban not receiving :ok from RichMediaHelper job
Closes #1684
See merge request pleroma/pleroma!2377
|
5 years ago |
|
Mark Felder
|
3bf78f2be7
|
Fix Oban not receiving :ok from RichMediaHelper job
|
5 years ago |
|
lain
|
c02e6ceea5
|
Merge branch 'revert-60cc7d6c' into 'develop'
Revert "Merge branch 'issue/1276' into 'develop'"
See merge request pleroma/pleroma!2384
|
5 years ago |
|
lain
|
4576520461
|
Revert "Merge branch 'issue/1276' into 'develop'"
This reverts merge request !1877
|
5 years ago |
|
lain
|
3677a1e578
|
Merge branch 'revert-13a7105b' into 'develop'
Revert "Merge branch 'marker-update-fix' into 'develop'"
See merge request pleroma/pleroma!2383
|
5 years ago |
|
lain
|
7c060432fc
|
Revert "Merge branch 'marker-update-fix' into 'develop'"
This reverts merge request !2380
|
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 |
|
lain
|
13a7105b21
|
Merge branch 'marker-update-fix' into 'develop'
Marker update migration: Don't try to update virtual field.
See merge request pleroma/pleroma!2380
|
5 years ago |
|
lain
|
5fc6ce30ac
|
Merge branch 'chore/spelling' into 'develop'
Fix spelling in log message
See merge request pleroma/pleroma!2378
|
5 years ago |
|
lain
|
d8b12ffd59
|
Marker update migration: Don't try to update virtual field.
|
5 years ago |
|
lain
|
2eae5793cd
|
Merge branch 'fix/issue_1679' into 'develop'
[#1679] fixed logs
See merge request pleroma/pleroma!2379
|
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 |
|
Maksim Pechnikov
|
c4e7ed660c
|
fix logger message
|
5 years ago |
|
Mark Felder
|
f3725b8fc4
|
Fix spelling
|
5 years ago |
|
rinpatch
|
e3db1c471e
|
Merge branch 'openapi/domain-blocks' into 'develop'
Add OpenAPI spec for DomainBlockController
See merge request pleroma/pleroma!2376
|
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 |
|
rinpatch
|
ef37774403
|
Merge branch 'output-of-relationships-in-statuses' into 'develop'
Ability to control the output of AccountView.pleroma.relationship in statuses / notifications
See merge request pleroma/pleroma!2342
|
5 years ago |
|
Ivan Tashkinov
|
5c76afb06c
|
[#2342] Removed description.exs entry for temporary configuration option.
|
5 years ago |
|
Ivan Tashkinov
|
a21baf89d8
|
Merge remote-tracking branch 'remotes/origin/develop' into output-of-relationships-in-statuses
|
5 years ago |
|
Ivan Tashkinov
|
dc2637c188
|
[#2342] Removed changelog entry for temporary configuration option.
|
5 years ago |
|
Alexander Strizhakov
|
de34c4ee6b
|
changelog entry
|
5 years ago |
|
Alexander Strizhakov
|
a050f3e015
|
fix for logger configuration through admin-fe
|
5 years ago |
|
rinpatch
|
7ee35eb9a6
|
Merge branch 'fix/mix-tasks-failing-otp' into 'develop'
Fix mix tasks failing on OTP releases
Closes #1678
See merge request pleroma/pleroma!2369
|
5 years ago |
|
rinpatch
|
2ba754ffe1
|
Fix mix tasks failing on OTP releases
No idea why this was even added.
Closes #1678
|
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 |
|
rinpatch
|
c682563b92
|
Merge branch 'support/update_oban' into 'develop'
[#1555] updated the Oban package
See merge request pleroma/pleroma!2346
|
5 years ago |
|
Maksim Pechnikov
|
ad92cef844
|
fix Oban migration
|
5 years ago |
|
Maksim Pechnikov
|
c255c2e4f5
|
Merge branch 'develop' into support/update_oban
|
5 years ago |
|
feld
|
aae22ab691
|
Merge branch 'chore/changelog-organization' into 'develop'
Add a section for changelog entries that pertain to the next patch release.
See merge request pleroma/pleroma!2366
|
5 years ago |
|
Mark Felder
|
6ff8812ea3
|
Add a section for changelog entries that pertain to the next patch release.
This will make it easier to keep changelogs synced between develop and stable branches.
|
5 years ago |
|
lain
|
64c78581fe
|
Chat: Only create them for valid users for now.
|
5 years ago |
|
Haelwenn
|
fc4f92c5de
|
Merge branch 'fix/support-conversations-pagination' into 'develop'
Support pagination in conversations
See merge request pleroma/pleroma!2329
|
5 years ago |
|
Egor Kislitsyn
|
cf2a0574e7
|
Merge branch 'develop' into fix/support-conversations-pagination
|
5 years ago |
