akkoma
4 years agoTransmogrifier: Downcase incoming Hashtags
lain [Mon, 19 Oct 2020 13:40:50 +0000 (15:40 +0200)]
Transmogrifier: Downcase incoming Hashtags

Also, set sensitive to true if we have an nsfw hashtag present.

4 years agoMerge branch '2239-mute-fixes' into 'develop'
Haelwenn [Mon, 19 Oct 2020 04:26:35 +0000 (04:26 +0000)]
Merge branch '2239-mute-fixes' into 'develop'

ActivityPub: Show own replies to muted users.

Closes #2239

See merge request pleroma/pleroma!3084

4 years agoMerge branch 'chore/changelogfix' into 'develop'
feld [Sat, 17 Oct 2020 17:45:51 +0000 (17:45 +0000)]
Merge branch 'chore/changelogfix' into 'develop'

Fix duplicate Added sections in the changelog

See merge request pleroma/pleroma!3091

4 years agoFix duplicate Added sections in the changelog
Mark Felder [Sat, 17 Oct 2020 16:52:33 +0000 (11:52 -0500)]
Fix duplicate Added sections in the changelog

4 years agoMerge branch 'refactor/discoverable_user_field' into 'develop'
feld [Thu, 15 Oct 2020 21:49:15 +0000 (21:49 +0000)]
Merge branch 'refactor/discoverable_user_field' into 'develop'

Change user.discoverable field to user.is_discoverable

See merge request pleroma/pleroma!3078

4 years agoMerge branch 'develop' into refactor/discoverable_user_field
Mark Felder [Thu, 15 Oct 2020 21:39:01 +0000 (16:39 -0500)]
Merge branch 'develop' into refactor/discoverable_user_field

4 years agoApply 1 suggestion(s) to 1 file(s)
Haelwenn [Thu, 15 Oct 2020 21:03:48 +0000 (21:03 +0000)]
Apply 1 suggestion(s) to 1 file(s)

4 years agoMerge branch 'issue/2009' into 'develop'
feld [Thu, 15 Oct 2020 20:21:57 +0000 (20:21 +0000)]
Merge branch 'issue/2009' into 'develop'

[#2009] fixed install docs (release env)

See merge request pleroma/pleroma!2854

4 years agofix test
Maksim Pechnikov [Sat, 8 Aug 2020 03:49:19 +0000 (06:49 +0300)]
fix test

4 years agoadded generate the release env to `pleroma.instance gen`
Maksim Pechnikov [Fri, 7 Aug 2020 12:55:08 +0000 (15:55 +0300)]
added generate the release env to `pleroma.instance gen`

4 years agofixed install docs
Maksim Pechnikov [Wed, 5 Aug 2020 16:04:12 +0000 (19:04 +0300)]
fixed install docs

4 years agofix docs
Maksim Pechnikov [Thu, 16 Jul 2020 13:35:09 +0000 (16:35 +0300)]
fix docs

4 years agoApply 1 suggestion(s) to 1 file(s)
Maksim [Thu, 16 Jul 2020 13:30:28 +0000 (13:30 +0000)]
Apply 1 suggestion(s) to 1 file(s)

4 years agoApply 1 suggestion(s) to 1 file(s)
Maksim [Thu, 16 Jul 2020 13:30:17 +0000 (13:30 +0000)]
Apply 1 suggestion(s) to 1 file(s)

4 years agoupdate task messages
Maksim Pechnikov [Thu, 16 Jul 2020 05:52:14 +0000 (08:52 +0300)]
update task messages

4 years agoadded generated `pleroma.env`
Maksim Pechnikov [Tue, 14 Jul 2020 04:31:21 +0000 (07:31 +0300)]
added generated  `pleroma.env`

4 years agoActivityPub: Show own replies to muted users.
lain [Thu, 15 Oct 2020 10:28:25 +0000 (12:28 +0200)]
ActivityPub: Show own replies to muted users.

Aligns mute with block behavior.

4 years agoMerge branch 'docs-indigenous' into 'develop'
feld [Wed, 14 Oct 2020 20:31:23 +0000 (20:31 +0000)]
Merge branch 'docs-indigenous' into 'develop'

Change handle and url of contact person for Indigenous client

See merge request pleroma/pleroma!3082

4 years agoApply 3 suggestion(s) to 3 file(s)
feld [Wed, 14 Oct 2020 19:33:54 +0000 (19:33 +0000)]
Apply 3 suggestion(s) to 3 file(s)

4 years agoChange handle and url of contact person for Indigenous client
swentel [Wed, 14 Oct 2020 19:32:18 +0000 (21:32 +0200)]
Change handle and url of contact person for Indigenous client

4 years agoMerge branch 'feature/gen-magic' into 'develop'
feld [Wed, 14 Oct 2020 17:31:45 +0000 (17:31 +0000)]
Merge branch 'feature/gen-magic' into 'develop'

Use libmagic via majic

Closes #1736

See merge request pleroma/pleroma!2534

4 years agoMerge branch 'refactor/locked_user_field' into 'develop'
Haelwenn [Wed, 14 Oct 2020 16:17:32 +0000 (16:17 +0000)]
Merge branch 'refactor/locked_user_field' into 'develop'

Change user.locked field to user.is_locked

See merge request pleroma/pleroma!3077

4 years agoUndo API breaking changes
Mark Felder [Wed, 14 Oct 2020 16:03:17 +0000 (11:03 -0500)]
Undo API breaking changes

4 years agoFinish undoing API breakage
Mark Felder [Wed, 14 Oct 2020 15:44:18 +0000 (10:44 -0500)]
Finish undoing API breakage

4 years agoUndo API breaking changes
Mark Felder [Wed, 14 Oct 2020 14:54:07 +0000 (09:54 -0500)]
Undo API breaking changes

4 years agoMissed tests
Mark Felder [Tue, 13 Oct 2020 21:15:28 +0000 (16:15 -0500)]
Missed tests

4 years agoMerge branch 'bugfix/file-consistency-prod' into 'develop'
Haelwenn [Tue, 13 Oct 2020 18:19:24 +0000 (18:19 +0000)]
Merge branch 'bugfix/file-consistency-prod' into 'develop'

Move Consistency.FileLocation to ./test

See merge request pleroma/pleroma!3079

4 years agoMove Consistency.FileLocation to ./test
Haelwenn (lanodan) Monnier [Tue, 13 Oct 2020 17:54:24 +0000 (19:54 +0200)]
Move Consistency.FileLocation to ./test

This fixes a compilation fail because of Credo's absence in MIX_ENV=prod

4 years agoCredo
Mark Felder [Tue, 13 Oct 2020 17:49:43 +0000 (12:49 -0500)]
Credo

4 years agoJPEG content_type must be image/jpeg
Mark Felder [Tue, 13 Oct 2020 15:37:24 +0000 (10:37 -0500)]
JPEG content_type must be image/jpeg

4 years agoMerge branch 'develop' into feature/gen-magic
Mark Felder [Tue, 13 Oct 2020 15:08:38 +0000 (10:08 -0500)]
Merge branch 'develop' into feature/gen-magic

4 years agoMerge branch 'develop' into refactor/locked_user_field
Mark Felder [Tue, 13 Oct 2020 14:54:29 +0000 (09:54 -0500)]
Merge branch 'develop' into refactor/locked_user_field

4 years agoMerge branch 'develop' into refactor/discoverable_user_field
Mark Felder [Tue, 13 Oct 2020 14:54:11 +0000 (09:54 -0500)]
Merge branch 'develop' into refactor/discoverable_user_field

4 years agoMerge branch 'feature/1822-files-consistency' into 'develop'
feld [Tue, 13 Oct 2020 14:47:29 +0000 (14:47 +0000)]
Merge branch 'feature/1822-files-consistency' into 'develop'

Feature/1822 files consistency

Closes #1822

See merge request pleroma/pleroma!2680

4 years agoChange user.discoverable field to user.is_discoverable
Mark Felder [Tue, 13 Oct 2020 14:45:08 +0000 (09:45 -0500)]
Change user.discoverable field to user.is_discoverable

4 years agoChange user.locked field to user.is_locked
Mark Felder [Tue, 13 Oct 2020 14:31:13 +0000 (09:31 -0500)]
Change user.locked field to user.is_locked

4 years agochanges after rebase
Alexander Strizhakov [Tue, 13 Oct 2020 14:10:34 +0000 (17:10 +0300)]
changes after rebase

4 years agomigration and warning for RemoteIp plug rename
Alexander Strizhakov [Sat, 19 Sep 2020 18:44:02 +0000 (21:44 +0300)]
migration and warning for RemoteIp plug rename

4 years agochanges after rebase
Alexander Strizhakov [Sat, 19 Sep 2020 18:25:01 +0000 (21:25 +0300)]
changes after rebase

4 years agocredo fix after rebase
Alexander Strizhakov [Sun, 13 Sep 2020 07:35:16 +0000 (10:35 +0300)]
credo fix after rebase

4 years agochanges after rebase
Alexander Strizhakov [Tue, 8 Sep 2020 15:35:07 +0000 (18:35 +0300)]
changes after rebase

4 years agofixes after rebase
Alexander Strizhakov [Wed, 2 Sep 2020 07:29:36 +0000 (10:29 +0300)]
fixes after rebase

4 years agorebase
Alexander Strizhakov [Wed, 19 Aug 2020 10:45:02 +0000 (13:45 +0300)]
rebase

4 years agochanges after rebase
Alexander Strizhakov [Sun, 16 Aug 2020 18:01:38 +0000 (21:01 +0300)]
changes after rebase

4 years agofixes after rebase
Alexander Strizhakov [Sun, 16 Aug 2020 17:28:31 +0000 (20:28 +0300)]
fixes after rebase

4 years agoexclude file_location check from coveralls
Alexander Strizhakov [Sun, 12 Jul 2020 14:29:02 +0000 (17:29 +0300)]
exclude file_location check from coveralls

4 years agofix after rebase
Alexander Strizhakov [Sun, 12 Jul 2020 14:06:23 +0000 (17:06 +0300)]
fix after rebase

4 years agofiles consistency after rebase
Alexander Strizhakov [Fri, 10 Jul 2020 10:02:24 +0000 (13:02 +0300)]
files consistency after rebase

4 years agofiles consistency for new files
Alexander Strizhakov [Wed, 8 Jul 2020 12:43:14 +0000 (15:43 +0300)]
files consistency for new files

4 years agofix after rebase
Alexander Strizhakov [Wed, 8 Jul 2020 12:41:53 +0000 (15:41 +0300)]
fix after rebase

4 years agoupdate files consistency after rebase
Alexander Strizhakov [Fri, 26 Jun 2020 05:38:22 +0000 (08:38 +0300)]
update files consistency after rebase

4 years agocopyright
Alexander Strizhakov [Wed, 24 Jun 2020 12:31:56 +0000 (15:31 +0300)]
copyright

4 years agoupdates after rebase
Alexander Strizhakov [Wed, 24 Jun 2020 11:11:05 +0000 (14:11 +0300)]
updates after rebase

4 years agospecial namespaces for phoenix and api_spec
Alexander Strizhakov [Wed, 24 Jun 2020 10:56:16 +0000 (13:56 +0300)]
special namespaces for phoenix and api_spec

4 years agoalias alphabetically order
Alexander Strizhakov [Wed, 24 Jun 2020 10:07:47 +0000 (13:07 +0300)]
alias alphabetically order

4 years agoAdminSecretAuthenticationPlug module name
Alexander Strizhakov [Wed, 24 Jun 2020 08:18:42 +0000 (11:18 +0300)]
AdminSecretAuthenticationPlug module name

4 years agoAuthenticationPlug module name
Alexander Strizhakov [Wed, 24 Jun 2020 08:16:09 +0000 (11:16 +0300)]
AuthenticationPlug module name

4 years agoBasicAuthDecoderPlug module name
Alexander Strizhakov [Wed, 24 Jun 2020 08:13:19 +0000 (11:13 +0300)]
BasicAuthDecoderPlug module name

4 years agoDigestPlug rename
Alexander Strizhakov [Wed, 24 Jun 2020 08:09:13 +0000 (11:09 +0300)]
DigestPlug rename

4 years agoCache plug module name
Alexander Strizhakov [Wed, 24 Jun 2020 08:08:43 +0000 (11:08 +0300)]
Cache plug module name

4 years agoEnsureAuthenticatedPlug module name
Alexander Strizhakov [Wed, 24 Jun 2020 07:55:56 +0000 (10:55 +0300)]
EnsureAuthenticatedPlug module name

4 years agoEnsurePublicOrAuthenticatedPlug module name
Alexander Strizhakov [Wed, 24 Jun 2020 07:53:10 +0000 (10:53 +0300)]
EnsurePublicOrAuthenticatedPlug module name

4 years agoEnsureUserKeyPlug module name
Alexander Strizhakov [Wed, 24 Jun 2020 07:49:18 +0000 (10:49 +0300)]
EnsureUserKeyPlug module name

4 years agoExpectAuthenticatedCheckPlug module name
Alexander Strizhakov [Wed, 24 Jun 2020 07:44:50 +0000 (10:44 +0300)]
ExpectAuthenticatedCheckPlug module name

4 years agoExpectPublicOrAuthenticatedCheckPlug module name
Alexander Strizhakov [Wed, 24 Jun 2020 07:43:19 +0000 (10:43 +0300)]
ExpectPublicOrAuthenticatedCheckPlug module name

4 years agoFederatingPlug module name
Alexander Strizhakov [Wed, 24 Jun 2020 07:41:09 +0000 (10:41 +0300)]
FederatingPlug module name

4 years agoHTTPSecurityPlug module name and filename
Alexander Strizhakov [Wed, 24 Jun 2020 07:39:17 +0000 (10:39 +0300)]
HTTPSecurityPlug module name and filename

4 years agoIdempotencyPlug module name
Alexander Strizhakov [Wed, 24 Jun 2020 07:09:39 +0000 (10:09 +0300)]
IdempotencyPlug module name

4 years agoInstanceStatic module name
Alexander Strizhakov [Wed, 24 Jun 2020 07:03:10 +0000 (10:03 +0300)]
InstanceStatic module name

4 years agoLegacyAuthenticationPlug module name
Alexander Strizhakov [Wed, 24 Jun 2020 07:01:40 +0000 (10:01 +0300)]
LegacyAuthenticationPlug module name

4 years agoOAuthPlug module name
Alexander Strizhakov [Wed, 24 Jun 2020 06:59:21 +0000 (09:59 +0300)]
OAuthPlug module name

4 years agoOAuthScopesPlug module name
Alexander Strizhakov [Wed, 24 Jun 2020 06:57:27 +0000 (09:57 +0300)]
OAuthScopesPlug module name

4 years agoPlugHelper module name
Alexander Strizhakov [Wed, 24 Jun 2020 06:42:36 +0000 (09:42 +0300)]
PlugHelper module name

4 years agoRateLimiter module name
Alexander Strizhakov [Wed, 24 Jun 2020 06:35:00 +0000 (09:35 +0300)]
RateLimiter module name

4 years agoRemoteIp module name
Alexander Strizhakov [Wed, 24 Jun 2020 06:30:32 +0000 (09:30 +0300)]
RemoteIp module name

4 years agoSessionAuthenticationPlug module name
Alexander Strizhakov [Wed, 24 Jun 2020 06:27:29 +0000 (09:27 +0300)]
SessionAuthenticationPlug module name

4 years agoSetFormatPlug module name
Alexander Strizhakov [Wed, 24 Jun 2020 06:26:17 +0000 (09:26 +0300)]
SetFormatPlug module name

4 years agoSetLocalePlug module name
Alexander Strizhakov [Wed, 24 Jun 2020 06:24:29 +0000 (09:24 +0300)]
SetLocalePlug module name

4 years agoSetUserSessionIdPlug module name
Alexander Strizhakov [Wed, 24 Jun 2020 06:07:39 +0000 (09:07 +0300)]
SetUserSessionIdPlug module name

4 years agoStaticFEPlug module name
Alexander Strizhakov [Wed, 24 Jun 2020 06:06:10 +0000 (09:06 +0300)]
StaticFEPlug module name

4 years agoTrailingFormatPlug module name
Alexander Strizhakov [Wed, 24 Jun 2020 06:05:23 +0000 (09:05 +0300)]
TrailingFormatPlug module name

4 years agoUploadedMedia module name
Alexander Strizhakov [Wed, 24 Jun 2020 06:03:48 +0000 (09:03 +0300)]
UploadedMedia module name

4 years agoUserEnabledPlug module name
Alexander Strizhakov [Wed, 24 Jun 2020 06:02:27 +0000 (09:02 +0300)]
UserEnabledPlug module name

4 years agoUserFetcherPlug module name
Alexander Strizhakov [Wed, 24 Jun 2020 06:00:44 +0000 (09:00 +0300)]
UserFetcherPlug module name

4 years agoUserIsAdminPlug module name
Alexander Strizhakov [Wed, 24 Jun 2020 05:59:35 +0000 (08:59 +0300)]
UserIsAdminPlug module name

4 years agofix for fallback controller
Alexander Strizhakov [Wed, 24 Jun 2020 05:43:20 +0000 (08:43 +0300)]
fix for fallback controller

4 years agorenaming LimiterSupervisor
Alexander Strizhakov [Wed, 24 Jun 2020 05:39:56 +0000 (08:39 +0300)]
renaming LimiterSupervisor

4 years agorenaming ratelimiter supervisor
Alexander Strizhakov [Wed, 24 Jun 2020 05:38:42 +0000 (08:38 +0300)]
renaming ratelimiter supervisor

4 years agomoving plugs into web dir
Alexander Strizhakov [Wed, 24 Jun 2020 05:35:22 +0000 (08:35 +0300)]
moving plugs into web dir

4 years agoother files consistency
Alexander Strizhakov [Tue, 23 Jun 2020 18:10:32 +0000 (21:10 +0300)]
other files consistency

4 years agomore files renamings
Alexander Strizhakov [Tue, 23 Jun 2020 17:02:53 +0000 (20:02 +0300)]
more files renamings

4 years agometadata providers consistency
Alexander Strizhakov [Tue, 23 Jun 2020 16:55:55 +0000 (19:55 +0300)]
metadata providers consistency

4 years agooauth consistency
Alexander Strizhakov [Tue, 23 Jun 2020 16:08:19 +0000 (19:08 +0300)]
oauth consistency

4 years agomore tests
Alexander Strizhakov [Tue, 23 Jun 2020 15:48:12 +0000 (18:48 +0300)]
more tests

4 years agorich media parser ttl files consistency
Alexander Strizhakov [Tue, 23 Jun 2020 15:33:03 +0000 (18:33 +0300)]
rich media parser ttl files consistency

4 years agotests consistency
Alexander Strizhakov [Tue, 23 Jun 2020 15:16:47 +0000 (18:16 +0300)]
tests consistency

4 years agomix tasks consistency
Alexander Strizhakov [Sat, 20 Jun 2020 16:09:04 +0000 (19:09 +0300)]
mix tasks consistency

4 years agofile locations consistency
Alexander Strizhakov [Sat, 20 Jun 2020 15:37:44 +0000 (18:37 +0300)]
file locations consistency

4 years agoUpdate AdminFE build to latest develop
Mark Felder [Tue, 13 Oct 2020 12:51:48 +0000 (07:51 -0500)]
Update AdminFE build to latest develop

4 years agoMerge branch 'preload-frontend-config' into 'develop'
lain [Tue, 13 Oct 2020 11:33:39 +0000 (11:33 +0000)]
Merge branch 'preload-frontend-config' into 'develop'

Preload `/api/pleroma/frontend_configurations`, fixes #1932

Closes #1932

See merge request pleroma/pleroma!3075