rinpatch
|
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 |
|
rinpatch
|
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 |
|
rinpatch
|
0ddee13c83
|
Merge branch 'features/remove-user-source_data' into 'develop'
User: remove source_data
Closes #820
See merge request pleroma/pleroma!2339
|
4 years ago |
|
rinpatch
|
942d7467ca
|
Merge branch 'develop' into features/remove-user-source_data
|
4 years ago |
|
lain
|
f8c3ae7a62
|
ChatController: Handle pagination.
|
4 years ago |
|
lain
|
e983f70884
|
ChatMessagesHandling: Strip HTML of incoming messages.
|
4 years ago |
|
Alexander Strizhakov
|
4d330d9df1
|
fix for use of published from different entities
|
4 years ago |
|
rinpatch
|
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 |
|
rinpatch
|
77ee64b993
|
user: remove blank?
|
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 |
|
Alexander Strizhakov
|
72ef6cc4f2
|
added need_reboot endpoint to admin api
|
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 |
|
Egor Kislitsyn
|
cf4ebba774
|
Cleanup SubscriptionController
|
5 years ago |
|
Ivan Tashkinov
|
bde1189c34
|
[#2349] Made :skip_plug/2 prevent plug from being executed even if explicitly called. Refactoring. Tests.
|
5 years ago |
|
Ilja
|
aa0a4a1e78
|
small fix in the rewrite_policy example
|
5 years ago |
|
lain
|
6ace22b56a
|
Chat: Add views, don't return them in timeline queries.
|
5 years ago |
|
Ivan Tashkinov
|
bedf92e064
|
Merge remote-tracking branch 'remotes/origin/develop' into authenticated-api-oauth-check-enforcement
|
5 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
|
5 years ago |
|
Egor Kislitsyn
|
65f04b7806
|
Fix credo warning
|
5 years ago |
|
Egor Kislitsyn
|
16f4787bf7
|
Add a TODO note
|
5 years ago |
|
Egor Kislitsyn
|
0e647ff55a
|
Abstract pagination params in OpenAPI spec
|
5 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 |
|
Egor Kislitsyn
|
8ed162b655
|
Fix formatting
|
5 years ago |
|
minibikini
|
5a2e45a218
|
Apply suggestion to lib/pleroma/web/api_spec/operations/account_operation.ex
|
5 years ago |
|
minibikini
|
81a4c15816
|
Apply suggestion to lib/pleroma/web/api_spec/operations/account_operation.ex
|
5 years ago |
|
minibikini
|
a45bd91d4e
|
Apply suggestion to lib/pleroma/web/api_spec/operations/account_operation.ex
|
5 years ago |
|
minibikini
|
bfa26b0937
|
Apply suggestion to lib/pleroma/web/api_spec/operations/account_operation.ex
|
5 years ago |
|
minibikini
|
a794ba655f
|
Apply suggestion to lib/pleroma/web/api_spec/operations/account_operation.ex
|
5 years ago |
|
minibikini
|
a7feca1604
|
Apply suggestion to lib/pleroma/web/api_spec/operations/account_operation.ex
|
5 years ago |
|
minibikini
|
d3e876aeee
|
Apply suggestion to lib/pleroma/web/api_spec/operations/account_operation.ex
|
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 |
|
Ivan Tashkinov
|
f7e623c11c
|
[#1364] Resolved merge conflicts with `develop`.
|
5 years ago |
|
Ivan Tashkinov
|
0cda80f266
|
Merge remote-tracking branch 'remotes/origin/develop' into 1364-no-pushes-from-blocked-domains-users
# Conflicts:
# lib/pleroma/notification.ex
|
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 |
|
Egor Kislitsyn
|
247e6fcb90
|
Merge branch 'develop' into openapi/account
|
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 |
