Egor Kislitsyn [Mon, 19 Oct 2020 11:40:03 +0000 (15:40 +0400)]
Merge branch 'develop' into mutes-blocks-pagination
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
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
Mark Felder [Sat, 17 Oct 2020 16:52:33 +0000 (11:52 -0500)]
Fix duplicate Added sections in the changelog
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
Mark Felder [Thu, 15 Oct 2020 21:39:01 +0000 (16:39 -0500)]
Merge branch 'develop' into refactor/discoverable_user_field
Haelwenn [Thu, 15 Oct 2020 21:03:48 +0000 (21:03 +0000)]
Apply 1 suggestion(s) to 1 file(s)
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
Maksim Pechnikov [Sat, 8 Aug 2020 03:49:19 +0000 (06:49 +0300)]
fix test
Maksim Pechnikov [Fri, 7 Aug 2020 12:55:08 +0000 (15:55 +0300)]
added generate the release env to `pleroma.instance gen`
Maksim Pechnikov [Wed, 5 Aug 2020 16:04:12 +0000 (19:04 +0300)]
fixed install docs
Maksim Pechnikov [Thu, 16 Jul 2020 13:35:09 +0000 (16:35 +0300)]
fix docs
Maksim [Thu, 16 Jul 2020 13:30:28 +0000 (13:30 +0000)]
Apply 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)
Maksim Pechnikov [Thu, 16 Jul 2020 05:52:14 +0000 (08:52 +0300)]
update task messages
Maksim Pechnikov [Tue, 14 Jul 2020 04:31:21 +0000 (07:31 +0300)]
added generated `pleroma.env`
lain [Thu, 15 Oct 2020 10:28:25 +0000 (12:28 +0200)]
ActivityPub: Show own replies to muted users.
Aligns mute with block behavior.
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
feld [Wed, 14 Oct 2020 19:33:54 +0000 (19:33 +0000)]
Apply 3 suggestion(s) to 3 file(s)
swentel [Wed, 14 Oct 2020 19:32:18 +0000 (21:32 +0200)]
Change handle and url of contact person for Indigenous client
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
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
Mark Felder [Wed, 14 Oct 2020 16:03:17 +0000 (11:03 -0500)]
Undo API breaking changes
Mark Felder [Wed, 14 Oct 2020 15:44:18 +0000 (10:44 -0500)]
Finish undoing API breakage
Mark Felder [Wed, 14 Oct 2020 14:54:07 +0000 (09:54 -0500)]
Undo API breaking changes
Mark Felder [Tue, 13 Oct 2020 21:15:28 +0000 (16:15 -0500)]
Missed tests
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
Egor Kislitsyn [Tue, 13 Oct 2020 17:58:26 +0000 (21:58 +0400)]
Update CHANGELOG
Egor Kislitsyn [Tue, 13 Oct 2020 17:58:18 +0000 (21:58 +0400)]
Add pagination for Mutes
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
Mark Felder [Tue, 13 Oct 2020 17:49:43 +0000 (12:49 -0500)]
Credo
Egor Kislitsyn [Tue, 13 Oct 2020 17:39:41 +0000 (21:39 +0400)]
Add pagination for Blocks
Mark Felder [Tue, 13 Oct 2020 15:37:24 +0000 (10:37 -0500)]
JPEG content_type must be image/jpeg
Mark Felder [Tue, 13 Oct 2020 15:08:38 +0000 (10:08 -0500)]
Merge branch 'develop' into feature/gen-magic
Mark Felder [Tue, 13 Oct 2020 14:54:29 +0000 (09:54 -0500)]
Merge branch 'develop' into refactor/locked_user_field
Mark Felder [Tue, 13 Oct 2020 14:54:11 +0000 (09:54 -0500)]
Merge branch 'develop' into refactor/discoverable_user_field
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
Mark Felder [Tue, 13 Oct 2020 14:45:08 +0000 (09:45 -0500)]
Change user.discoverable field to user.is_discoverable
Mark Felder [Tue, 13 Oct 2020 14:31:13 +0000 (09:31 -0500)]
Change user.locked field to user.is_locked
Alexander Strizhakov [Tue, 13 Oct 2020 14:10:34 +0000 (17:10 +0300)]
changes after rebase
Alexander Strizhakov [Sat, 19 Sep 2020 18:44:02 +0000 (21:44 +0300)]
migration and warning for RemoteIp plug rename
Alexander Strizhakov [Sat, 19 Sep 2020 18:25:01 +0000 (21:25 +0300)]
changes after rebase
Alexander Strizhakov [Sun, 13 Sep 2020 07:35:16 +0000 (10:35 +0300)]
credo fix after rebase
Alexander Strizhakov [Tue, 8 Sep 2020 15:35:07 +0000 (18:35 +0300)]
changes after rebase
Alexander Strizhakov [Wed, 2 Sep 2020 07:29:36 +0000 (10:29 +0300)]
fixes after rebase
Alexander Strizhakov [Wed, 19 Aug 2020 10:45:02 +0000 (13:45 +0300)]
rebase
Alexander Strizhakov [Sun, 16 Aug 2020 18:01:38 +0000 (21:01 +0300)]
changes after rebase
Alexander Strizhakov [Sun, 16 Aug 2020 17:28:31 +0000 (20:28 +0300)]
fixes after rebase
Alexander Strizhakov [Sun, 12 Jul 2020 14:29:02 +0000 (17:29 +0300)]
exclude file_location check from coveralls
Alexander Strizhakov [Sun, 12 Jul 2020 14:06:23 +0000 (17:06 +0300)]
fix after rebase
Alexander Strizhakov [Fri, 10 Jul 2020 10:02:24 +0000 (13:02 +0300)]
files consistency after rebase
Alexander Strizhakov [Wed, 8 Jul 2020 12:43:14 +0000 (15:43 +0300)]
files consistency for new files
Alexander Strizhakov [Wed, 8 Jul 2020 12:41:53 +0000 (15:41 +0300)]
fix after rebase
Alexander Strizhakov [Fri, 26 Jun 2020 05:38:22 +0000 (08:38 +0300)]
update files consistency after rebase
Alexander Strizhakov [Wed, 24 Jun 2020 12:31:56 +0000 (15:31 +0300)]
copyright
Alexander Strizhakov [Wed, 24 Jun 2020 11:11:05 +0000 (14:11 +0300)]
updates after rebase
Alexander Strizhakov [Wed, 24 Jun 2020 10:56:16 +0000 (13:56 +0300)]
special namespaces for phoenix and api_spec
Alexander Strizhakov [Wed, 24 Jun 2020 10:07:47 +0000 (13:07 +0300)]
alias alphabetically order
Alexander Strizhakov [Wed, 24 Jun 2020 08:18:42 +0000 (11:18 +0300)]
AdminSecretAuthenticationPlug module name
Alexander Strizhakov [Wed, 24 Jun 2020 08:16:09 +0000 (11:16 +0300)]
AuthenticationPlug module name
Alexander Strizhakov [Wed, 24 Jun 2020 08:13:19 +0000 (11:13 +0300)]
BasicAuthDecoderPlug module name
Alexander Strizhakov [Wed, 24 Jun 2020 08:09:13 +0000 (11:09 +0300)]
DigestPlug rename
Alexander Strizhakov [Wed, 24 Jun 2020 08:08:43 +0000 (11:08 +0300)]
Cache plug module name
Alexander Strizhakov [Wed, 24 Jun 2020 07:55:56 +0000 (10:55 +0300)]
EnsureAuthenticatedPlug module name
Alexander Strizhakov [Wed, 24 Jun 2020 07:53:10 +0000 (10:53 +0300)]
EnsurePublicOrAuthenticatedPlug module name
Alexander Strizhakov [Wed, 24 Jun 2020 07:49:18 +0000 (10:49 +0300)]
EnsureUserKeyPlug module name
Alexander Strizhakov [Wed, 24 Jun 2020 07:44:50 +0000 (10:44 +0300)]
ExpectAuthenticatedCheckPlug module name
Alexander Strizhakov [Wed, 24 Jun 2020 07:43:19 +0000 (10:43 +0300)]
ExpectPublicOrAuthenticatedCheckPlug module name
Alexander Strizhakov [Wed, 24 Jun 2020 07:41:09 +0000 (10:41 +0300)]
FederatingPlug module name
Alexander Strizhakov [Wed, 24 Jun 2020 07:39:17 +0000 (10:39 +0300)]
HTTPSecurityPlug module name and filename
Alexander Strizhakov [Wed, 24 Jun 2020 07:09:39 +0000 (10:09 +0300)]
IdempotencyPlug module name
Alexander Strizhakov [Wed, 24 Jun 2020 07:03:10 +0000 (10:03 +0300)]
InstanceStatic module name
Alexander Strizhakov [Wed, 24 Jun 2020 07:01:40 +0000 (10:01 +0300)]
LegacyAuthenticationPlug module name
Alexander Strizhakov [Wed, 24 Jun 2020 06:59:21 +0000 (09:59 +0300)]
OAuthPlug module name
Alexander Strizhakov [Wed, 24 Jun 2020 06:57:27 +0000 (09:57 +0300)]
OAuthScopesPlug module name
Alexander Strizhakov [Wed, 24 Jun 2020 06:42:36 +0000 (09:42 +0300)]
PlugHelper module name
Alexander Strizhakov [Wed, 24 Jun 2020 06:35:00 +0000 (09:35 +0300)]
RateLimiter module name
Alexander Strizhakov [Wed, 24 Jun 2020 06:30:32 +0000 (09:30 +0300)]
RemoteIp module name
Alexander Strizhakov [Wed, 24 Jun 2020 06:27:29 +0000 (09:27 +0300)]
SessionAuthenticationPlug module name
Alexander Strizhakov [Wed, 24 Jun 2020 06:26:17 +0000 (09:26 +0300)]
SetFormatPlug module name
Alexander Strizhakov [Wed, 24 Jun 2020 06:24:29 +0000 (09:24 +0300)]
SetLocalePlug module name
Alexander Strizhakov [Wed, 24 Jun 2020 06:07:39 +0000 (09:07 +0300)]
SetUserSessionIdPlug module name
Alexander Strizhakov [Wed, 24 Jun 2020 06:06:10 +0000 (09:06 +0300)]
StaticFEPlug module name
Alexander Strizhakov [Wed, 24 Jun 2020 06:05:23 +0000 (09:05 +0300)]
TrailingFormatPlug module name
Alexander Strizhakov [Wed, 24 Jun 2020 06:03:48 +0000 (09:03 +0300)]
UploadedMedia module name
Alexander Strizhakov [Wed, 24 Jun 2020 06:02:27 +0000 (09:02 +0300)]
UserEnabledPlug module name
Alexander Strizhakov [Wed, 24 Jun 2020 06:00:44 +0000 (09:00 +0300)]
UserFetcherPlug module name
Alexander Strizhakov [Wed, 24 Jun 2020 05:59:35 +0000 (08:59 +0300)]
UserIsAdminPlug module name
Alexander Strizhakov [Wed, 24 Jun 2020 05:43:20 +0000 (08:43 +0300)]
fix for fallback controller
Alexander Strizhakov [Wed, 24 Jun 2020 05:39:56 +0000 (08:39 +0300)]
renaming LimiterSupervisor
Alexander Strizhakov [Wed, 24 Jun 2020 05:38:42 +0000 (08:38 +0300)]
renaming ratelimiter supervisor
Alexander Strizhakov [Wed, 24 Jun 2020 05:35:22 +0000 (08:35 +0300)]
moving plugs into web dir
Alexander Strizhakov [Tue, 23 Jun 2020 18:10:32 +0000 (21:10 +0300)]
other files consistency
Alexander Strizhakov [Tue, 23 Jun 2020 17:02:53 +0000 (20:02 +0300)]
more files renamings
Alexander Strizhakov [Tue, 23 Jun 2020 16:55:55 +0000 (19:55 +0300)]
metadata providers consistency
Alexander Strizhakov [Tue, 23 Jun 2020 16:08:19 +0000 (19:08 +0300)]
oauth consistency
Alexander Strizhakov [Tue, 23 Jun 2020 15:48:12 +0000 (18:48 +0300)]
more tests
Alexander Strizhakov [Tue, 23 Jun 2020 15:33:03 +0000 (18:33 +0300)]
rich media parser ttl files consistency
Alexander Strizhakov [Tue, 23 Jun 2020 15:16:47 +0000 (18:16 +0300)]
tests consistency
Alexander Strizhakov [Sat, 20 Jun 2020 16:09:04 +0000 (19:09 +0300)]
mix tasks consistency
projects / akkoma / log