summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-05-26Merge branch '1813-throttling' into 'develop'rinpatch
Mastodon API Controllers: Use the correct params for rate limiting. Closes #1813 See merge request pleroma/pleroma!2586
2020-05-26Activity.Queries: Use correct actor restriction.lain
2020-05-26Migrations: Add index on client_id and client_secret for apps.lain
Greatly speeds up app lookup.
2020-05-26Merge branch 'restore-new-image' into 'develop'lain
Config: Restore old new background image See merge request pleroma/pleroma!2588
2020-05-26Config: Restore old new background imagelain
Became lost in a settings restructure
2020-05-26Merge branch 'fix/oban-warnings' into 'develop'lain
Fix Oban warnings See merge request pleroma/pleroma!2587
2020-05-26Fix Oban warningsEgor Kislitsyn
2020-05-26Mastodon API Controllers: Use the correct params for rate limiting.lain
2020-05-26Add AdminAPI.InviteViewEgor Kislitsyn
2020-05-26Add OpenAPI spec for AdminAPI.InviteTokenControllerEgor Kislitsyn
2020-05-26Move invite actions to AdminAPI.InviteTokenControllerEgor Kislitsyn
2020-05-26Merge branch '1501-include-unlisted-posts-in-user-feed' into 'develop'lain
[#1501] Made user feed contain public and unlisted activities Closes #1501 See merge request pleroma/pleroma!2584
2020-05-26another view for account in admin-fe status_showAlexander Strizhakov
2020-05-26Merge branch 'skip-crypt-test' into 'develop'lain
Skip failing `:crypt` test on mac See merge request pleroma/pleroma!2583
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-25Add OpenAPI spec for AdminAPI.OAuthAppContollerEgor Kislitsyn
2020-05-25Merge branch '1471-tuning-advice' into 'develop'lain
Docs: Document reasonable Postgres settings. See merge request pleroma/pleroma!2581
2020-05-25Docs: sql -> SQLlain
2020-05-25Apply suggestion to docs/installation/otp_en.mdlain
2020-05-25Streamer: Don't crash on streaming chat notificationslain
2020-05-25Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
remake-remodel-dms
2020-05-25Docs: Document reasonable Postgres settings.lain
2020-05-25Transmogrifier: Use a simpler way to get mentions.lain
2020-05-25User: Change signature of get_users_from_setlain
2020-05-25Add OpenAPI spec for AdminAPI.RelayControllerEgor Kislitsyn
2020-05-25Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
1808-pleroma-sucks
2020-05-25Merge branch 'flaky-tests' into 'develop'lain
Flaky tests See merge request pleroma/pleroma!2578
2020-05-25StealEmojiPolicyTest: Clean up.lain
2020-05-25StealEmojiPolicyTest: Fix flaky test.lain
2020-05-25Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
remake-remodel-dms
2020-05-25StealEmojiPolicyTest: Fix flaky test.lain
2020-05-25Merge branch 'openapi/admin/status' into 'develop'lain
Add OpenAPI spec for AdminAPI.StatusController See merge request pleroma/pleroma!2566
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
Add compatibility routes for converted mastodon instances Closes #1797 See merge request pleroma/pleroma!2572
2020-05-22Merge branch 'priv-warning' into 'develop'lain
priv/static: Add a warning discouraging admins from modifying the static files directly See merge request pleroma/pleroma!2571
2020-05-22Merge branch 'feature/configure-filename-truncate' into 'develop'lain
Configurable filename truncation threshold Closes #1799 See merge request pleroma/pleroma!2573
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
EmojiReactionController: Return more appropriate error. See merge request pleroma/pleroma!2569
2020-05-22Merge branch 'fix/notifications-api' into 'develop'rinpatch
Fix notifications mark as read API Closes #1800 See merge request pleroma/pleroma!2570
2020-05-22priv/static: Add a warning discouraging admins from modifying the static ↵rinpatch
files directly
2020-05-22Fix notifications mark as read APIEgor Kislitsyn
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-04 21:21:23 +0000