Commit graph

9374 commits

Author SHA1 Message Date
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
2020-04-16 14:59:11 +00:00
rinpatch
77ee64b993 user: remove blank? 2020-04-16 17:54:57 +03:00
Alexander Strizhakov
72ef6cc4f2
added need_reboot endpoint to admin api 2020-04-16 16:03:26 +03:00
lain
2b57f73b77 Merge branch 'small-fix-rewrite_policy' into 'develop'
small fix in the rewrite_policy example

See merge request pleroma/pleroma!2391
2020-04-16 09:38:24 +00:00
Egor Kislitsyn
cf4ebba774
Cleanup SubscriptionController 2020-04-15 23:14:47 +04:00
Ivan Tashkinov
bde1189c34 [#2349] Made :skip_plug/2 prevent plug from being executed even if explicitly called. Refactoring. Tests. 2020-04-15 21:19:16 +03:00
Ilja
aa0a4a1e78 small fix in the rewrite_policy example 2020-04-15 19:03:27 +02:00
Ivan Tashkinov
bedf92e064 Merge remote-tracking branch 'remotes/origin/develop' into authenticated-api-oauth-check-enforcement 2020-04-15 19:20:34 +03:00
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
2020-04-15 15:26:55 +00:00
Egor Kislitsyn
65f04b7806
Fix credo warning 2020-04-15 17:16:32 +04:00
Egor Kislitsyn
16f4787bf7
Add a TODO note 2020-04-15 16:51:37 +04:00
Egor Kislitsyn
0e647ff55a
Abstract pagination params in OpenAPI spec 2020-04-15 16:45:45 +04:00
Alexander Strizhakov
22bde21c4f
remote_ip plug adds remote_ip_found flag 2020-04-15 15:27:34 +03:00
Egor Kislitsyn
8ed162b655 Fix formatting 2020-04-15 15:57:00 +04:00
minibikini
5a2e45a218 Apply suggestion to lib/pleroma/web/api_spec/operations/account_operation.ex 2020-04-15 11:29:10 +00:00
minibikini
81a4c15816 Apply suggestion to lib/pleroma/web/api_spec/operations/account_operation.ex 2020-04-15 10:48:52 +00:00
minibikini
a45bd91d4e Apply suggestion to lib/pleroma/web/api_spec/operations/account_operation.ex 2020-04-15 10:48:32 +00:00
minibikini
bfa26b0937 Apply suggestion to lib/pleroma/web/api_spec/operations/account_operation.ex 2020-04-15 10:30:19 +00:00
minibikini
a794ba655f Apply suggestion to lib/pleroma/web/api_spec/operations/account_operation.ex 2020-04-15 10:27:01 +00:00
minibikini
a7feca1604 Apply suggestion to lib/pleroma/web/api_spec/operations/account_operation.ex 2020-04-15 10:26:53 +00:00
minibikini
d3e876aeee Apply suggestion to lib/pleroma/web/api_spec/operations/account_operation.ex 2020-04-15 10:26:44 +00:00
rinpatch
ad8630b95a Merge branch 'uploads-csp-changes' into 'develop'
Uploads: Sandbox them in the CSP.

See merge request pleroma/pleroma!2389
2020-04-15 10:15:15 +00:00
lain
6bc76df287 Uploads: Sandbox them in the CSP. 2020-04-15 12:05:22 +02:00
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
2020-04-14 22:01:24 +00:00
rinpatch
cc4ff19e34 openapi: add application/x-www-form-urlencoded to body types
Closes #1683
2020-04-15 00:49:21 +03:00
Ivan Tashkinov
f7e623c11c [#1364] Resolved merge conflicts with develop. 2020-04-14 20:19:08 +03:00
Ivan Tashkinov
0cda80f266 Merge remote-tracking branch 'remotes/origin/develop' into 1364-no-pushes-from-blocked-domains-users
# Conflicts:
#	lib/pleroma/notification.ex
2020-04-14 20:10:02 +03:00
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
2020-04-14 17:05:17 +00:00
Mark Felder
3bf78f2be7 Fix Oban not receiving :ok from RichMediaHelper job 2020-04-14 11:43:53 -05:00
lain
c02e6ceea5 Merge branch 'revert-60cc7d6c' into 'develop'
Revert "Merge branch 'issue/1276' into 'develop'"

See merge request pleroma/pleroma!2384
2020-04-14 16:32:34 +00:00
lain
4576520461 Revert "Merge branch 'issue/1276' into 'develop'"
This reverts merge request !1877
2020-04-14 16:32:22 +00:00
lain
3677a1e578 Merge branch 'revert-13a7105b' into 'develop'
Revert "Merge branch 'marker-update-fix' into 'develop'"

See merge request pleroma/pleroma!2383
2020-04-14 16:31:41 +00:00
lain
7c060432fc Revert "Merge branch 'marker-update-fix' into 'develop'"
This reverts merge request !2380
2020-04-14 16:31:30 +00:00
Egor Kislitsyn
247e6fcb90
Merge branch 'develop' into openapi/account 2020-04-14 19:45:22 +04:00
bf3afbc1a1 Merge branch 'logger-configuration' into 'develop'
Fix for logger configuration through admin-fe

See merge request pleroma/pleroma!2365
2020-04-14 15:11:25 +00:00
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
2020-04-14 13:17:44 +00:00
lain
5fc6ce30ac Merge branch 'chore/spelling' into 'develop'
Fix spelling in log message

See merge request pleroma/pleroma!2378
2020-04-14 13:07:57 +00:00
lain
d8b12ffd59 Marker update migration: Don't try to update virtual field. 2020-04-14 15:06:09 +02:00
lain
2eae5793cd Merge branch 'fix/issue_1679' into 'develop'
[#1679] fixed  logs

See merge request pleroma/pleroma!2379
2020-04-14 11:08:33 +00:00
Ivan Tashkinov
650853fc89 Merge remote-tracking branch 'remotes/origin/develop' into 1364-no-pushes-from-blocked-domains-users
# Conflicts:
#	lib/pleroma/notification.ex
2020-04-14 11:58:38 +03:00
Haelwenn
60cc7d6c9a Merge branch 'issue/1276' into 'develop'
[#1276] An endpoint for getting unread notification count

Closes #1276

See merge request pleroma/pleroma!1877
2020-04-14 06:38:56 +00:00
Maksim Pechnikov
c4e7ed660c fix logger message 2020-04-14 08:43:47 +03:00
Mark Felder
f3725b8fc4 Fix spelling 2020-04-13 17:04:43 -05:00
rinpatch
e3db1c471e Merge branch 'openapi/domain-blocks' into 'develop'
Add OpenAPI spec for DomainBlockController

See merge request pleroma/pleroma!2376
2020-04-13 20:04:49 +00:00
Egor Kislitsyn
4dca712e90
Add OpenAPI spec for DomainBlockController 2020-04-13 22:44:52 +04:00
Maksim Pechnikov
a16b3dbcbf Merge branch 'develop' into issue/1276 2020-04-13 21:19:27 +03:00
Egor Kislitsyn
c28aaf9d82
Add OpenAPI spec for CustomEmojiController 2020-04-13 21:21:04 +04:00
Egor Kislitsyn
7e0b42d99f
Add specs for AccountController.mutes, AccountController.blocks, AccountController.mutes, AccountController.endorsements 2020-04-13 18:17:09 +04:00
Egor Kislitsyn
ab185d3ea4
Add spec for AccountController.follows 2020-04-13 18:17:09 +04:00
Egor Kislitsyn
68a979b824
Add specs for AccountController.block and AccountController.unblock 2020-04-13 18:17:08 +04:00