feld [Tue, 27 Oct 2020 22:13:50 +0000 (22:13 +0000)]
Merge branch 'develop' into 'feature/autofollowing'
# Conflicts:
# CHANGELOG.md
feld [Tue, 27 Oct 2020 20:05:09 +0000 (20:05 +0000)]
Merge branch 'fix/prometheus-test' into 'develop'
phoenix_controller_render_duration is no longer available in telemetry of Phoenix 1.5+
See merge request pleroma/pleroma!3105
Mark Felder [Tue, 27 Oct 2020 19:37:48 +0000 (14:37 -0500)]
phoenix_controller_render_duration is no longer available in telemetry of Phoenix 1.5+
feld [Tue, 27 Oct 2020 17:47:56 +0000 (17:47 +0000)]
Merge branch '1668-prometheus-access-restrictions' into 'develop'
[#1668] App metrics endpoint (Prometheus) access restrictions
Closes #1668
See merge request pleroma/pleroma!3093
feld [Tue, 27 Oct 2020 17:42:24 +0000 (17:42 +0000)]
Merge branch 'develop' into 'feature/autofollowing'
# Conflicts:
# CHANGELOG.md
lain [Mon, 26 Oct 2020 15:59:10 +0000 (15:59 +0000)]
Merge branch 'docs/clients-apc2s' into 'develop'
clients.md: Add AndStatus, note supported protocols
See merge request pleroma/pleroma!3104
rinpatch [Mon, 26 Oct 2020 11:33:16 +0000 (11:33 +0000)]
Merge branch 'patch-1' into 'develop'
Fix link reference
See merge request pleroma/pleroma!3103
Haelwenn (lanodan) Monnier [Mon, 26 Oct 2020 02:23:47 +0000 (03:23 +0100)]
clients.md: Add AndStatus, note supported protocols
Haelwenn [Mon, 26 Oct 2020 02:09:20 +0000 (02:09 +0000)]
Merge branch 'docs/ap_c2s' into 'develop'
AP C2S: Document our additional endpoints
See merge request pleroma/pleroma!3056
Kana [Sun, 25 Oct 2020 08:28:17 +0000 (08:28 +0000)]
Fix link reference
Haelwenn [Fri, 23 Oct 2020 23:29:17 +0000 (23:29 +0000)]
Merge branch 'fix/sendmail' into 'develop'
Fix ability to use sendmail on Linux distros with systemd
See merge request pleroma/pleroma!3102
Mark Felder [Fri, 23 Oct 2020 20:32:32 +0000 (15:32 -0500)]
NoNewPrivileges breaks ability to send email via sendmail because it restricts ability to run setuid/setgid binaries
rinpatch [Fri, 23 Oct 2020 19:39:42 +0000 (19:39 +0000)]
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
Haelwenn [Thu, 22 Oct 2020 22:26:47 +0000 (22:26 +0000)]
Merge branch 'weblate-pleroma-pleroma' into 'develop'
Translations update from Weblate
See merge request pleroma/pleroma!3100
shironeko [Thu, 22 Oct 2020 08:59:44 +0000 (08:59 +0000)]
Translated using Weblate (Chinese (Simplified))
Currently translated at 45.2% (48 of 106 strings)
Translation: Pleroma/Pleroma backend
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/zh_Hans/
feld [Thu, 22 Oct 2020 20:33:52 +0000 (20:33 +0000)]
Merge branch 'chore/elixir-1.11' into 'develop'
Elixir 1.11 compatibility / Phoenix 1.5+
See merge request pleroma/pleroma!3059
Ivan Tashkinov [Thu, 22 Oct 2020 14:58:25 +0000 (17:58 +0300)]
[#3059] Used forked prometheus-phx to remove log spam.
Ivan Tashkinov [Thu, 22 Oct 2020 11:07:33 +0000 (14:07 +0300)]
[#3059] Formatting fix.
rinpatch [Thu, 22 Oct 2020 10:56:17 +0000 (10:56 +0000)]
Merge branch '2257-self-chat' into 'develop'
Resolve "Can't message yourself in a chat (but can start it)"
Closes #2257
See merge request pleroma/pleroma!3099
Ivan Tashkinov [Thu, 22 Oct 2020 10:54:15 +0000 (13:54 +0300)]
[#3059] Fixed Phoenix 1.5 telemetry processing.
lain [Thu, 22 Oct 2020 10:23:07 +0000 (12:23 +0200)]
Changelog: Add information about self-chats
lain [Thu, 22 Oct 2020 10:22:08 +0000 (12:22 +0200)]
SideEffects: Correctly handle chat messages sent to yourself
Haelwenn [Tue, 20 Oct 2020 21:15:48 +0000 (21:15 +0000)]
Merge branch 'bugfix/ci-majic-release' into 'develop'
CI: Install libmagic-dev in debian release targets
See merge request pleroma/pleroma!3096
Haelwenn (lanodan) Monnier [Tue, 20 Oct 2020 20:10:20 +0000 (22:10 +0200)]
CI: Install libmagic-dev in debian release targets
Ivan Tashkinov [Tue, 20 Oct 2020 13:18:24 +0000 (16:18 +0300)]
[#1668] Formatting fix.
Ivan Tashkinov [Tue, 20 Oct 2020 12:13:20 +0000 (15:13 +0300)]
[#1668] Added :prometheus group config to config/description.exs.
Haelwenn [Tue, 20 Oct 2020 00:47:44 +0000 (00:47 +0000)]
Merge branch 'bugfix/ci-majic-release' into 'develop'
CI: Install file-dev in alpine release targets
See merge request pleroma/pleroma!3095
Haelwenn (lanodan) Monnier [Tue, 20 Oct 2020 00:36:45 +0000 (02:36 +0200)]
CI: Install file-dev in alpine release targets
Haelwenn [Mon, 19 Oct 2020 23:16:24 +0000 (23:16 +0000)]
Merge branch 'fix/autofollower-suggestions' into 'develop'
Remove suggestions for autofollower_nicknames
See merge request pleroma/pleroma!3088
lain [Mon, 19 Oct 2020 13:46:24 +0000 (15:46 +0200)]
Transmogrifier: Refactor and unify incoming tag handling
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.
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
Ivan Tashkinov [Sun, 18 Oct 2020 18:22:21 +0000 (21:22 +0300)]
[#1668] Restricted access to app metrics endpoint by default. Added ability to configure IP whitelist for this endpoint.
Added tests and documentation.
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:54:05 +0000 (16:54 +0000)]
Document autofollowing_nicknames
Mark Felder [Sat, 17 Oct 2020 16:52:33 +0000 (11:52 -0500)]
Fix duplicate Added sections in the changelog
Ivan Tashkinov [Sat, 17 Oct 2020 14:53:47 +0000 (17:53 +0300)]
Merge remote-tracking branch 'remotes/origin/develop' into chore/elixir-1.11
Mark Felder [Fri, 16 Oct 2020 17:43:44 +0000 (17:43 +0000)]
Remove suggestions
Mark Felder [Fri, 16 Oct 2020 17:41:44 +0000 (17:41 +0000)]
The suggestions are problematic as they need to be real local account names
Mark Felder [Fri, 16 Oct 2020 17:32:05 +0000 (17:32 +0000)]
Adds feature to permit e.g., local admins and community moderators to automatically follow all newly registered accounts
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`
Egor Kislitsyn [Thu, 15 Oct 2020 14:05:54 +0000 (18:05 +0400)]
Update dependencies
Egor Kislitsyn [Thu, 15 Oct 2020 12:54:59 +0000 (16:54 +0400)]
Fix warnings
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
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
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:53 +0000 (09:54 -0500)]
Merge branch 'develop' into chore/elixir-1.11
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
projects / akkoma / log