rinpatch [Wed, 27 May 2020 14:17:12 +0000 (14:17 +0000)]
Merge branch 'refactor-add-mention-step-one' into 'develop'
Fix ObjectView calling into strange functions
Closes #1807
See merge request pleroma/pleroma!2580
rinpatch [Wed, 27 May 2020 13:45:14 +0000 (13:45 +0000)]
Merge branch 'notification-fixes' into 'develop'
Notification performance fixes
See merge request pleroma/pleroma!2595
lain [Wed, 27 May 2020 10:56:15 +0000 (12:56 +0200)]
Migrations: Make user_id index on notifications better for query.
Alexander Strizhakov [Wed, 27 May 2020 10:55:42 +0000 (10:55 +0000)]
Apply suggestion to lib/pleroma/web/admin_api/controllers/admin_api_controller.ex
Egor Kislitsyn [Wed, 27 May 2020 10:42:21 +0000 (14:42 +0400)]
Fix typo
lain [Wed, 27 May 2020 10:41:06 +0000 (12:41 +0200)]
Notification: Actually preload objects.
lain [Wed, 27 May 2020 08:02:00 +0000 (08:02 +0000)]
Merge branch 'fav-speedup' into 'develop'
ActivityPub: Change ordering to `nulls last` in favorites query
See merge request pleroma/pleroma!2594
lain [Wed, 27 May 2020 07:46:12 +0000 (09:46 +0200)]
ActivityPub: Change ordering to `nulls last` in favorites query
This makes it use our existing index and speeds up the query.
Alexander Strizhakov [Wed, 27 May 2020 06:42:28 +0000 (09:42 +0300)]
validate actor type
rinpatch [Tue, 26 May 2020 16:33:13 +0000 (16:33 +0000)]
Merge branch 'fav-speedup' into 'develop'
Fix favorites query performance
See merge request pleroma/pleroma!2591
rinpatch [Tue, 26 May 2020 15:57:01 +0000 (15:57 +0000)]
Merge branch '1808-pleroma-sucks' into 'develop'
Resolve "Don't fail message ingestions when we can't update a user"
Closes #1808
See merge request pleroma/pleroma!2576
rinpatch [Tue, 26 May 2020 15:56:23 +0000 (15:56 +0000)]
Merge branch 'apps-index' into 'develop'
Migrations: Add index on client_id and client_secret for apps.
See merge request pleroma/pleroma!2589
rinpatch [Tue, 26 May 2020 15:55:09 +0000 (15:55 +0000)]
Merge branch '1813-throttling' into 'develop'
Mastodon API Controllers: Use the correct params for rate limiting.
Closes #1813
See merge request pleroma/pleroma!2586
lain [Tue, 26 May 2020 15:46:16 +0000 (17:46 +0200)]
Activity.Queries: Use correct actor restriction.
lain [Tue, 26 May 2020 14:46:57 +0000 (16:46 +0200)]
Migrations: Add index on client_id and client_secret for apps.
Greatly speeds up app lookup.
lain [Tue, 26 May 2020 14:17:54 +0000 (14:17 +0000)]
Merge branch 'restore-new-image' into 'develop'
Config: Restore old new background image
See merge request pleroma/pleroma!2588
lain [Tue, 26 May 2020 14:00:56 +0000 (16:00 +0200)]
Config: Restore old new background image
Became lost in a settings restructure
lain [Tue, 26 May 2020 12:41:46 +0000 (12:41 +0000)]
Merge branch 'fix/oban-warnings' into 'develop'
Fix Oban warnings
See merge request pleroma/pleroma!2587
Egor Kislitsyn [Tue, 26 May 2020 12:11:42 +0000 (16:11 +0400)]
Fix Oban warnings
lain [Tue, 26 May 2020 11:45:54 +0000 (13:45 +0200)]
Mastodon API Controllers: Use the correct params for rate limiting.
Egor Kislitsyn [Tue, 26 May 2020 11:21:33 +0000 (15:21 +0400)]
Add AdminAPI.InviteView
Egor Kislitsyn [Tue, 26 May 2020 11:02:51 +0000 (15:02 +0400)]
Add OpenAPI spec for AdminAPI.InviteTokenController
Egor Kislitsyn [Tue, 26 May 2020 09:13:39 +0000 (13:13 +0400)]
Move invite actions to AdminAPI.InviteTokenController
lain [Tue, 26 May 2020 10:56:40 +0000 (10:56 +0000)]
Merge branch '1501-include-unlisted-posts-in-user-feed' into 'develop'
[#1501] Made user feed contain public and unlisted activities
Closes #1501
See merge request pleroma/pleroma!2584
Alexander Strizhakov [Mon, 18 May 2020 07:09:21 +0000 (10:09 +0300)]
another view for account in admin-fe status_show
lain [Tue, 26 May 2020 08:32:13 +0000 (08:32 +0000)]
Merge branch 'skip-crypt-test' into 'develop'
Skip failing `:crypt` test on mac
See merge request pleroma/pleroma!2583
Ivan Tashkinov [Mon, 25 May 2020 20:27:47 +0000 (23:27 +0300)]
[#1501] Made user feed contain public and unlisted activities.
Egor Kislitsyn [Mon, 25 May 2020 19:01:37 +0000 (23:01 +0400)]
Skip failing `:crypt` test on mac
Egor Kislitsyn [Mon, 25 May 2020 18:02:22 +0000 (22:02 +0400)]
Add OpenAPI spec for AdminAPI.OAuthAppContoller
lain [Mon, 25 May 2020 17:45:40 +0000 (17:45 +0000)]
Merge branch '1471-tuning-advice' into 'develop'
Docs: Document reasonable Postgres settings.
See merge request pleroma/pleroma!2581
lain [Mon, 25 May 2020 17:26:07 +0000 (19:26 +0200)]
Docs: sql -> SQL
lain [Mon, 25 May 2020 17:11:35 +0000 (17:11 +0000)]
Apply suggestion to docs/installation/otp_en.md
lain [Mon, 25 May 2020 13:53:14 +0000 (15:53 +0200)]
Docs: Document reasonable Postgres settings.
lain [Mon, 25 May 2020 13:08:43 +0000 (15:08 +0200)]
Transmogrifier: Use a simpler way to get mentions.
lain [Mon, 25 May 2020 13:06:35 +0000 (15:06 +0200)]
User: Change signature of get_users_from_set
Egor Kislitsyn [Fri, 22 May 2020 13:52:26 +0000 (17:52 +0400)]
Add OpenAPI spec for AdminAPI.RelayController
lain [Mon, 25 May 2020 12:01:16 +0000 (14:01 +0200)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1808-pleroma-sucks
lain [Mon, 25 May 2020 12:00:53 +0000 (12:00 +0000)]
Merge branch 'flaky-tests' into 'develop'
Flaky tests
See merge request pleroma/pleroma!2578
lain [Mon, 25 May 2020 12:00:18 +0000 (14:00 +0200)]
StealEmojiPolicyTest: Clean up.
lain [Mon, 25 May 2020 11:48:47 +0000 (13:48 +0200)]
StealEmojiPolicyTest: Fix flaky test.
lain [Mon, 25 May 2020 11:48:47 +0000 (13:48 +0200)]
StealEmojiPolicyTest: Fix flaky test.
lain [Mon, 25 May 2020 11:40:54 +0000 (11:40 +0000)]
Merge branch 'openapi/admin/status' into 'develop'
Add OpenAPI spec for AdminAPI.StatusController
See merge request pleroma/pleroma!2566
lain [Mon, 25 May 2020 10:59:42 +0000 (12:59 +0200)]
Factory: Set users to be ap_enabled by default.
lain [Mon, 25 May 2020 10:49:38 +0000 (12:49 +0200)]
UserTest: Add test for user refreshing.
lain [Mon, 25 May 2020 10:46:14 +0000 (12:46 +0200)]
User: Don't error out if we want to refresh a user but can't
rinpatch [Sun, 24 May 2020 19:05:57 +0000 (19:05 +0000)]
Merge branch 'mastodon-migration-compat' into 'develop'
Add compatibility routes for converted mastodon instances
Closes #1797
See merge request pleroma/pleroma!2572
lain [Fri, 22 May 2020 17:20:23 +0000 (17:20 +0000)]
Merge branch 'priv-warning' into 'develop'
priv/static: Add a warning discouraging admins from modifying the static files directly
See merge request pleroma/pleroma!2571
lain [Fri, 22 May 2020 16:05:35 +0000 (16:05 +0000)]
Merge branch 'feature/configure-filename-truncate' into 'develop'
Configurable filename truncation threshold
Closes #1799
See merge request pleroma/pleroma!2573
Roman Chvanikov [Fri, 22 May 2020 15:44:10 +0000 (15:44 +0000)]
Apply suggestion to lib/pleroma/web/common_api/utils.ex
Roman Chvanikov [Fri, 22 May 2020 15:30:13 +0000 (18:30 +0300)]
Update CHANGELOG and docs
Roman Chvanikov [Fri, 22 May 2020 15:19:25 +0000 (18:19 +0300)]
Add filename_display_max_length config
lain [Fri, 22 May 2020 15:13:09 +0000 (17:13 +0200)]
Add Changelog
lain [Fri, 22 May 2020 15:11:59 +0000 (17:11 +0200)]
OStatusController: Add Mastodon activity compat route.
lain [Fri, 22 May 2020 15:06:12 +0000 (17:06 +0200)]
ActivityPubController: Add Mastodon activity compat route.
lain [Fri, 22 May 2020 14:47:22 +0000 (16:47 +0200)]
OStatusController: Add Mastodon compatibility route for objects.
rinpatch [Fri, 22 May 2020 14:36:08 +0000 (14:36 +0000)]
Merge branch 'emoji-react-better-errors' into 'develop'
EmojiReactionController: Return more appropriate error.
See merge request pleroma/pleroma!2569
rinpatch [Fri, 22 May 2020 14:35:13 +0000 (14:35 +0000)]
Merge branch 'fix/notifications-api' into 'develop'
Fix notifications mark as read API
Closes #1800
See merge request pleroma/pleroma!2570
rinpatch [Fri, 22 May 2020 14:33:19 +0000 (17:33 +0300)]
priv/static: Add a warning discouraging admins from modifying the static files directly
Egor Kislitsyn [Fri, 22 May 2020 14:15:36 +0000 (18:15 +0400)]
Fix notifications mark as read API
lain [Fri, 22 May 2020 14:15:29 +0000 (16:15 +0200)]
ActivityPubController: Add Mastodon compatibility route.
lain [Fri, 22 May 2020 12:38:28 +0000 (14:38 +0200)]
EmojiReactionController: Return more appropriate error.
Haelwenn [Fri, 22 May 2020 05:47:53 +0000 (05:47 +0000)]
Merge branch 'announce-validator' into 'develop'
Announce validator
See merge request pleroma/pleroma!2567
Haelwenn [Fri, 22 May 2020 05:22:07 +0000 (05:22 +0000)]
Merge branch '1113-op-mentioning' into 'develop'
CommonAPI: Change public->private implicit addressing.
Closes #1113
See merge request pleroma/pleroma!2563
lain [Thu, 21 May 2020 14:32:49 +0000 (14:32 +0000)]
Merge branch 'issue/1707' into 'develop'
[#1707] fixed `mix pleroma.instance gen`
See merge request pleroma/pleroma!2565
lain [Thu, 21 May 2020 14:30:34 +0000 (14:30 +0000)]
Merge branch 'admin-logo-upload' into 'develop'
Ability to upload background, logo, default user avatar, instance thumbnail, and the NSFW hiding image
See merge request pleroma/pleroma!2388
lain [Thu, 21 May 2020 13:31:49 +0000 (13:31 +0000)]
Merge branch 'features/emoji_stealer' into 'develop'
MRF.StealEmojiPolicy: New Policy
See merge request pleroma/pleroma!2385
lain [Thu, 21 May 2020 13:30:09 +0000 (13:30 +0000)]
Merge branch 'openapi/pleroma-api/pleroma' into 'develop'
Add OpenAPI spec for PleromaAPI.PleromaAPIController
See merge request pleroma/pleroma!2564
lain [Thu, 21 May 2020 13:27:44 +0000 (13:27 +0000)]
Merge branch 'issue/749' into 'develop'
[#749] unsubscribes of friends when user deactivated
See merge request pleroma/pleroma!2513
Egor Kislitsyn [Thu, 21 May 2020 10:03:38 +0000 (14:03 +0400)]
Add OpenAPI spec for AdminAPI.StatusController
lain [Thu, 21 May 2020 12:12:32 +0000 (14:12 +0200)]
Credo fixes for the credo god.
lain [Thu, 21 May 2020 11:58:18 +0000 (13:58 +0200)]
AnnounceValidator: Check for announcability
lain [Thu, 21 May 2020 11:31:52 +0000 (13:31 +0200)]
Credo fixes.
lain [Thu, 21 May 2020 11:16:21 +0000 (13:16 +0200)]
Announcements: Fix all tests.
lain [Thu, 21 May 2020 10:43:09 +0000 (12:43 +0200)]
SideEffects: Builed out Announce effects.
lain [Thu, 21 May 2020 10:27:06 +0000 (10:27 +0000)]
Apply suggestion to docs/administration/CLI_tasks/user.md
Egor Kislitsyn [Wed, 20 May 2020 14:00:41 +0000 (18:00 +0400)]
Move status actions to AdminAPI.StatusController
Maksim Pechnikov [Thu, 21 May 2020 05:06:57 +0000 (08:06 +0300)]
rename mix task: `pleroma.user unsubscribe` -> `pleroma.user deactivate`
eugenijm [Sun, 12 Apr 2020 19:54:43 +0000 (22:54 +0300)]
Added the ability to upload background, logo, default user avatar, instance thumbnail, and the NSFW hiding image via AdminFE
Maksim Pechnikov [Wed, 20 May 2020 18:16:40 +0000 (21:16 +0300)]
fixed `mix pleroma.instance gen`
Haelwenn [Wed, 20 May 2020 17:45:19 +0000 (17:45 +0000)]
Merge branch 'chore/update-config-fe' into 'develop'
Synchronize :fe settings in config.exs
See merge request pleroma/pleroma!2560
Mark Felder [Wed, 20 May 2020 17:22:31 +0000 (12:22 -0500)]
Also add new sidebarRight setting
lain [Wed, 20 May 2020 14:36:55 +0000 (16:36 +0200)]
Pipeline: Don't federate if federation is disabled.
lain [Wed, 20 May 2020 13:44:37 +0000 (15:44 +0200)]
Announcements: Handle through common pipeline.
lain [Wed, 20 May 2020 12:08:28 +0000 (12:08 +0000)]
Merge branch 'openapi/pleroma-api/emojis' into 'develop'
Add OpenAPI spec for EmojiPackController
See merge request pleroma/pleroma!2549
lain [Wed, 20 May 2020 12:02:40 +0000 (14:02 +0200)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into announce-validator
lain [Wed, 20 May 2020 11:43:49 +0000 (11:43 +0000)]
Merge branch 'feature/1734-user-deletion' into 'develop'
User deletion
Closes #1734
See merge request pleroma/pleroma!2493
lain [Wed, 20 May 2020 11:40:05 +0000 (11:40 +0000)]
Merge branch 'openapi/fix-spec' into 'develop'
Add `background_image` to `InstanceOperation`
See merge request pleroma/pleroma!2562
lain [Wed, 20 May 2020 11:38:47 +0000 (13:38 +0200)]
CommonAPI: Change public->private implicit addressing.
This will not add the OP to the `to` field anymore when going from
public to private.
Egor Kislitsyn [Wed, 20 May 2020 11:18:58 +0000 (15:18 +0400)]
Add `background_image` to `InstanceOperation`
Egor Kislitsyn [Wed, 20 May 2020 11:14:11 +0000 (15:14 +0400)]
Move notification actions to PleromaAPI.NotificationController
Egor Kislitsyn [Wed, 20 May 2020 11:00:11 +0000 (15:00 +0400)]
Move conversation actions to PleromaAPI.ConversationController
Egor Kislitsyn [Tue, 19 May 2020 19:50:49 +0000 (23:50 +0400)]
Move reaction actions to EmojiReactionController
Egor Kislitsyn [Tue, 19 May 2020 17:52:26 +0000 (21:52 +0400)]
Add OpenAPI spec for PleromaAPI.PleromaAPIController
Haelwenn [Wed, 20 May 2020 10:53:54 +0000 (10:53 +0000)]
Merge branch 'exposed-background-image' into 'develop'
InstanceView: Expose background image link.
See merge request pleroma/pleroma!2545
lain [Wed, 20 May 2020 10:35:36 +0000 (10:35 +0000)]
Merge branch 'issue/1509' into 'develop'
[#1509] purge media from cache after delete
See merge request pleroma/pleroma!2539
lain [Wed, 20 May 2020 10:14:17 +0000 (12:14 +0200)]
Changelog: Add background to instance
lain [Wed, 20 May 2020 10:13:57 +0000 (12:13 +0200)]
Docs: Add background_image in instance
lain [Wed, 20 May 2020 10:12:07 +0000 (12:12 +0200)]
InstanceOperation: Add background image to example
lain [Wed, 20 May 2020 09:12:35 +0000 (09:12 +0000)]
Merge branch 'mastofe/bundle-2020-05-20' into 'develop'
MastoFE: update to bundle-2020-05-20
See merge request pleroma/pleroma!2561
Haelwenn (lanodan) Monnier [Wed, 20 May 2020 05:55:14 +0000 (07:55 +0200)]
MastoFE: update to bundle-2020-05-20
projects / akkoma / log