sadposter [Sun, 15 Nov 2020 19:40:23 +0000 (19:40 +0000)]
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
Haelwenn [Sat, 14 Nov 2020 21:43:07 +0000 (21:43 +0000)]
Merge branch 'bugfix/instance-gen_exiftool' into 'develop'
pleroma.instance: Fix Exiftool module name
See merge request pleroma/pleroma!3143
Haelwenn (lanodan) Monnier [Sat, 14 Nov 2020 21:27:13 +0000 (22:27 +0100)]
pleroma.instance: Fix Exiftool module name
lain [Fri, 13 Nov 2020 13:35:47 +0000 (13:35 +0000)]
Merge branch 'fixes_2034_reports_should_send_a_notification_to_admins' into 'develop'
fixes 2034 Make notifs view work for reports
Closes #2034
See merge request pleroma/pleroma!2912
Ilja [Fri, 13 Nov 2020 13:35:46 +0000 (13:35 +0000)]
Make notifs view work for reports
* These are the first small steps for issue 2034 "Reports should send a notification to admins".
* I added a new type of notification "pleroma:report" to the the database manually (a migration will need to be written later)
* I added the new type to the notification_controller
* I made the view return the notification. It doesn't include the report itself (yet)
lain [Fri, 13 Nov 2020 13:31:46 +0000 (13:31 +0000)]
Merge branch 'docs/otp-tuning' into 'develop'
First draft of tips for optimizing BEAM
See merge request pleroma/pleroma!3123
rinpatch [Fri, 13 Nov 2020 10:32:16 +0000 (10:32 +0000)]
Merge branch 'fix/oban-in-database-config' into 'develop'
remove PurgeExpiredActivity from Oban db config
See merge request pleroma/pleroma!3137
Alexander Strizhakov [Fri, 13 Nov 2020 06:07:08 +0000 (09:07 +0300)]
remove PurgeExpiredActivity from Oban db config
feld [Thu, 12 Nov 2020 22:41:00 +0000 (22:41 +0000)]
Merge branch 'majic-dep' into 'develop'
Install file-dev in Dockerfile build stage
See merge request pleroma/pleroma!3135
Michael Walker [Thu, 12 Nov 2020 22:20:17 +0000 (22:20 +0000)]
Install file-dev in Dockerfile build stage
This is required by the majic, added in #2534.
rinpatch [Wed, 28 Oct 2020 15:08:23 +0000 (18:08 +0300)]
Fix object spoofing vulnerability in attachments
Validate the content-type of the response when fetching an object,
according to https://www.w3.org/TR/activitypub/#x3-2-retrieving-objects.
content-type headers had to be added to many mocks in order to support
this, some of this was done with a regex. While I did go over the
resulting files to check I didn't modify anything unrelated, there is a
possibility I missed something.
Closes pleroma#1948
Haelwenn [Thu, 12 Nov 2020 08:50:26 +0000 (08:50 +0000)]
Merge branch 'title-injection-change' into 'develop'
Title injection change
See merge request pleroma/pleroma!3132
feld [Wed, 11 Nov 2020 22:37:16 +0000 (22:37 +0000)]
Merge branch 'feature/ingest-blurhash' into 'develop'
Ingest blurhash for attachments if they were federated
Closes #2294
See merge request pleroma/pleroma!3133
Mark Felder [Wed, 11 Nov 2020 22:17:35 +0000 (16:17 -0600)]
Fix tests for other attachment types
Mark Felder [Wed, 11 Nov 2020 19:39:02 +0000 (13:39 -0600)]
Ingest blurhash field during transmogrification
Mark Felder [Wed, 11 Nov 2020 18:51:13 +0000 (12:51 -0600)]
Render blurhashes in Mastodon API
Mark Felder [Wed, 11 Nov 2020 18:27:51 +0000 (12:27 -0600)]
Ingest blurhash for attachments if they were federated
lain [Wed, 11 Nov 2020 16:19:09 +0000 (17:19 +0100)]
Changelog: Add info about title injection
lain [Wed, 11 Nov 2020 16:17:41 +0000 (17:17 +0100)]
Bundled FE: Remove title tag
feld [Wed, 11 Nov 2020 16:15:57 +0000 (16:15 +0000)]
Merge branch 'mrf-config-descriptions' into 'develop'
little changes for MRF config descriptions
See merge request pleroma/pleroma!3131
lain [Wed, 11 Nov 2020 16:10:59 +0000 (17:10 +0100)]
RedirectController: Don't replace title, but inject into the meta
Alexander Strizhakov [Wed, 11 Nov 2020 15:49:15 +0000 (18:49 +0300)]
little changes for MRF config descriptions
- log level reduction, if policy doesn't implement config_description method
- docs in dev.md
feld [Wed, 11 Nov 2020 13:48:03 +0000 (13:48 +0000)]
Merge branch 'feature/2222-config-descriptions-for-custom-modules' into 'develop'
Config descriptions for custom MRF policies
Closes #2222
See merge request pleroma/pleroma!3128
Alexander Strizhakov [Wed, 11 Nov 2020 07:48:03 +0000 (10:48 +0300)]
making credo happy and test fix
Alexander Strizhakov [Wed, 11 Nov 2020 07:10:57 +0000 (10:10 +0300)]
fix for adminFE
- revert UserAllowPolicy description
- MRF descriptions order
feld [Tue, 10 Nov 2020 16:44:23 +0000 (16:44 +0000)]
Apply 1 suggestion(s) to 1 file(s)
feld [Tue, 10 Nov 2020 16:44:17 +0000 (16:44 +0000)]
Apply 1 suggestion(s) to 1 file(s)
feld [Tue, 10 Nov 2020 16:44:08 +0000 (16:44 +0000)]
Apply 1 suggestion(s) to 1 file(s)
feld [Tue, 10 Nov 2020 16:44:00 +0000 (16:44 +0000)]
Apply 1 suggestion(s) to 1 file(s)
Alexander Strizhakov [Tue, 10 Nov 2020 16:18:53 +0000 (19:18 +0300)]
config descriptions for custom MRF policies
lain [Tue, 10 Nov 2020 11:04:19 +0000 (11:04 +0000)]
Merge branch '2260-wrong-report-link' into 'develop'
Resolve "Wrong user link in Report email"
Closes #2260
See merge request pleroma/pleroma!3121
lain [Tue, 10 Nov 2020 10:05:15 +0000 (10:05 +0000)]
Merge branch 'fix/html-title-load' into 'develop'
Fix title on load of Pleroma HTML, fixes #2281
Closes #2281
See merge request pleroma/pleroma!3125
lain [Tue, 10 Nov 2020 09:34:13 +0000 (09:34 +0000)]
Merge branch 'fix/2291-atom-feed-escape' into 'develop'
Escaping in xml templates
Closes #2291
See merge request pleroma/pleroma!3126
Alexander Strizhakov [Tue, 10 Nov 2020 07:44:22 +0000 (10:44 +0300)]
escaping summary and other fields in xml templates
Haelwenn [Mon, 9 Nov 2020 09:14:41 +0000 (09:14 +0000)]
Merge branch 'remove/release-env' into 'develop'
Remove release_env
See merge request pleroma/pleroma!3124
Sean King [Sun, 8 Nov 2020 23:16:20 +0000 (16:16 -0700)]
Fix title on load of Pleroma HTML
lain [Sun, 8 Nov 2020 09:45:35 +0000 (09:45 +0000)]
Update optimizing_beam.md
rinpatch [Sat, 7 Nov 2020 19:09:28 +0000 (22:09 +0300)]
Remove release_env
While taking a final look at instance.gen before releasing I noticed
that the release_env task outputs messages in broken english. Upon
further inspection it seems to have even more severe issues which, in
my opinion, warrant it's at least temporary removal:
- We do not explain what it actually does, anywhere. Neither the task
docs nor instance.gen, nor installation instructions.
- It does not respect FHS on OTP releases (uses /opt/pleroma/config even
though we store the config in /etc/pleroma/config.exs).
- It doesn't work on OTP releases, which is the main reason it exists.
Neither systemd nor openrc service files for OTP include it.
- It is not mentioned in install guides other than the ones for Debian
and OTP releases.
Mark Felder [Fri, 6 Nov 2020 19:16:22 +0000 (13:16 -0600)]
Markdown, you're drunk
Mark Felder [Fri, 6 Nov 2020 19:15:21 +0000 (13:15 -0600)]
Make it clearer the settings go into the vm.args file
Mark Felder [Fri, 6 Nov 2020 19:12:13 +0000 (13:12 -0600)]
More grammar fixes
Mark Felder [Fri, 6 Nov 2020 19:04:13 +0000 (13:04 -0600)]
Less confusing I hope
Mark Felder [Fri, 6 Nov 2020 19:02:07 +0000 (13:02 -0600)]
Grammar
Mark Felder [Fri, 6 Nov 2020 19:00:31 +0000 (13:00 -0600)]
First draft of tips for optimizing BEAM
lain [Thu, 5 Nov 2020 12:44:16 +0000 (12:44 +0000)]
Merge branch 'feature/expire-mutes' into 'develop'
Expiring mutes for users and activities
Closes #1817
See merge request pleroma/pleroma!2971
lain [Thu, 5 Nov 2020 12:23:58 +0000 (13:23 +0100)]
Docs: Add info about expiring mutes.
lain [Wed, 4 Nov 2020 16:15:04 +0000 (16:15 +0000)]
Merge branch 'stats-genserver-fix' into 'develop'
don't run Stats GenServer updates in tests
See merge request pleroma/pleroma!2976
lain [Wed, 4 Nov 2020 16:13:34 +0000 (17:13 +0100)]
Changelog: Add info about admin email user link changes.
lain [Wed, 4 Nov 2020 16:12:47 +0000 (17:12 +0100)]
AdminEmail: Use AP id as user url.
lain [Wed, 4 Nov 2020 15:54:12 +0000 (15:54 +0000)]
Merge branch 'default-mrf' into 'develop'
Add TagPolicy as default MRF
See merge request pleroma/pleroma!2834
lain [Wed, 4 Nov 2020 15:52:30 +0000 (16:52 +0100)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into stats-genserver-fix
lain [Wed, 4 Nov 2020 15:51:42 +0000 (16:51 +0100)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/expire-mutes
lain [Wed, 4 Nov 2020 15:42:48 +0000 (15:42 +0000)]
Merge branch 'ejabberd-pleroma-auth' into 'develop'
Add ejabberd auth document
See merge request pleroma/pleroma!3074
lain [Wed, 4 Nov 2020 15:00:52 +0000 (15:00 +0000)]
Merge branch 'features/federation-status' into 'develop'
Add a federation_status endpoint showing unreachable instances
See merge request pleroma/pleroma!3086
lain [Wed, 4 Nov 2020 14:54:53 +0000 (14:54 +0000)]
Merge branch 'restrict-domain' into 'develop'
View a remote server's timeline
See merge request pleroma/pleroma!2713
Haelwenn [Wed, 4 Nov 2020 14:44:45 +0000 (14:44 +0000)]
Merge branch '2284-voters-count' into 'develop'
Always return voters_count in polls
See merge request pleroma/pleroma!3120
lain [Wed, 4 Nov 2020 14:39:32 +0000 (15:39 +0100)]
Changelog: Add info about federation status endpoint
lain [Wed, 4 Nov 2020 14:38:10 +0000 (15:38 +0100)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/federation-status
lain [Wed, 4 Nov 2020 14:24:10 +0000 (15:24 +0100)]
TopicsTest: Small addition.
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 [Wed, 4 Nov 2020 09:20:09 +0000 (10:20 +0100)]
Poll Schema: Update and fix.
lain [Wed, 4 Nov 2020 09:14:48 +0000 (10:14 +0100)]
Changelog: Add info about poll view changes
lain [Wed, 4 Nov 2020 09:14:00 +0000 (10:14 +0100)]
Poll View: Always return `voters_count`.
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
sadposter [Sun, 1 Nov 2020 12:22:28 +0000 (12:22 +0000)]
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
sadposter [Sun, 1 Nov 2020 12:22:18 +0000 (12:22 +0000)]
fix CSS
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
projects / akkoma / log