Ivan Tashkinov
|
d54233760f
|
[#3053] Post-merge fix.
|
2020-10-17 13:33:57 +03:00 |
|
Ivan Tashkinov
|
049ece1ef3
|
Merge remote-tracking branch 'remotes/origin/develop' into ostatus-controller-no-auth-check-on-non-federating-instances
# Conflicts:
# lib/pleroma/web/feed/user_controller.ex
# lib/pleroma/web/o_status/o_status_controller.ex
# lib/pleroma/web/router.ex
# lib/pleroma/web/static_fe/static_fe_controller.ex
|
2020-10-17 13:12:39 +03:00 |
Mark Felder
|
fb056ce05b
|
Merge branch 'develop' into refactor/discoverable_user_field
|
2020-10-15 16:39:01 -05:00 |
Haelwenn
|
724e4b7f00
|
Apply 1 suggestion(s) to 1 file(s)
|
2020-10-15 21:03:48 +00:00 |
Maksim Pechnikov
|
2030ffd490
|
fix test
|
2020-10-15 22:31:52 +03:00 |
|
Maksim Pechnikov
|
cf53e300f8
|
added generate the release env to `pleroma.instance gen`
|
2020-10-15 22:31:00 +03:00 |
|
Maksim
|
e2333f757a
|
Apply 1 suggestion(s) to 1 file(s)
|
2020-10-15 22:29:28 +03:00 |
|
Maksim
|
499df7b73a
|
Apply 1 suggestion(s) to 1 file(s)
|
2020-10-15 22:29:18 +03:00 |
|
Maksim Pechnikov
|
14054cd004
|
update task messages
|
2020-10-15 22:28:49 +03:00 |
|
Maksim Pechnikov
|
20e68b30f0
|
added generated `pleroma.env`
|
2020-10-15 22:28:26 +03:00 |
feld
|
77bca41595
|
Apply 3 suggestion(s) to 3 file(s)
|
2020-10-14 19:33:54 +00:00 |
|
feld
|
2013705690
|
Merge branch 'feature/gen-magic' into 'develop'
Use libmagic via majic
Closes #1736
See merge request pleroma/pleroma!2534
|
2020-10-14 17:31:45 +00:00 |
|
Haelwenn
|
9a85ec0da0
|
Merge branch 'refactor/locked_user_field' into 'develop'
Change user.locked field to user.is_locked
See merge request pleroma/pleroma!3077
|
2020-10-14 16:17:32 +00:00 |
|
Mark Felder
|
ed61002815
|
Undo API breaking changes
|
2020-10-14 11:03:17 -05:00 |
|
Mark Felder
|
b001237b79
|
Finish undoing API breakage
|
2020-10-14 10:44:18 -05:00 |
|
Mark Felder
|
3242cfef20
|
Undo API breaking changes
|
2020-10-14 09:54:07 -05:00 |
Haelwenn (lanodan) Monnier
|
f5d8af1db1
|
Move Consistency.FileLocation to ./test
This fixes a compilation fail because of Credo's absence in MIX_ENV=prod
|
2020-10-13 19:57:45 +02:00 |
|
Mark Felder
|
b738f70953
|
Merge branch 'develop' into feature/gen-magic
|
2020-10-13 10:08:38 -05:00 |
|
Mark Felder
|
409f694e4f
|
Merge branch 'develop' into refactor/locked_user_field
|
2020-10-13 09:54:29 -05:00 |
|
Mark Felder
|
4ead0d564f
|
Merge branch 'develop' into refactor/discoverable_user_field
|
2020-10-13 09:54:11 -05:00 |
|
Mark Felder
|
8bacdc3680
|
Change user.discoverable field to user.is_discoverable
|
2020-10-13 09:45:08 -05:00 |
|
Mark Felder
|
9968b7efed
|
Change user.locked field to user.is_locked
|
2020-10-13 09:31:13 -05:00 |
Alexander Strizhakov
|
4c4ea9a348
|
changes after rebase
|
2020-10-13 17:10:34 +03:00 |
|
Alexander Strizhakov
|
3cb9c88837
|
migration and warning for RemoteIp plug rename
|
2020-10-13 16:44:04 +03:00 |
|
Alexander Strizhakov
|
5f2071c458
|
changes after rebase
|
2020-10-13 16:44:03 +03:00 |
|
Alexander Strizhakov
|
7f5dbb0201
|
changes after rebase
|
2020-10-13 16:44:03 +03:00 |
|
Alexander Strizhakov
|
b081080dd9
|
fixes after rebase
|
2020-10-13 16:44:02 +03:00 |
|
Alexander Strizhakov
|
c4c5caedd8
|
changes after rebase
|
2020-10-13 16:44:02 +03:00 |
|
Alexander Strizhakov
|
1d0e130cb3
|
fixes after rebase
|
2020-10-13 16:44:02 +03:00 |
|
Alexander Strizhakov
|
0f8ab46a0e
|
fix after rebase
|
2020-10-13 16:44:00 +03:00 |
|
Alexander Strizhakov
|
207211a2b3
|
update files consistency after rebase
|
2020-10-13 16:44:00 +03:00 |
|
Alexander Strizhakov
|
3c8c540707
|
copyright
|
2020-10-13 16:43:59 +03:00 |
|
Alexander Strizhakov
|
b6eb7997f5
|
special namespaces for phoenix and api_spec
|
2020-10-13 16:43:59 +03:00 |
|
Alexander Strizhakov
|
9f4fe5485b
|
alias alphabetically order
|
2020-10-13 16:43:59 +03:00 |
|
Alexander Strizhakov
|
3ef4e9d170
|
AdminSecretAuthenticationPlug module name
|
2020-10-13 16:43:58 +03:00 |
|
Alexander Strizhakov
|
c497558d43
|
AuthenticationPlug module name
|
2020-10-13 16:43:58 +03:00 |
|
Alexander Strizhakov
|
c1777e7479
|
BasicAuthDecoderPlug module name
|
2020-10-13 16:43:58 +03:00 |
|
Alexander Strizhakov
|
970932689f
|
DigestPlug rename
|
2020-10-13 16:43:57 +03:00 |
|
Alexander Strizhakov
|
66e0b0065b
|
Cache plug module name
|
2020-10-13 16:43:57 +03:00 |
|
Alexander Strizhakov
|
c6baa811d6
|
EnsureAuthenticatedPlug module name
|
2020-10-13 16:43:57 +03:00 |
|
Alexander Strizhakov
|
011525a3d1
|
EnsurePublicOrAuthenticatedPlug module name
|
2020-10-13 16:43:57 +03:00 |
|
Alexander Strizhakov
|
8e301a4c37
|
EnsureUserKeyPlug module name
|
2020-10-13 16:43:56 +03:00 |
|
Alexander Strizhakov
|
d6cb1a3b46
|
ExpectAuthenticatedCheckPlug module name
|
2020-10-13 16:43:56 +03:00 |
|
Alexander Strizhakov
|
99e4ed21b1
|
ExpectPublicOrAuthenticatedCheckPlug module name
|
2020-10-13 16:43:56 +03:00 |
|
Alexander Strizhakov
|
8c993c5f63
|
FederatingPlug module name
|
2020-10-13 16:43:55 +03:00 |
|
Alexander Strizhakov
|
abc3c7689b
|
HTTPSecurityPlug module name and filename
|
2020-10-13 16:43:55 +03:00 |
|
Alexander Strizhakov
|
5cd7030076
|
IdempotencyPlug module name
|
2020-10-13 16:43:55 +03:00 |
|
Alexander Strizhakov
|
8dfaa54ffc
|
InstanceStatic module name
|
2020-10-13 16:43:55 +03:00 |
|
Alexander Strizhakov
|
e2332d92ce
|
LegacyAuthenticationPlug module name
|
2020-10-13 16:43:54 +03:00 |
|
Alexander Strizhakov
|
96d320bdfe
|
OAuthPlug module name
|
2020-10-13 16:43:54 +03:00 |