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

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

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 '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.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

4 years agoPreload `/api/pleroma/frontend_configurations`, fixes #1932
Alex Gleason [Mon, 12 Oct 2020 23:49:37 +0000 (18:49 -0500)]
Preload `/api/pleroma/frontend_configurations`, fixes #1932

4 years agoMerge branch 'docs/improve-backup-restore' into 'develop'
feld [Mon, 12 Oct 2020 17:46:25 +0000 (17:46 +0000)]
Merge branch 'docs/improve-backup-restore' into 'develop'

Further improvements to backup/restore docs

See merge request pleroma/pleroma!3072

4 years agoMerge branch 'improve/instance-gen' into 'develop'
feld [Mon, 12 Oct 2020 17:24:24 +0000 (17:24 +0000)]
Merge branch 'improve/instance-gen' into 'develop'

#2159 Support enabling upload filters during instance gen

See merge request pleroma/pleroma!3070

4 years agoFurther improvements
Mark Felder [Mon, 12 Oct 2020 17:23:20 +0000 (12:23 -0500)]
Further improvements

4 years agoMerge branch 'chore/copyright-headers' into 'develop'
feld [Mon, 12 Oct 2020 17:20:09 +0000 (17:20 +0000)]
Merge branch 'chore/copyright-headers' into 'develop'

Add missing Copyright headers

See merge request pleroma/pleroma!3071

4 years agoAdd missing Copyright headers
Mark Felder [Mon, 12 Oct 2020 17:00:50 +0000 (12:00 -0500)]
Add missing Copyright headers

4 years agoSupport enabling upload filters during instance gen
Mark Felder [Mon, 12 Oct 2020 16:18:39 +0000 (11:18 -0500)]
Support enabling upload filters during instance gen

4 years agoMerge branch 'feat/deep-link-account-approval' into 'develop'
feld [Fri, 9 Oct 2020 22:35:09 +0000 (22:35 +0000)]
Merge branch 'feat/deep-link-account-approval' into 'develop'

Deep link to the user account in AdminFE in account confirmation emails

See merge request pleroma/pleroma!3065

4 years agoDeep link to the user account in AdminFE in account confirmation emails
Mark Felder [Fri, 9 Oct 2020 22:08:05 +0000 (17:08 -0500)]
Deep link to the user account in AdminFE in account confirmation emails

4 years agoMerge branch 'docs/improve-backup-restore' into 'develop'
feld [Fri, 9 Oct 2020 16:30:35 +0000 (16:30 +0000)]
Merge branch 'docs/improve-backup-restore' into 'develop'

Spelling

See merge request pleroma/pleroma!3063

4 years agoSpelling
Mark Felder [Fri, 9 Oct 2020 16:18:48 +0000 (11:18 -0500)]
Spelling

4 years agoMerge branch 'docs/improve-backup-restore' into 'develop'
feld [Fri, 9 Oct 2020 14:25:24 +0000 (14:25 +0000)]
Merge branch 'docs/improve-backup-restore' into 'develop'

#2219 Improve backup/restore documentation

See merge request pleroma/pleroma!3061

4 years agoAsk user to use matching values for database setup
Mark Felder [Thu, 8 Oct 2020 21:00:42 +0000 (16:00 -0500)]
Ask user to use matching values for database setup

4 years agoSyntax error
Mark Felder [Thu, 8 Oct 2020 20:56:37 +0000 (15:56 -0500)]
Syntax error

4 years agoDon't always need to drop
Mark Felder [Thu, 8 Oct 2020 20:54:28 +0000 (15:54 -0500)]
Don't always need to drop

4 years agoImprove backup/restore documentation
Mark Felder [Thu, 8 Oct 2020 20:51:56 +0000 (15:51 -0500)]
Improve backup/restore documentation

4 years agoMerge branch 'fix/2209-remoteip' into 'develop'
Haelwenn [Thu, 8 Oct 2020 17:29:00 +0000 (17:29 +0000)]
Merge branch 'fix/2209-remoteip' into 'develop'

#2209 RemoteIP CIDR helper, config and doc improvements

See merge request pleroma/pleroma!3057

4 years agoLint
Mark Felder [Wed, 7 Oct 2020 20:07:03 +0000 (15:07 -0500)]
Lint

4 years agoApply 1 suggestion(s) to 1 file(s)
Maksim [Wed, 7 Oct 2020 19:32:42 +0000 (19:32 +0000)]
Apply 1 suggestion(s) to 1 file(s)

4 years agoApply 1 suggestion(s) to 1 file(s)
Maksim [Wed, 7 Oct 2020 19:32:09 +0000 (19:32 +0000)]
Apply 1 suggestion(s) to 1 file(s)

4 years agoApply 2 suggestion(s) to 2 file(s)
feld [Wed, 7 Oct 2020 19:16:53 +0000 (19:16 +0000)]
Apply 2 suggestion(s) to 2 file(s)

4 years agoImprove description yet again
Mark Felder [Tue, 6 Oct 2020 22:36:29 +0000 (17:36 -0500)]
Improve description yet again

4 years agoDon't leak internal variables in the docs. They're useless to users.
Mark Felder [Tue, 6 Oct 2020 22:29:56 +0000 (17:29 -0500)]
Don't leak internal variables in the docs. They're useless to users.

4 years agoCredo
Mark Felder [Tue, 6 Oct 2020 22:26:31 +0000 (17:26 -0500)]
Credo

4 years agoImprove descriptions for reserved and proxies
Mark Felder [Tue, 6 Oct 2020 22:21:27 +0000 (17:21 -0500)]
Improve descriptions for reserved and proxies

4 years agoAdd test for an entry without CIDR format
Mark Felder [Tue, 6 Oct 2020 22:08:26 +0000 (17:08 -0500)]
Add test for an entry without CIDR format

4 years agoMove hardcoded default configuration into config.exs
Mark Felder [Tue, 6 Oct 2020 22:02:46 +0000 (17:02 -0500)]
Move hardcoded default configuration into config.exs

4 years agoFix docs for default headers used by RemoteIp. We only use X-Forwarded-For by default.
Mark Felder [Tue, 6 Oct 2020 20:47:11 +0000 (15:47 -0500)]
Fix docs for default headers used by RemoteIp. We only use X-Forwarded-For by default.

4 years agoMerge branch 'revert/rich-media-censorship' into 'develop'
feld [Tue, 6 Oct 2020 20:19:39 +0000 (20:19 +0000)]
Merge branch 'revert/rich-media-censorship' into 'develop'

#2192 Revert Rich Media censorship for sensitive statuses

See merge request pleroma/pleroma!3044

4 years agoDocument the NSFW link preview change
Mark Felder [Tue, 6 Oct 2020 19:54:21 +0000 (14:54 -0500)]
Document the NSFW link preview change

4 years agoMerge branch 'develop' into revert/rich-media-censorship
Mark Felder [Tue, 6 Oct 2020 19:25:20 +0000 (14:25 -0500)]
Merge branch 'develop' into revert/rich-media-censorship