Commit graph

7565 commits

Author SHA1 Message Date
rinpatch
df61071422 Merge branch '2242-nsfw-case' into 'develop'
Resolve "Posts tagged with #NSFW from GS aren't marked as sensitive"

Closes #2242

See merge request pleroma/pleroma!3094
2020-10-23 19:39:42 +00:00
lain
60e379ce0b User: Correctly handle whitespace names. 2020-10-23 13:53:01 +02:00
d6907e6e0c Merge branch 'chore/elixir-1.11' into 'develop'
Elixir 1.11 compatibility / Phoenix 1.5+

See merge request pleroma/pleroma!3059
2020-10-22 20:33:52 +00:00
Ivan Tashkinov
8a68673eed [#3059] Formatting fix. 2020-10-22 14:07:33 +03:00
Ivan Tashkinov
8a55de1d78 [#3059] Fixed Phoenix 1.5 telemetry processing. 2020-10-22 13:54:15 +03:00
lain
8d251096fe SideEffects: Correctly handle chat messages sent to yourself 2020-10-22 12:22:08 +02:00
Maksim Pechnikov
ef627b9391 fix module name 2020-10-22 12:04:23 +03:00
Maksim Pechnikov
44e5a57d1a admin api: added user filters by actor_types 2020-10-22 11:53:28 +03:00
Maksim Pechnikov
60663150b5 admin user search: added filter by actor_type 2020-10-22 11:53:28 +03:00
Maksim Pechnikov
46b420aa60 need_confirmed -> unconfirmed 2020-10-22 11:50:49 +03:00
Maksim Pechnikov
cf4f393794 added AdminApi.UserController 2020-10-22 11:50:49 +03:00
Maksim Pechnikov
9ef46ce410 added 'unconfirmed' filter to admin/users 2020-10-22 11:50:49 +03:00
Haelwenn
2ca98f2d94 Apply 1 suggestion(s) to 1 file(s) 2020-10-21 19:40:37 +00:00
Egor Kislitsyn
034ac43f3a
Fix credo warnings 2020-10-20 17:47:04 +04:00
Egor Kislitsyn
e87901c424
Merge remote-tracking branch 'origin/develop' into feature/account-export 2020-10-20 17:27:29 +04:00
Egor Kislitsyn
ad605e3e16
Rename Pleroma.Backup to Pleroma.User.Backup 2020-10-20 17:16:58 +04:00
lain
e97b254c6b Transmogrifier: Refactor and unify incoming tag handling 2020-10-19 15:46:24 +02:00
lain
39fd4d7639 Transmogrifier: Downcase incoming Hashtags
Also, set sensitive to true if we have an nsfw hashtag present.
2020-10-19 15:40:50 +02:00
Egor Kislitsyn
98f32cf820
Fix tests 2020-10-19 17:19:45 +04:00
Egor Kislitsyn
76c4e80e5a
Merge branch 'develop' into mutes-blocks-pagination 2020-10-19 15:40:03 +04:00
Haelwenn
0495a07dc7 Merge branch '2239-mute-fixes' into 'develop'
ActivityPub: Show own replies to muted users.

Closes #2239

See merge request pleroma/pleroma!3084
2020-10-19 04:26:35 +00:00
Ivan Tashkinov
524fb0e4c2 [#1668] Restricted access to app metrics endpoint by default. Added ability to configure IP whitelist for this endpoint.
Added tests and documentation.
2020-10-18 21:22:21 +03:00
Ivan Tashkinov
9ea31b373f Merge remote-tracking branch 'remotes/origin/develop' into chore/elixir-1.11 2020-10-17 17:53:47 +03:00
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
1b8fd7e65a Adds feature to permit e.g., local admins and community moderators to automatically follow all newly registered accounts 2020-10-16 17:36:02 +00:00
Haelwenn (lanodan) Monnier
aafdc975bd
federation_status: Add ApiSpec 2020-10-16 01:14:15 +02:00
Haelwenn (lanodan) Monnier
3b5a7a6b14
federation_status: New endpoint showing unreachable instances 2020-10-16 01:14:04 +02: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
Egor Kislitsyn
3985c1b450
Fix warnings 2020-10-15 16:54:59 +04:00
lain
7a2f100061 ActivityPub: Show own replies to muted users.
Aligns mute with block behavior.
2020-10-15 12:28:25 +02:00
Mark Felder
1fb9452131 Merge branch 'develop' into feature/account-export 2020-10-14 15:27:15 -05:00
77bca41595 Apply 3 suggestion(s) to 3 file(s) 2020-10-14 19:33:54 +00:00
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
Alex Gleason
755f58168b
Merge remote-tracking branch 'upstream/develop' into restrict-domain 2020-10-13 19:26:04 -05:00
Egor Kislitsyn
6734abcbd4
Add pagination for Mutes 2020-10-13 21:58:18 +04: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
Egor Kislitsyn
33f4f39b1c
Add pagination for Blocks 2020-10-13 21:39:41 +04:00
Mark Felder
b738f70953 Merge branch 'develop' into feature/gen-magic 2020-10-13 10:08:38 -05:00
Mark Felder
64553ebae2 Merge branch 'develop' into chore/elixir-1.11 2020-10-13 09:54:53 -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
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
Alexander Strizhakov
2125286e90
fix for fallback controller 2020-10-13 16:42:50 +03:00
Alexander Strizhakov
e267991a44
renaming LimiterSupervisor 2020-10-13 16:42:48 +03:00
Alexander Strizhakov
6a87f94ee2
renaming ratelimiter supervisor 2020-10-13 16:38:48 +03:00