lain
|
7a2f100061
|
ActivityPub: Show own replies to muted users.
Aligns mute with block behavior.
|
2020-10-15 12:28:25 +02: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 |
|
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
|
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 |
|
Alexander Strizhakov
|
a6d8cef33e
|
OAuthScopesPlug module name
|
2020-10-13 16:43:54 +03:00 |
|
Alexander Strizhakov
|
15772fda57
|
PlugHelper module name
|
2020-10-13 16:43:53 +03:00 |
|
Alexander Strizhakov
|
4b1863ca4e
|
RateLimiter module name
|
2020-10-13 16:43:53 +03:00 |
|
Alexander Strizhakov
|
3be8ab5103
|
RemoteIp module name
|
2020-10-13 16:43:50 +03:00 |
|
Alexander Strizhakov
|
4b4c0eef36
|
SessionAuthenticationPlug module name
|
2020-10-13 16:42:53 +03:00 |
|
Alexander Strizhakov
|
8249b75761
|
SetFormatPlug module name
|
2020-10-13 16:42:53 +03:00 |
|
Alexander Strizhakov
|
c97c7d982f
|
SetLocalePlug module name
|
2020-10-13 16:42:52 +03:00 |
|
Alexander Strizhakov
|
f7614d4718
|
SetUserSessionIdPlug module name
|
2020-10-13 16:42:52 +03:00 |
|
Alexander Strizhakov
|
d36c9e210a
|
StaticFEPlug module name
|
2020-10-13 16:42:52 +03:00 |
|
Alexander Strizhakov
|
a07688deb1
|
TrailingFormatPlug module name
|
2020-10-13 16:42:51 +03:00 |
|
Alexander Strizhakov
|
a5987155f7
|
UploadedMedia module name
|
2020-10-13 16:42:51 +03:00 |
|
Alexander Strizhakov
|
ebd6dd7c53
|
UserEnabledPlug module name
|
2020-10-13 16:42:51 +03:00 |
|
Alexander Strizhakov
|
61c609884c
|
UserFetcherPlug module name
|
2020-10-13 16:42:51 +03:00 |
|
Alexander Strizhakov
|
1d16cd0c3d
|
UserIsAdminPlug module name
|
2020-10-13 16:42:50 +03:00 |
|