aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2020-05-27Merge branch 'notification-fixes' into 'develop'rinpatch
2020-05-27Migrations: Make user_id index on notifications better for query.lain
2020-05-27Notification: Actually preload objects.lain
2020-05-27Merge branch 'fav-speedup' into 'develop'lain
2020-05-27ActivityPub: Change ordering to `nulls last` in favorites querylain
2020-05-26Merge branch 'fav-speedup' into 'develop'rinpatch
2020-05-26Merge branch '1808-pleroma-sucks' into 'develop'rinpatch
2020-05-26Merge branch 'apps-index' into 'develop'rinpatch
2020-05-26Merge branch '1813-throttling' into 'develop'rinpatch
2020-05-26Activity.Queries: Use correct actor restriction.lain
2020-05-26Migrations: Add index on client_id and client_secret for apps.lain
2020-05-26Merge branch 'restore-new-image' into 'develop'lain
2020-05-26Config: Restore old new background imagelain
2020-05-26Merge branch 'fix/oban-warnings' into 'develop'lain
2020-05-26Fix Oban warningsEgor Kislitsyn
2020-05-26Mastodon API Controllers: Use the correct params for rate limiting.lain
2020-05-26Merge branch '1501-include-unlisted-posts-in-user-feed' into 'develop'lain
2020-05-26Merge branch 'skip-crypt-test' into 'develop'lain
2020-05-25[#1501] Made user feed contain public and unlisted activities.Ivan Tashkinov
2020-05-25Skip failing `:crypt` test on macEgor Kislitsyn
2020-05-25Merge branch '1471-tuning-advice' into 'develop'lain
2020-05-25Docs: sql -> SQLlain
2020-05-25Apply suggestion to docs/installation/otp_en.mdlain
2020-05-25Docs: Document reasonable Postgres settings.lain
2020-05-25Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1808-plerom...lain
2020-05-25Merge branch 'flaky-tests' into 'develop'lain
2020-05-25StealEmojiPolicyTest: Clean up.lain
2020-05-25StealEmojiPolicyTest: Fix flaky test.lain
2020-05-25StealEmojiPolicyTest: Fix flaky test.lain
2020-05-25Merge branch 'openapi/admin/status' into 'develop'lain
2020-05-25Factory: Set users to be ap_enabled by default.lain
2020-05-25UserTest: Add test for user refreshing.lain
2020-05-25User: Don't error out if we want to refresh a user but can'tlain
2020-05-24Merge branch 'mastodon-migration-compat' into 'develop'rinpatch
2020-05-22Merge branch 'priv-warning' into 'develop'lain
2020-05-22Merge branch 'feature/configure-filename-truncate' into 'develop'lain
2020-05-22Apply suggestion to lib/pleroma/web/common_api/utils.exRoman Chvanikov
2020-05-22Update CHANGELOG and docsRoman Chvanikov
2020-05-22Add filename_display_max_length configRoman Chvanikov
2020-05-22Add Changeloglain
2020-05-22OStatusController: Add Mastodon activity compat route.lain
2020-05-22ActivityPubController: Add Mastodon activity compat route.lain
2020-05-22OStatusController: Add Mastodon compatibility route for objects.lain
2020-05-22Merge branch 'emoji-react-better-errors' into 'develop'rinpatch
2020-05-22Merge branch 'fix/notifications-api' into 'develop'rinpatch
2020-05-22priv/static: Add a warning discouraging admins from modifying the static file...rinpatch
2020-05-22Fix notifications mark as read APIEgor Kislitsyn
2020-05-22ActivityPubController: Add Mastodon compatibility route.lain
2020-05-22EmojiReactionController: Return more appropriate error.lain
2020-05-22Merge branch 'announce-validator' into 'develop'Haelwenn