lain [Sat, 20 Jun 2020 09:56:04 +0000 (09:56 +0000)]
Merge branch 'docs/attachment_links' into 'develop'
cheatsheet.md: no_attachment_links → attachment_links
See merge request pleroma/pleroma!2664
lain [Sat, 20 Jun 2020 09:45:01 +0000 (09:45 +0000)]
Merge branch 'cleanup/object-conversation' into 'develop'
Stop filling conversation field on incoming objects (legacy, unused)
See merge request pleroma/pleroma!2663
Haelwenn (lanodan) Monnier [Sat, 20 Jun 2020 09:39:06 +0000 (11:39 +0200)]
cheatsheet.md: no_attachment_links → attachment_links
Haelwenn (lanodan) Monnier [Thu, 18 Jun 2020 17:32:03 +0000 (19:32 +0200)]
Stop filling conversation field on incoming objects (legacy, unused)
conversation field is still set for outgoing federation for compatibility.
feld [Fri, 19 Jun 2020 20:38:22 +0000 (20:38 +0000)]
Merge branch 'issue/1855' into 'develop'
#1855 MediaProxy cache invalidation via Admin API
See merge request pleroma/pleroma!2648
lain [Fri, 19 Jun 2020 14:26:43 +0000 (14:26 +0000)]
Merge branch 'add-troubleshooting-info' into 'develop'
README: Add some troubleshooting info for compilation issues.
See merge request pleroma/pleroma!2660
lain [Fri, 19 Jun 2020 13:49:34 +0000 (15:49 +0200)]
README: Add some troubleshooting info for compilation issues.
lain [Fri, 19 Jun 2020 13:42:57 +0000 (13:42 +0000)]
Merge branch '1873-pagination-fixes' into 'develop'
[#1873] :offset pagination param support, hashtags pagination
Closes #1873
See merge request pleroma/pleroma!2659
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
Ivan Tashkinov [Fri, 19 Jun 2020 13:14:06 +0000 (16:14 +0300)]
[#1873] Fixes missing :offset pagination param support. Added pagination support for hashtags search.
Maksim Pechnikov [Thu, 18 Jun 2020 02:02:33 +0000 (05:02 +0300)]
fix test
Mark Felder [Wed, 17 Jun 2020 18:13:55 +0000 (13:13 -0500)]
Change references from "deleted_urls" to "banned_urls" as nothing is handled via media deletions anymore; all actions are manual operations by an admin to ban the url
Mark Felder [Wed, 17 Jun 2020 18:02:01 +0000 (13:02 -0500)]
Remove misleading is_ prefix from boolean function
Mark Felder [Wed, 17 Jun 2020 17:54:02 +0000 (12:54 -0500)]
Empty list as default
Mark Felder [Wed, 17 Jun 2020 17:50:06 +0000 (12:50 -0500)]
Merge branch 'develop' into issue/1855
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
Maksim [Wed, 17 Jun 2020 13:14:01 +0000 (13:14 +0000)]
Apply suggestion to test/web/media_proxy/invalidation_test.exs
Maksim [Wed, 17 Jun 2020 13:12:38 +0000 (13:12 +0000)]
Apply suggestion to lib/pleroma/web/media_proxy/invalidations/script.ex
Maksim [Wed, 17 Jun 2020 13:12:32 +0000 (13:12 +0000)]
Apply suggestion to lib/pleroma/web/media_proxy/invalidations/script.ex
Maksim [Wed, 17 Jun 2020 12:58:50 +0000 (12:58 +0000)]
Apply suggestion to test/web/media_proxy/media_proxy_controller_test.exs
Maksim [Wed, 17 Jun 2020 12:58:38 +0000 (12:58 +0000)]
Apply suggestion to test/web/media_proxy/invalidations/script_test.exs
Maksim [Wed, 17 Jun 2020 12:58:33 +0000 (12:58 +0000)]
Apply suggestion to test/web/media_proxy/invalidations/http_test.exs
Maksim [Wed, 17 Jun 2020 12:58:28 +0000 (12:58 +0000)]
Apply suggestion to test/web/admin_api/controllers/media_proxy_cache_controller_test.exs
Maksim [Wed, 17 Jun 2020 12:58:16 +0000 (12:58 +0000)]
Apply suggestion to test/web/admin_api/controllers/media_proxy_cache_controller_test.exs
Maksim [Wed, 17 Jun 2020 12:58:08 +0000 (12:58 +0000)]
Apply suggestion to test/web/admin_api/controllers/media_proxy_cache_controller_test.exs
Maksim [Wed, 17 Jun 2020 12:56:30 +0000 (12:56 +0000)]
Apply suggestion to lib/pleroma/web/media_proxy/invalidation.ex
Maksim [Wed, 17 Jun 2020 12:56:17 +0000 (12:56 +0000)]
Apply suggestion to docs/API/admin_api.md
Maksim [Wed, 17 Jun 2020 12:56:13 +0000 (12:56 +0000)]
Apply suggestion to docs/API/admin_api.md
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
Maksim Pechnikov [Mon, 15 Jun 2020 17:47:02 +0000 (20:47 +0300)]
fixed a visibility of functions
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.
Maksim Pechnikov [Mon, 15 Jun 2020 12:24:55 +0000 (15:24 +0300)]
Merge branch 'develop' into issue/1855
Maksim Pechnikov [Mon, 15 Jun 2020 12:24:00 +0000 (15:24 +0300)]
update docs
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
Maksim Pechnikov [Mon, 15 Jun 2020 11:55:00 +0000 (14:55 +0300)]
added tests
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
Maksim Pechnikov [Sun, 14 Jun 2020 18:02:57 +0000 (21:02 +0300)]
fix invalidates media url's
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
Maksim Pechnikov [Fri, 12 Jun 2020 11:49:54 +0000 (14:49 +0300)]
added admin api for MediaProxy cache invalidation
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
projects / akkoma / log