Commit graph

10138 commits

Author SHA1 Message Date
lain 7e13200869 ActivityPub: Change ordering to nulls last in favorites query
This makes it use our existing index and speeds up the query.
2020-05-27 09:46:12 +02:00
Alexander Strizhakov 3249141588
validate actor type 2020-05-27 10:14:22 +03:00
rinpatch cf139b06a3 Merge branch 'fav-speedup' into 'develop'
Fix favorites query performance

See merge request pleroma/pleroma!2591
2020-05-26 16:33:13 +00:00
rinpatch 3601c0015c 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
2020-05-26 15:57:01 +00:00
rinpatch 5ad28ff405 Merge branch 'apps-index' into 'develop'
Migrations: Add index on client_id and client_secret for apps.

See merge request pleroma/pleroma!2589
2020-05-26 15:56:23 +00:00
rinpatch ed08da9135 Merge branch '1813-throttling' into 'develop'
Mastodon API Controllers: Use the correct params for rate limiting.

Closes #1813

See merge request pleroma/pleroma!2586
2020-05-26 15:55:09 +00:00
lain d8d99fd4cf Activity.Queries: Use correct actor restriction. 2020-05-26 17:46:16 +02:00
lain acba7043be Migrations: Add index on client_id and client_secret for apps.
Greatly speeds up app lookup.
2020-05-26 16:46:57 +02:00
lain 5083558ecd Merge branch 'restore-new-image' into 'develop'
Config: Restore old new background image

See merge request pleroma/pleroma!2588
2020-05-26 14:17:54 +00:00
lain 337ca33e5e Config: Restore old new background image
Became lost in a settings restructure
2020-05-26 16:00:56 +02:00
lain b233c8e55c Merge branch 'fix/oban-warnings' into 'develop'
Fix Oban warnings

See merge request pleroma/pleroma!2587
2020-05-26 12:41:46 +00:00
Egor Kislitsyn 2069ec5006
Fix Oban warnings 2020-05-26 16:11:42 +04:00
lain 51bc6674f6 Mastodon API Controllers: Use the correct params for rate limiting. 2020-05-26 13:45:54 +02:00
Egor Kislitsyn fca48154a2
Add AdminAPI.InviteView 2020-05-26 15:21:33 +04:00
Egor Kislitsyn 2a4f965191
Add OpenAPI spec for AdminAPI.InviteTokenController 2020-05-26 15:03:07 +04:00
Egor Kislitsyn 95ebfb9190
Move invite actions to AdminAPI.InviteTokenController 2020-05-26 15:03:07 +04:00
lain 644195e31e 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
2020-05-26 10:56:40 +00:00
Alexander Strizhakov 8f08384d80
another view for account in admin-fe status_show 2020-05-26 13:48:39 +03:00
lain c8803965af Merge branch 'skip-crypt-test' into 'develop'
Skip failing `:crypt` test on mac

See merge request pleroma/pleroma!2583
2020-05-26 08:32:13 +00:00
Ivan Tashkinov d7a57004ef [#1501] Made user feed contain public and unlisted activities. 2020-05-25 23:27:47 +03:00
Egor Kislitsyn e32b7ae044
Skip failing :crypt test on mac 2020-05-25 23:01:37 +04:00
Egor Kislitsyn 0ba1f2631a
Add OpenAPI spec for AdminAPI.OAuthAppContoller 2020-05-25 22:04:06 +04:00
lain 09d8b9cb55 Merge branch '1471-tuning-advice' into 'develop'
Docs: Document reasonable Postgres settings.

See merge request pleroma/pleroma!2581
2020-05-25 17:45:40 +00:00
lain af3568a6d9 Docs: sql -> SQL 2020-05-25 19:26:07 +02:00
lain f7cb3f4cfc Apply suggestion to docs/installation/otp_en.md 2020-05-25 17:11:35 +00:00
lain dbd07d29a3 Streamer: Don't crash on streaming chat notifications 2020-05-25 17:27:45 +02:00
lain 2c25087d20 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms 2020-05-25 16:52:03 +02:00
lain 6a85fe1f9d Docs: Document reasonable Postgres settings. 2020-05-25 15:53:14 +02:00
lain 6bd7070b00 Transmogrifier: Use a simpler way to get mentions. 2020-05-25 15:08:43 +02:00
lain 5fef405208 User: Change signature of get_users_from_set 2020-05-25 15:06:35 +02:00
Egor Kislitsyn cbcd592300
Add OpenAPI spec for AdminAPI.RelayController 2020-05-25 16:51:16 +04:00
lain f20dff451e Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1808-pleroma-sucks 2020-05-25 14:01:16 +02:00
lain 6783d544b2 Merge branch 'flaky-tests' into 'develop'
Flaky tests

See merge request pleroma/pleroma!2578
2020-05-25 12:00:53 +00:00
lain 5d5db7e5b7 StealEmojiPolicyTest: Clean up. 2020-05-25 14:00:18 +02:00
lain 2dff376041 StealEmojiPolicyTest: Fix flaky test. 2020-05-25 13:58:14 +02:00
lain ee35bb5ac2 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms 2020-05-25 13:57:27 +02:00
lain aeb0875025 StealEmojiPolicyTest: Fix flaky test. 2020-05-25 13:48:47 +02:00
lain ec470c4c77 Merge branch 'openapi/admin/status' into 'develop'
Add OpenAPI spec for AdminAPI.StatusController

See merge request pleroma/pleroma!2566
2020-05-25 11:40:54 +00:00
lain 3bec0d2e50 Factory: Set users to be ap_enabled by default. 2020-05-25 12:59:42 +02:00
lain 0c970a9d44 UserTest: Add test for user refreshing. 2020-05-25 12:49:38 +02:00
lain d0c26956da User: Don't error out if we want to refresh a user but can't 2020-05-25 12:46:14 +02:00
rinpatch 7bc2ec0aa2 Merge branch 'mastodon-migration-compat' into 'develop'
Add compatibility routes for converted mastodon instances

Closes #1797

See merge request pleroma/pleroma!2572
2020-05-24 19:05:57 +00:00
lain 72189d227f 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
2020-05-22 17:20:23 +00:00
lain ddbbefeb2e Merge branch 'feature/configure-filename-truncate' into 'develop'
Configurable filename truncation threshold

Closes #1799

See merge request pleroma/pleroma!2573
2020-05-22 16:05:35 +00:00
Roman Chvanikov 5d60b25e69 Apply suggestion to lib/pleroma/web/common_api/utils.ex 2020-05-22 15:44:10 +00:00
Roman Chvanikov 8eb1dfadca Update CHANGELOG and docs 2020-05-22 18:30:13 +03:00
Roman Chvanikov cc82229ba7 Add filename_display_max_length config 2020-05-22 18:19:25 +03:00
lain 3506e95499 Add Changelog 2020-05-22 17:13:09 +02:00
lain 91c8467582 OStatusController: Add Mastodon activity compat route. 2020-05-22 17:11:59 +02:00
lain 355aa3bdc7 ActivityPubController: Add Mastodon activity compat route. 2020-05-22 17:06:12 +02:00