Haelwenn [Mon, 22 Jun 2020 21:59:21 +0000 (21:59 +0000)]
Merge branch 'warning/mastofe-settings-blob' into 'develop'
Add warning against parsing/reusing MastoFE settings blob
See merge request pleroma/pleroma!2671
Haelwenn (lanodan) Monnier [Mon, 22 Jun 2020 21:45:29 +0000 (23:45 +0200)]
Add warning against parsing/reusing MastoFE settings blob
lain [Mon, 22 Jun 2020 15:40:09 +0000 (15:40 +0000)]
Merge branch 'add-muted-to-notifications' into 'develop'
Add `pleroma.is_muted` property to notifications
Closes #1812
See merge request pleroma/pleroma!2670
Egor Kislitsyn [Mon, 22 Jun 2020 15:18:33 +0000 (19:18 +0400)]
Update NotificationOperation spec
Egor Kislitsyn [Mon, 22 Jun 2020 15:03:04 +0000 (19:03 +0400)]
Add `is_muted` to notifications
lain [Mon, 22 Jun 2020 12:37:10 +0000 (12:37 +0000)]
Merge branch 'feature/1739-account-endpoints' into 'develop'
account visibility in masto api
Closes #1739
See merge request pleroma/pleroma!2488
lain [Mon, 22 Jun 2020 12:35:00 +0000 (12:35 +0000)]
Merge branch 'docs_use_include_for_install_further_reading' into 'develop'
Add include for the "Further reading" section
See merge request pleroma/pleroma!2667
lain [Mon, 22 Jun 2020 12:25:12 +0000 (12:25 +0000)]
Merge branch 'fix/1825-admin-api-error-codes' into 'develop'
Proper error codes for error in adminFE
Closes #1825
See merge request pleroma/pleroma!2665
lain [Mon, 22 Jun 2020 12:23:45 +0000 (12:23 +0000)]
Merge branch 'weblate-pleroma-pleroma' into 'develop'
Translations update from Weblate
See merge request pleroma/pleroma!2661
Ben Is [Fri, 19 Jun 2020 14:35:01 +0000 (14:35 +0000)]
Translated using Weblate (Italian)
Currently translated at 0.9% (1 of 106 strings)
Translation: Pleroma/Pleroma backend
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/it/
Ben Is [Fri, 19 Jun 2020 14:33:58 +0000 (14:33 +0000)]
Added translation using Weblate (Italian)
rinpatch [Mon, 22 Jun 2020 11:34:07 +0000 (11:34 +0000)]
Merge branch '1865-media-only' into 'develop'
Resolve "/api/v1/accounts/:id/statuses?only_media=true returns media that is not owned"
Closes #1865
See merge request pleroma/pleroma!2650
rinpatch [Mon, 22 Jun 2020 10:00:13 +0000 (10:00 +0000)]
Merge branch '1883-mrf-chat' into 'develop'
HellthreadPolicy: Restrict to Notes and Articles.
Closes #1883
See merge request pleroma/pleroma!2666
Ilja [Mon, 22 Jun 2020 09:41:22 +0000 (11:41 +0200)]
Add include for the "Further reading" section
* I added an include and use this include for the installation guides that already had this section
* I added the "Further reading" section as well as te "Questions" section to the English guides that didn't have it yet
* I added a first point "How Federation Works/Why is my Federated Timeline empty?" to link to lains blogpost about this because we still get this question a lot in the #pleroma support channel
* I reordered the list a bit
lain [Mon, 22 Jun 2020 08:41:09 +0000 (08:41 +0000)]
Merge branch 'feature/1854-emoji-pagination' into 'develop'
Emoji and packs pagination
Closes #1854
See merge request pleroma/pleroma!2658
lain [Mon, 22 Jun 2020 08:35:11 +0000 (10:35 +0200)]
HellthreadPolicy: Restrict to Notes and Articles.
lain [Sat, 20 Jun 2020 16:22:01 +0000 (16:22 +0000)]
Merge branch 'bugfix/mix.exs-version-dot-git-less' into 'develop'
mix.exs: version git-less (part 2, MacOS-compat)
See merge request pleroma/pleroma!2420
Alexander Strizhakov [Sat, 20 Jun 2020 10:59:08 +0000 (10:59 +0000)]
Apply suggestion to lib/pleroma/web/api_spec/operations/pleroma_emoji_pack_operation.ex
Alexander Strizhakov [Sat, 20 Jun 2020 10:53:57 +0000 (13:53 +0300)]
proper error codes for error in adminFE
lain [Sat, 20 Jun 2020 09:57:12 +0000 (09:57 +0000)]
Merge branch 'feature/support-bot-field-in-update-credentials' into 'develop'
Support 'bot' field in account update_credentials
Closes #1600 and #1467
See merge request pleroma/pleroma!2662
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
lain [Sat, 20 Jun 2020 09:39:50 +0000 (09:39 +0000)]
Apply suggestion to lib/pleroma/web/api_spec/operations/pleroma_emoji_pack_operation.ex
Haelwenn (lanodan) Monnier [Sat, 20 Jun 2020 09:39:06 +0000 (11:39 +0200)]
cheatsheet.md: no_attachment_links → attachment_links
lain [Sat, 20 Jun 2020 09:33:18 +0000 (09:33 +0000)]
Merge branch 'develop' into '1865-media-only'
# Conflicts:
# CHANGELOG.md
Alexander Strizhakov [Sat, 20 Jun 2020 07:56:28 +0000 (10:56 +0300)]
fix for packs pagination
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
Sergey Suprunenko [Fri, 19 Jun 2020 19:19:00 +0000 (21:19 +0200)]
Only accounts with Service actor_type are considered as bots
Sergey Suprunenko [Fri, 19 Jun 2020 19:18:07 +0000 (21:18 +0200)]
Add support for bot field in update_credentials
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.
Alexander Strizhakov [Fri, 19 Jun 2020 11:46:38 +0000 (14:46 +0300)]
default page size for files
Alexander Strizhakov [Fri, 19 Jun 2020 09:31:55 +0000 (12:31 +0300)]
changelog entry
Alexander Strizhakov [Fri, 19 Jun 2020 07:17:24 +0000 (10:17 +0300)]
adding overall count for packs and files
Alexander Strizhakov [Thu, 18 Jun 2020 15:50:03 +0000 (18:50 +0300)]
emoji pagination for pack show action
Alexander Strizhakov [Thu, 18 Jun 2020 11:32:21 +0000 (14:32 +0300)]
emoji packs pagination
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
lain [Tue, 16 Jun 2020 11:09:28 +0000 (13:09 +0200)]
Changelog: Add info about `only_media` changes.
lain [Tue, 16 Jun 2020 11:08:27 +0000 (13:08 +0200)]
ActivityPub: When restricting to media posts, only show 'Creates'.
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
projects / akkoma / log