Commit Graph

10135 Commits (62b8c31b7a84dadb2a46861fe0f2dd1dbf9d40f0)
 

Author SHA1 Message Date
rinpatch 3601c0015c Merge branch '1808-pleroma-sucks' into 'develop'
4 years ago
rinpatch 5ad28ff405 Merge branch 'apps-index' into 'develop'
4 years ago
rinpatch ed08da9135 Merge branch '1813-throttling' into 'develop'
4 years ago
lain d8d99fd4cf Activity.Queries: Use correct actor restriction.
4 years ago
lain acba7043be Migrations: Add index on client_id and client_secret for apps.
4 years ago
lain 5083558ecd Merge branch 'restore-new-image' into 'develop'
4 years ago
lain 337ca33e5e Config: Restore old new background image
4 years ago
lain b233c8e55c Merge branch 'fix/oban-warnings' into 'develop'
4 years ago
Egor Kislitsyn 2069ec5006
Fix Oban warnings
4 years ago
lain 51bc6674f6 Mastodon API Controllers: Use the correct params for rate limiting.
4 years ago
Egor Kislitsyn fca48154a2
Add AdminAPI.InviteView
4 years ago
Egor Kislitsyn 2a4f965191
Add OpenAPI spec for AdminAPI.InviteTokenController
4 years ago
Egor Kislitsyn 95ebfb9190
Move invite actions to AdminAPI.InviteTokenController
4 years ago
lain 644195e31e Merge branch '1501-include-unlisted-posts-in-user-feed' into 'develop'
4 years ago
Alexander Strizhakov 8f08384d80
another view for account in admin-fe status_show
4 years ago
lain c8803965af Merge branch 'skip-crypt-test' into 'develop'
4 years ago
Ivan Tashkinov d7a57004ef [#1501] Made user feed contain public and unlisted activities.
4 years ago
Egor Kislitsyn e32b7ae044
Skip failing `:crypt` test on mac
4 years ago
Egor Kislitsyn 0ba1f2631a
Add OpenAPI spec for AdminAPI.OAuthAppContoller
4 years ago
lain 09d8b9cb55 Merge branch '1471-tuning-advice' into 'develop'
4 years ago
lain af3568a6d9 Docs: sql -> SQL
4 years ago
lain f7cb3f4cfc Apply suggestion to docs/installation/otp_en.md
4 years ago
lain dbd07d29a3 Streamer: Don't crash on streaming chat notifications
4 years ago
lain 2c25087d20 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
lain 6a85fe1f9d Docs: Document reasonable Postgres settings.
4 years ago
lain 6bd7070b00 Transmogrifier: Use a simpler way to get mentions.
4 years ago
lain 5fef405208 User: Change signature of get_users_from_set
4 years ago
Egor Kislitsyn cbcd592300
Add OpenAPI spec for AdminAPI.RelayController
4 years ago
lain f20dff451e Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1808-pleroma-sucks
4 years ago
lain 6783d544b2 Merge branch 'flaky-tests' into 'develop'
4 years ago
lain 5d5db7e5b7 StealEmojiPolicyTest: Clean up.
4 years ago
lain 2dff376041 StealEmojiPolicyTest: Fix flaky test.
4 years ago
lain ee35bb5ac2 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
lain aeb0875025 StealEmojiPolicyTest: Fix flaky test.
4 years ago
lain ec470c4c77 Merge branch 'openapi/admin/status' into 'develop'
4 years ago
lain 3bec0d2e50 Factory: Set users to be ap_enabled by default.
4 years ago
lain 0c970a9d44 UserTest: Add test for user refreshing.
4 years ago
lain d0c26956da User: Don't error out if we want to refresh a user but can't
4 years ago
rinpatch 7bc2ec0aa2 Merge branch 'mastodon-migration-compat' into 'develop'
4 years ago
lain 72189d227f Merge branch 'priv-warning' into 'develop'
4 years ago
lain ddbbefeb2e Merge branch 'feature/configure-filename-truncate' into 'develop'
4 years ago
Roman Chvanikov 5d60b25e69 Apply suggestion to lib/pleroma/web/common_api/utils.ex
4 years ago
Roman Chvanikov 8eb1dfadca Update CHANGELOG and docs
4 years ago
Roman Chvanikov cc82229ba7 Add filename_display_max_length config
4 years ago
lain 3506e95499 Add Changelog
4 years ago
lain 91c8467582 OStatusController: Add Mastodon activity compat route.
4 years ago
lain 355aa3bdc7 ActivityPubController: Add Mastodon activity compat route.
4 years ago
lain 8a4bd9e5d1 OStatusController: Add Mastodon compatibility route for objects.
4 years ago
rinpatch 1fa7aa9fc5 Merge branch 'emoji-react-better-errors' into 'develop'
4 years ago
rinpatch 96650c55ae Merge branch 'fix/notifications-api' into 'develop'
4 years ago