lain [Fri, 19 Jun 2020 13:40:34 +0000 (13:40 +0000)]
Merge branch 'dry-up-follower-update' into 'develop'
User: update_follower_count refactor.
See merge request pleroma/pleroma!2649
lain [Wed, 17 Jun 2020 15:53:24 +0000 (15:53 +0000)]
Merge branch 'fix/1787-mogrify-args' into 'develop'
Moving custom ecto types in context folders
See merge request pleroma/pleroma!2652
rinpatch [Wed, 17 Jun 2020 15:21:42 +0000 (15:21 +0000)]
Merge branch 'fix/notification-type' into 'develop'
Remove `poll` from `notification_type` OpenAPI spec
Closes #1867
See merge request pleroma/pleroma!2657
Egor Kislitsyn [Wed, 17 Jun 2020 14:47:59 +0000 (18:47 +0400)]
Remove `poll` from `notification_type` OpenAPI spec
rinpatch [Wed, 17 Jun 2020 10:34:23 +0000 (10:34 +0000)]
Merge branch 'features/users-raw_bio' into 'develop'
User: Add raw_bio, storing unformatted bio
See merge request pleroma/pleroma!2326
Alexander Strizhakov [Wed, 17 Jun 2020 07:31:06 +0000 (10:31 +0300)]
credo fix
rinpatch [Wed, 17 Jun 2020 00:00:51 +0000 (00:00 +0000)]
Merge branch 'release/update-otp-elixir' into 'develop'
Update elixir image used for OTP releases
See merge request pleroma/pleroma!2654
rinpatch [Tue, 16 Jun 2020 23:29:32 +0000 (02:29 +0300)]
CHANGELOG.md: mention minimal elixir version update
rinpatch [Tue, 16 Jun 2020 23:27:28 +0000 (02:27 +0300)]
Update OTP releases to official images of 1.10.3
This is necessary since we bumped required version of elixir to 1.9.
The dlsym bug should be gone by now.
lain [Tue, 16 Jun 2020 21:07:04 +0000 (21:07 +0000)]
Merge branch 'hotfix/notification-migration' into 'develop'
Chunk the notification type backfill migration
See merge request pleroma/pleroma!2653
rinpatch [Tue, 16 Jun 2020 20:45:59 +0000 (23:45 +0300)]
Chunk the notification type backfill migration
Long-term we want that migration to be done entirely in SQL,
but for now this is a hotfix to not cause OOMs on large databases.
This is using a homegrown version of `Repo.stream`, it's worse in
terms of performance than the upstream since it doesn't use the same
prepared query for chunk queries, but unlike the upstream it supports
preloads.
Haelwenn [Tue, 16 Jun 2020 18:10:00 +0000 (18:10 +0000)]
Merge branch '1866-last-status-stuff' into 'develop'
Resolve "/api/v1/conversations returns the wrong `last_status`"
Closes #1866
See merge request pleroma/pleroma!2647
Alexander Strizhakov [Tue, 16 Jun 2020 14:50:33 +0000 (17:50 +0300)]
moving custom ecto types in context folders
rinpatch [Tue, 16 Jun 2020 13:18:29 +0000 (13:18 +0000)]
Merge branch 'elixir-1.9' into 'develop'
Upgrade to Elixir 1.9
See merge request pleroma/pleroma!2651
Steven Fuchs [Tue, 16 Jun 2020 13:18:29 +0000 (13:18 +0000)]
Upgrade to Elixir 1.9
lain [Tue, 16 Jun 2020 13:17:52 +0000 (13:17 +0000)]
Merge branch 'fix/1787-mogrify-args' into 'develop'
Mogrify args in adminFE
Closes #1787
See merge request pleroma/pleroma!2616
Alexander Strizhakov [Sun, 31 May 2020 11:42:15 +0000 (14:42 +0300)]
naming
Alexander Strizhakov [Sun, 31 May 2020 10:25:04 +0000 (13:25 +0300)]
fix attemps to merge map
Alexander Strizhakov [Sun, 31 May 2020 09:38:24 +0000 (12:38 +0300)]
fix for updated hackney
warning: :hackney_connect.partial_chain/1 is undefined or private
Alexander Strizhakov [Sun, 31 May 2020 07:46:02 +0000 (10:46 +0300)]
Mogrify args as custom tuples
lain [Mon, 15 Jun 2020 12:41:48 +0000 (12:41 +0000)]
Merge branch 'merge-ogp-twitter-parsers' into 'develop'
Merge OGP parser with TwitterCard
Closes #1835
See merge request pleroma/pleroma!2642
lain [Mon, 15 Jun 2020 12:29:34 +0000 (14:29 +0200)]
User: update_follower_count refactor.
Egor Kislitsyn [Mon, 15 Jun 2020 12:20:05 +0000 (16:20 +0400)]
Fix tests
Egor Kislitsyn [Mon, 15 Jun 2020 12:03:40 +0000 (16:03 +0400)]
Merge remote-tracking branch 'origin/develop' into merge-ogp-twitter-parsers
lain [Mon, 15 Jun 2020 10:30:11 +0000 (12:30 +0200)]
Changelog: Add info about conversation view changes.
lain [Mon, 15 Jun 2020 10:27:13 +0000 (12:27 +0200)]
Conversations: Return last dm for conversation, not last message.
lain [Mon, 15 Jun 2020 07:57:58 +0000 (07:57 +0000)]
Merge branch 'notifications-filtering' into 'develop'
Mastodon API return full result set in notifications
See merge request pleroma/pleroma!2552
eugenijm [Mon, 18 May 2020 15:46:04 +0000 (18:46 +0300)]
Mastodon API: ensure the notification endpoint doesn't return less than the requested amount of records unless it's the last page
rinpatch [Sat, 13 Jun 2020 17:20:43 +0000 (17:20 +0000)]
Merge branch '1851-favorites-pagination' into 'develop'
StatusController: Correctly paginate favorites.
Closes #1851
See merge request pleroma/pleroma!2636
lain [Sat, 13 Jun 2020 11:12:43 +0000 (13:12 +0200)]
ControllerHelper: Always return id field.
lain [Sat, 13 Jun 2020 10:37:15 +0000 (10:37 +0000)]
Apply suggestion to lib/pleroma/web/controller_helper.ex
href [Wed, 10 Jun 2020 15:34:23 +0000 (17:34 +0200)]
Remove use of atoms in MRF.UserAllowListPolicy
Egor Kislitsyn [Tue, 9 Jun 2020 17:49:24 +0000 (21:49 +0400)]
Fix atom leak in Rich Media Parser
Haelwenn [Fri, 12 Jun 2020 21:46:16 +0000 (21:46 +0000)]
Merge branch 'patch-1' into 'develop'
Update pleroma.nginx to support TLSv1.3
See merge request pleroma/pleroma!2644
Haelwenn [Fri, 12 Jun 2020 16:57:13 +0000 (16:57 +0000)]
Merge branch 'recipients-experiments' into 'develop'
ActivityPub: Don't show announces of your own objects in timeline.
See merge request pleroma/pleroma!2637
Egor Kislitsyn [Fri, 12 Jun 2020 14:37:32 +0000 (18:37 +0400)]
Return an empty map from Pleroma.Web.RichMedia.Parsers.OGP.parse/2
Egor Kislitsyn [Fri, 12 Jun 2020 14:25:29 +0000 (18:25 +0400)]
Merge remote-tracking branch 'origin/develop' into merge-ogp-twitter-parsers
lain [Fri, 12 Jun 2020 14:14:09 +0000 (14:14 +0000)]
Merge branch 'global-status-expiration' into 'develop'
Global status expiration
See merge request pleroma/pleroma!2208
lain [Fri, 12 Jun 2020 14:03:33 +0000 (14:03 +0000)]
Apply suggestion to config/description.exs
feld [Fri, 12 Jun 2020 14:01:19 +0000 (14:01 +0000)]
Merge branch 'features/mix-task-reset-mfa' into 'develop'
New mix task: pleroma.user reset_mfa <nickname>
See merge request pleroma/pleroma!2643
feld [Fri, 12 Jun 2020 13:55:13 +0000 (13:55 +0000)]
Merge branch 'chore/bump-changelog' into 'develop'
Add changelog entry for emoji pack reload command
See merge request pleroma/pleroma!2646
Mark Felder [Fri, 12 Jun 2020 13:51:11 +0000 (08:51 -0500)]
Document new mix task feature to reset mfa
Mark Felder [Fri, 12 Jun 2020 13:43:50 +0000 (08:43 -0500)]
Merge branch 'develop' into features/mix-task-reset-mfa
Mark Felder [Fri, 12 Jun 2020 13:42:23 +0000 (08:42 -0500)]
Add changelog entry for emoji pack reload command
lain [Fri, 12 Jun 2020 13:32:59 +0000 (13:32 +0000)]
Merge branch 'feature/cli-reload-emoji' into 'develop'
Add command to reload emoji packs from cli for OTP users
Closes #1814
See merge request pleroma/pleroma!2639
feld [Fri, 12 Jun 2020 12:31:27 +0000 (12:31 +0000)]
Merge branch '1794-hashtags-construction-from-uri-fix' into 'develop'
[#1794] Fixes URI query handling for hashtags extraction in search
Closes #1794
See merge request pleroma/pleroma!2645
Ivan Tashkinov [Fri, 12 Jun 2020 11:25:41 +0000 (14:25 +0300)]
[#1794] Fixes URI query handling for hashtags extraction in search.
normandy [Fri, 12 Jun 2020 01:41:09 +0000 (01:41 +0000)]
Update pleroma.nginx to support TLSv1.3
Based on SSL config from https://ssl-config.mozilla.org/
Haelwenn (lanodan) Monnier [Thu, 11 Jun 2020 20:54:39 +0000 (22:54 +0200)]
New mix task: pleroma.user reset_mfa <nickname>
Egor Kislitsyn [Thu, 11 Jun 2020 19:11:46 +0000 (23:11 +0400)]
Deprecate Pleroma.Web.RichMedia.Parsers.OGP
feld [Thu, 11 Jun 2020 16:18:06 +0000 (16:18 +0000)]
Merge branch 'fix/csp-mediaproxy-base-url' into 'develop'
HTTP security plug: add media proxy base url host to csp
See merge request pleroma/pleroma!2638
Mark Felder [Thu, 11 Jun 2020 16:05:22 +0000 (11:05 -0500)]
Check for media proxy base_url, not Upload base_url
Mark Felder [Thu, 11 Jun 2020 15:25:00 +0000 (10:25 -0500)]
Merge branch 'develop' into fix/csp-mediaproxy-base-url
feld [Thu, 11 Jun 2020 14:04:51 +0000 (14:04 +0000)]
Merge branch '1794-hashtags-construction-from-uri' into 'develop'
[#1794] Hashtags search fix for URI as query string
Closes #1794
See merge request pleroma/pleroma!2641
Egor Kislitsyn [Thu, 11 Jun 2020 13:57:31 +0000 (17:57 +0400)]
Merge OGP parser with TwitterCard
Ivan Tashkinov [Thu, 11 Jun 2020 13:05:14 +0000 (16:05 +0300)]
[#1794] Fixes URI query handling for hashtags extraction in search.
lain [Wed, 10 Jun 2020 18:56:46 +0000 (18:56 +0000)]
Apply suggestion to lib/pleroma/web/controller_helper.ex
Mark Felder [Wed, 10 Jun 2020 18:02:08 +0000 (13:02 -0500)]
Add command to reload emoji packs from cli for OTP users
Not useful for source releases as we don't have a way to automate connecting to the running instance.
rinpatch [Wed, 10 Jun 2020 17:09:16 +0000 (20:09 +0300)]
HTTP security plug: add media proxy base url host to csp
lain [Wed, 10 Jun 2020 14:55:30 +0000 (16:55 +0200)]
ActivityPubTest: Update test for atomized parameters.
Thibaut Girka [Sun, 7 Jun 2020 16:21:11 +0000 (18:21 +0200)]
Add test
rinpatch [Wed, 10 Jun 2020 12:05:45 +0000 (12:05 +0000)]
Merge branch 'remake-remodel-dms' into 'develop'
Chats / ChatMessages
See merge request pleroma/pleroma!2429
lain [Wed, 10 Jun 2020 10:15:56 +0000 (12:15 +0200)]
ActivityPubTest: Make test easier to understand.
lain [Wed, 10 Jun 2020 10:10:09 +0000 (12:10 +0200)]
ActivityPub: Don't show announces of your own objects in timeline.
lain [Wed, 10 Jun 2020 09:09:45 +0000 (11:09 +0200)]
ControllerHelper: Fix wrong comparison.
lain [Wed, 10 Jun 2020 08:12:29 +0000 (08:12 +0000)]
Apply suggestion to lib/pleroma/web/controller_helper.ex
lain [Wed, 10 Jun 2020 08:02:35 +0000 (08:02 +0000)]
Apply suggestion to lib/pleroma/web/controller_helper.ex
lain [Wed, 10 Jun 2020 08:02:26 +0000 (08:02 +0000)]
Apply suggestion to lib/pleroma/web/controller_helper.ex
lain [Tue, 9 Jun 2020 12:59:14 +0000 (12:59 +0000)]
Merge branch 'add-url-to-admin-account-view' into 'develop'
Add `url` field to AdminAPI.AccountView
See merge request pleroma/pleroma!2633
Egor Kislitsyn [Mon, 8 Jun 2020 18:08:57 +0000 (22:08 +0400)]
Add `url` field to AdminAPI.AccountView
lain [Tue, 9 Jun 2020 08:53:40 +0000 (10:53 +0200)]
StatusController: Correctly paginate favorites.
Favorites were paginating wrongly, because the pagination headers
where using the id of the id of the `Create` activity, while the
ordering was by the id of the `Like` activity. This isn't easy to
notice in most cases, as they usually have a similar order because
people tend to favorite posts as they come in. This commit adds a
way to give different pagination ids to the pagination helper, so
we can paginate correctly in cases like this.
lain [Tue, 9 Jun 2020 07:36:07 +0000 (09:36 +0200)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
lain [Tue, 9 Jun 2020 07:32:43 +0000 (07:32 +0000)]
Merge branch 'features/mediatype-mime-valid' into 'develop'
transmogrifier: MIME.valid?/1 for mediaType
See merge request pleroma/pleroma!2634
lain [Tue, 9 Jun 2020 07:21:44 +0000 (09:21 +0200)]
Merge branch 'remake-remodel-dms' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
lain [Tue, 9 Jun 2020 07:20:55 +0000 (09:20 +0200)]
MigrationHelper: Move notification backfilling to own module.
lain [Mon, 8 Jun 2020 20:01:37 +0000 (20:01 +0000)]
Apply suggestion to lib/pleroma/notification.ex
Haelwenn (lanodan) Monnier [Mon, 8 Jun 2020 19:04:16 +0000 (21:04 +0200)]
transmogrifier: MIME.valid?/1 for mediaType
No issues with the rest of the network yet but this makes sure it will work
once https://git.pleroma.social/pleroma/pleroma/-/merge_requests/2429
is merged.
Egor Kislitsyn [Mon, 8 Jun 2020 13:56:34 +0000 (17:56 +0400)]
Restrict ActivityExpirationPolicy to Notes only
Egor Kislitsyn [Mon, 8 Jun 2020 13:21:47 +0000 (17:21 +0400)]
Merge branch 'develop' into global-status-expiration
lain [Mon, 8 Jun 2020 11:07:01 +0000 (11:07 +0000)]
Merge branch 'openapi/admin/relay' into 'develop'
Add OpenAPI spec for AdminAPI.RelayController
See merge request pleroma/pleroma!2579
lain [Mon, 8 Jun 2020 10:54:43 +0000 (10:54 +0000)]
Merge branch 'feature/delete-follow-requests-on-user-deletion' into 'develop'
Delete outgoing pending follow requests on user deletion
See merge request pleroma/pleroma!2631
lain [Mon, 8 Jun 2020 09:19:18 +0000 (11:19 +0200)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
lain [Mon, 8 Jun 2020 09:11:55 +0000 (09:11 +0000)]
Merge branch 'activity-pub-use-atoms-as-keys' into 'develop'
Use atoms as keys in `ActivityPub.fetch_*` options
See merge request pleroma/pleroma!2629
lain [Mon, 8 Jun 2020 09:09:53 +0000 (11:09 +0200)]
ChatController: Remove nonsensical pagination.
lain [Mon, 8 Jun 2020 08:18:10 +0000 (10:18 +0200)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
lain [Sun, 7 Jun 2020 18:23:17 +0000 (20:23 +0200)]
Docs: Document new mandatory parameter.
lain [Sun, 7 Jun 2020 18:22:08 +0000 (20:22 +0200)]
ChatController: Make last_read_id mandatory.
Sergey Suprunenko [Sun, 7 Jun 2020 15:31:37 +0000 (17:31 +0200)]
Delete pending follow requests on user deletion
lain [Sun, 7 Jun 2020 13:41:46 +0000 (15:41 +0200)]
Docs: Update docs on mark as read.
lain [Sun, 7 Jun 2020 13:38:33 +0000 (15:38 +0200)]
ChatController: Add `last_read_id` option to mark_as_read.
lain [Sun, 7 Jun 2020 12:52:56 +0000 (14:52 +0200)]
SideEffects: Move streaming of chats to after the transaction.
lain [Sun, 7 Jun 2020 12:25:30 +0000 (14:25 +0200)]
Chats: Change id to flake id.
lain [Sun, 7 Jun 2020 07:19:00 +0000 (09:19 +0200)]
AttachmentValidator: Check if the mime type is valid.
lain [Sat, 6 Jun 2020 14:59:08 +0000 (16:59 +0200)]
Notfication: Add validation of notification types
lain [Sat, 6 Jun 2020 14:48:02 +0000 (16:48 +0200)]
ChatController: Use new oauth scope *:chats.
Haelwenn (lanodan) Monnier [Mon, 23 Mar 2020 21:52:25 +0000 (22:52 +0100)]
User: Add raw_bio, storing unformatted bio
Related: https://git.pleroma.social/pleroma/pleroma/issues/1643
lain [Sat, 6 Jun 2020 13:51:08 +0000 (15:51 +0200)]
Credo fixes.
lain [Sat, 6 Jun 2020 13:33:02 +0000 (15:33 +0200)]
Migrations: Move Notification migration code to helper
lain [Sat, 6 Jun 2020 11:08:45 +0000 (13:08 +0200)]
Notification: Change type of `type` to an enum.
lain [Sat, 6 Jun 2020 09:51:10 +0000 (11:51 +0200)]
ChatMessageReference -> Chat.MessageReference
projects / akkoma / log