aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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
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
Announce validator See merge request pleroma/pleroma!2567
2020-05-22Merge branch '1113-op-mentioning' into 'develop'Haelwenn
CommonAPI: Change public->private implicit addressing. Closes #1113 See merge request pleroma/pleroma!2563
2020-05-21Merge branch 'issue/1707' into 'develop'lain
[#1707] fixed `mix pleroma.instance gen` See merge request pleroma/pleroma!2565
2020-05-21Merge branch 'admin-logo-upload' into 'develop'lain
Ability to upload background, logo, default user avatar, instance thumbnail, and the NSFW hiding image See merge request pleroma/pleroma!2388
2020-05-21Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
remake-remodel-dms
2020-05-21Merge branch 'features/emoji_stealer' into 'develop'lain
MRF.StealEmojiPolicy: New Policy See merge request pleroma/pleroma!2385
2020-05-21Merge branch 'openapi/pleroma-api/pleroma' into 'develop'lain
Add OpenAPI spec for PleromaAPI.PleromaAPIController See merge request pleroma/pleroma!2564
2020-05-21Merge branch 'issue/749' into 'develop'lain
[#749] unsubscribes of friends when user deactivated See merge request pleroma/pleroma!2513
2020-05-21Add OpenAPI spec for AdminAPI.StatusControllerEgor Kislitsyn
2020-05-21UploadTest: Fix test.lain
2020-05-21Attachments: Have the mediaType on the root, too.lain
2020-05-21Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
remake-remodel-dms
2020-05-21Credo fixes for the credo god.lain
2020-05-21AnnounceValidator: Check for announcabilitylain