lain [Wed, 4 Nov 2020 14:05:01 +0000 (15:05 +0100)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma-restrict-domain
lain [Wed, 4 Nov 2020 13:48:15 +0000 (13:48 +0000)]
Merge branch 'hide-muted-chats' into 'develop'
Hide chats from muted users
Closes #2230
See merge request pleroma/pleroma!3116
Egor Kislitsyn [Wed, 4 Nov 2020 12:40:12 +0000 (16:40 +0400)]
Add `with_muted` param to ChatController.index/2
lain [Tue, 3 Nov 2020 13:12:39 +0000 (13:12 +0000)]
Merge branch 'chores/pleroma-favicon-logo' into 'develop'
favicon: Use images/pleroma_logo_vector_bg_32.png from pleroma.social
Closes #2270
See merge request pleroma/pleroma!3115
lain [Tue, 3 Nov 2020 13:11:36 +0000 (13:11 +0000)]
Merge branch 'patch-4' into 'develop'
ConversationView: add current user to conversations, according to Mastodon behaviour, fix last_status.account being not filled
Closes #2217
See merge request pleroma/pleroma!3089
lain [Tue, 3 Nov 2020 12:56:12 +0000 (13:56 +0100)]
Conversations: A few refactors
lain [Tue, 3 Nov 2020 12:45:09 +0000 (13:45 +0100)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into a1batross/pleroma-patch-4
Haelwenn (lanodan) Monnier [Mon, 2 Nov 2020 05:11:14 +0000 (06:11 +0100)]
favicon: Update to pleroma logo, provided by @shpuld
Closes: https://git.pleroma.social/pleroma/pleroma/-/issues/2270
Haelwenn [Tue, 3 Nov 2020 01:00:12 +0000 (01:00 +0000)]
Merge branch 'fix/get_report_with_notes' into 'develop'
Permit fetching individual reports with notes preloaded
See merge request pleroma/pleroma!3118
feld [Mon, 2 Nov 2020 23:28:16 +0000 (23:28 +0000)]
Merge branch 'chore/deps-from-git' into 'develop'
Ensure URLs for git repos end in .git for older git clients like on CentOS 7
See merge request pleroma/pleroma!3119
Mark Felder [Mon, 2 Nov 2020 23:09:56 +0000 (17:09 -0600)]
Ensure URLs for git repos end in .git for older git clients like on CentOS 7
Mark Felder [Mon, 2 Nov 2020 21:49:07 +0000 (15:49 -0600)]
Test the note is returned when fetching a single report
Mark Felder [Mon, 2 Nov 2020 18:19:44 +0000 (12:19 -0600)]
Permit fetching individual reports with notes preloaded
Egor Kislitsyn [Mon, 2 Nov 2020 13:51:54 +0000 (17:51 +0400)]
Hide chats from muted users
lain [Mon, 2 Nov 2020 12:08:20 +0000 (12:08 +0000)]
Merge branch 'bugfix/poll_replies_count' into 'develop'
side_effects: Don’t increase_replies_count when it’s an Answer
Closes #2274
See merge request pleroma/pleroma!3114
Haelwenn (lanodan) Monnier [Mon, 2 Nov 2020 04:43:06 +0000 (05:43 +0100)]
side_effects: Don’t increase_replies_count when it’s an Answer
feld [Sun, 1 Nov 2020 19:31:17 +0000 (19:31 +0000)]
Merge branch 'tesla-get-to-pleroma' into 'develop'
Use Pleroma.HTTP instead of Tesla
Closes #2275
See merge request pleroma/pleroma!3113
Ekaterina Vaartis [Sun, 1 Nov 2020 09:05:39 +0000 (12:05 +0300)]
Use Pleroma.HTTP instead of Tesla
Closes #2275
As discovered in the issue, captcha used Tesla.get instead of
Pleroma.HTTP. I've also grep'ed the repo and changed the other place
where this was used.
feld [Sat, 31 Oct 2020 17:03:40 +0000 (17:03 +0000)]
Merge branch 'feature/account-export' into 'develop'
Add account export
Closes #847
See merge request pleroma/pleroma!2918
feld [Sat, 31 Oct 2020 17:01:29 +0000 (17:01 +0000)]
Merge branch 'idempotency-key-optimistic-posting' into 'develop'
Add `idempotency_key` to the chat message entity
Closes #2126
See merge request pleroma/pleroma!3015
eugenijm [Sat, 31 Oct 2020 02:50:48 +0000 (05:50 +0300)]
Add idempotency_key to the chat_message entity.
Egor Kislitsyn [Fri, 30 Oct 2020 20:26:11 +0000 (00:26 +0400)]
Fix credo warning
Egor Kislitsyn [Fri, 30 Oct 2020 20:17:33 +0000 (00:17 +0400)]
Merge remote-tracking branch 'origin/develop' into feature/account-export
feld [Fri, 30 Oct 2020 17:28:58 +0000 (17:28 +0000)]
Merge branch 'remove-unused-aliases' into 'develop'
Remove unused aliases
See merge request pleroma/pleroma!3111
Egor Kislitsyn [Fri, 30 Oct 2020 15:34:02 +0000 (19:34 +0400)]
Merge remote-tracking branch 'origin/develop' into feature/account-export
Egor Kislitsyn [Fri, 30 Oct 2020 12:39:14 +0000 (16:39 +0400)]
Remove unused aliases
Alibek Omarov [Fri, 30 Oct 2020 12:37:15 +0000 (13:37 +0100)]
ConversationViewTest: fix test
Alibek Omarov [Fri, 30 Oct 2020 12:25:13 +0000 (13:25 +0100)]
ConversationView: fix formatting
Alibek Omarov [Fri, 30 Oct 2020 12:10:19 +0000 (13:10 +0100)]
ConversationControllerTest: fix test, fix formatting
Alibek Omarov [Fri, 30 Oct 2020 12:07:01 +0000 (13:07 +0100)]
Add entry in changelog
Alibek Omarov [Fri, 30 Oct 2020 12:01:58 +0000 (13:01 +0100)]
ConversationView: fix last_status.account being empty, fix current user being included in group conversations
Alibek Omarov [Sun, 18 Oct 2020 19:12:42 +0000 (19:12 +0000)]
ConversationViewTest: fix test #2
Alibek Omarov [Sun, 18 Oct 2020 16:01:17 +0000 (16:01 +0000)]
ConversationViewTest: fix test
Alibek Omarov [Sun, 18 Oct 2020 15:58:06 +0000 (15:58 +0000)]
ConversationControllerTest: fix test
Alibek Omarov [Fri, 16 Oct 2020 18:28:27 +0000 (18:28 +0000)]
ConversationView: add current user to conversations, according to Mastodon behaviour
Haelwenn [Thu, 29 Oct 2020 23:39:15 +0000 (23:39 +0000)]
Merge branch 'issue/2069' into 'develop'
[#2069] unread_conversation_count
See merge request pleroma/pleroma!2939
feld [Thu, 29 Oct 2020 21:06:42 +0000 (21:06 +0000)]
Merge branch 'fix/frontend-cli-docs' into 'develop'
Fix formatting and typos in "Managing frontends" guide
See merge request pleroma/pleroma!3098
feld [Thu, 29 Oct 2020 21:06:15 +0000 (21:06 +0000)]
Merge branch 'issue/2137-user-filters-admin-fe' into 'develop'
[#2137] admin/users filters
See merge request pleroma/pleroma!3016
feld [Thu, 29 Oct 2020 21:02:35 +0000 (21:02 +0000)]
Merge branch 'mutes-blocks-pagination' into 'develop'
Support pagination of blocks and mutes
Closes #642
See merge request pleroma/pleroma!3080
feld [Thu, 29 Oct 2020 19:39:23 +0000 (19:39 +0000)]
Merge branch 'fix/mrf-keyword-description' into 'develop'
Improve Keyword descriptions for AdminFE
See merge request pleroma/pleroma!3110
Mark Felder [Thu, 29 Oct 2020 19:22:07 +0000 (14:22 -0500)]
Improve Keyword descriptions for AdminFE
Egor Kislitsyn [Thu, 29 Oct 2020 11:35:42 +0000 (15:35 +0400)]
Merge remote-tracking branch 'origin/develop' into mutes-blocks-pagination
feld [Thu, 29 Oct 2020 07:18:49 +0000 (07:18 +0000)]
Merge branch 'bugfix/admin-api-account-view-is-discoverable-fix' into 'develop'
Fix: User.is_discoverable attribute rendering in Admin API User view
See merge request pleroma/pleroma!3107
Ivan Tashkinov [Wed, 28 Oct 2020 19:29:52 +0000 (22:29 +0300)]
Fixed User.is_discoverable attribute rendering in Admin API User view.
feld [Wed, 28 Oct 2020 18:08:51 +0000 (18:08 +0000)]
Merge branch 'ostatus-controller-no-auth-check-on-non-federating-instances' into 'develop'
OStatus / Static FE access control fixes
See merge request pleroma/pleroma!3053
Ivan Tashkinov [Wed, 28 Oct 2020 16:09:38 +0000 (19:09 +0300)]
@doc fix.
Ivan Tashkinov [Wed, 28 Oct 2020 16:03:40 +0000 (19:03 +0300)]
Merge remote-tracking branch 'remotes/origin/develop' into ostatus-controller-no-auth-check-on-non-federating-instances
# Conflicts:
# CHANGELOG.md
feld [Wed, 28 Oct 2020 15:06:47 +0000 (15:06 +0000)]
Merge branch 'issue/2261' into 'develop'
[#2261] FrontStatic plug: excluded invalid url
See merge request pleroma/pleroma!3106
Mark Felder [Wed, 28 Oct 2020 13:48:26 +0000 (08:48 -0500)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into issue/2261
Egor Kislitsyn [Wed, 28 Oct 2020 11:33:36 +0000 (15:33 +0400)]
Merge remote-tracking branch 'origin/develop' into feature/account-export
Egor Kislitsyn [Wed, 28 Oct 2020 11:32:44 +0000 (15:32 +0400)]
Fix warning
feld [Tue, 27 Oct 2020 22:55:31 +0000 (22:55 +0000)]
Merge branch 'feature/autofollowing' into 'develop'
autofollowing_nicknames
See merge request pleroma/pleroma!3087
Haelwenn [Tue, 27 Oct 2020 22:44:31 +0000 (22:44 +0000)]
Merge branch '2236-no-name' into 'develop'
Resolve "Account cannot be fetched by some instances"
Closes #2236
See merge request pleroma/pleroma!3101
feld [Tue, 27 Oct 2020 22:13:50 +0000 (22:13 +0000)]
Merge branch 'develop' into 'feature/autofollowing'
# Conflicts:
# CHANGELOG.md
Mark Felder [Tue, 27 Oct 2020 20:16:22 +0000 (15:16 -0500)]
Merge branch 'develop' into feature/account-export
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
Maksim Pechnikov [Tue, 27 Oct 2020 19:58:55 +0000 (22:58 +0300)]
FrontStatic plug: excluded invalid url
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+
Mark Felder [Tue, 27 Oct 2020 17:54:33 +0000 (12:54 -0500)]
Merge branch 'develop' into feature/account-export
Mark Felder [Tue, 27 Oct 2020 17:51:31 +0000 (12:51 -0500)]
Merge branch 'develop' into feature/account-export
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
lain [Mon, 26 Oct 2020 15:33:26 +0000 (16:33 +0100)]
ActivityPub: Add back debug call + explanation.
lain [Mon, 26 Oct 2020 15:30:48 +0000 (16:30 +0100)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 2236-no-name
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
lain [Fri, 23 Oct 2020 11:55:08 +0000 (13:55 +0200)]
Changelog: Add info about whitespace name remote users.
lain [Fri, 23 Oct 2020 11:53:01 +0000 (13:53 +0200)]
User: Correctly handle whitespace names.
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
Maksim Pechnikov [Thu, 22 Oct 2020 09:04:23 +0000 (12:04 +0300)]
fix module name
Maksim Pechnikov [Fri, 25 Sep 2020 13:50:47 +0000 (16:50 +0300)]
update changelog
Maksim Pechnikov [Fri, 25 Sep 2020 13:40:50 +0000 (16:40 +0300)]
update docs
Maksim Pechnikov [Fri, 25 Sep 2020 13:37:55 +0000 (16:37 +0300)]
admin api: added user filters by `actor_types`
Maksim Pechnikov [Fri, 25 Sep 2020 13:04:01 +0000 (16:04 +0300)]
admin user search: added filter by `actor_type`
Maksim Pechnikov [Fri, 25 Sep 2020 06:39:49 +0000 (09:39 +0300)]
need_confirmed -> unconfirmed
Maksim Pechnikov [Mon, 21 Sep 2020 12:01:03 +0000 (15:01 +0300)]
added AdminApi.UserController
Maksim Pechnikov [Mon, 21 Sep 2020 06:33:51 +0000 (09:33 +0300)]
added 'unconfirmed' filter to admin/users
Egor Kislitsyn [Wed, 21 Oct 2020 17:42:21 +0000 (21:42 +0400)]
Fix formatting and typos in "Managing frontends" guide
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
Egor Kislitsyn [Tue, 20 Oct 2020 13:47:04 +0000 (17:47 +0400)]
Fix credo warnings
Egor Kislitsyn [Tue, 20 Oct 2020 13:27:29 +0000 (17:27 +0400)]
Merge remote-tracking branch 'origin/develop' into feature/account-export
Ivan Tashkinov [Tue, 20 Oct 2020 13:18:24 +0000 (16:18 +0300)]
[#1668] Formatting fix.
Egor Kislitsyn [Tue, 20 Oct 2020 13:16:58 +0000 (17:16 +0400)]
Rename `Pleroma.Backup` to `Pleroma.User.Backup`
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
projects / akkoma / log