summaryrefslogtreecommitdiff
path: root/test/web
AgeCommit message (Collapse)Author
2020-06-02Merge branch 'openapi/admin/oauth-apps' into 'develop'lain
Add OpenAPI spec for AdminAPI.OAuthAppContoller See merge request pleroma/pleroma!2582
2020-06-02Merge branch 'openapi/admin/invites' into 'develop'lain
Add OpenAPI spec for AdminAPI.InviteController See merge request pleroma/pleroma!2585
2020-06-02Merge branch 'fix/invisible-repeats' into 'develop'lain
Do not include activities of invisible users unless explicitly requested Closes #1833 See merge request pleroma/pleroma!2620
2020-06-02Do not include activities of invisible users unless explicitly requestedrinpatch
Closes #1833
2020-06-02Merge branch 'feature/status-by-id-account-view' into 'develop'lain
another view for account in admin-fe status_show Closes #1783 See merge request pleroma/pleroma!2543
2020-06-01Merge branch 'user-updates' into 'develop'rinpatch
AccountController: Federate user account changes. Closes pleroma-support#33 and #1801 See merge request pleroma/pleroma!2617
2020-06-01TimelineController: Only return `Create` in public timelines.lain
2020-06-01AccountController: Federate user account changes.lain
Hotfixy commit, will be moved to the pipeline.
2020-05-30Merge branch 'conversation-pagination' into 'develop'lain
Conversation pagination See merge request pleroma/pleroma!2601
2020-05-30Conversation paginationSteven Fuchs
2020-05-29fix unused var warningRoman Chvanikov
2020-05-30Add test for stream boosts of mastodon userkPherox
2020-05-29Merge branch 'fix-relay-repeat-notification' into 'develop'lain
Fix relay repeat notification See merge request pleroma/pleroma!2590
2020-05-29Merge branch 'fix/mediaproxy-bypass-emoji' into 'develop'rinpatch
Fix profile emojis bypassing mediaproxy and harden CSP Closes #1810 See merge request pleroma/pleroma!2596
2020-05-28Merge branch 'feature/1792-update-actor-type' into 'develop'lain
Validate actor type See merge request pleroma/pleroma!2593
2020-05-27AccountView: Use mediaproxy URLs for emojisrinpatch
Also use atom keys in emoji maps instead of binaries Closes #1810
2020-05-27MediaProxy test: use config macros instead of directly putting valuesrinpatch
They were not properly cleaned later and caused trouble for another tests
2020-05-27Exclude post actor from to of relay announcekPherox
2020-05-27Merge branch 'refactor-add-mention-step-one' into 'develop'rinpatch
Fix ObjectView calling into strange functions Closes #1807 See merge request pleroma/pleroma!2580
2020-05-27validate actor typeAlexander Strizhakov
2020-05-26Merge branch '1808-pleroma-sucks' into 'develop'rinpatch
Resolve "Don't fail message ingestions when we can't update a user" Closes #1808 See merge request pleroma/pleroma!2576
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-26another view for account in admin-fe status_showAlexander Strizhakov
2020-05-25[#1501] Made user feed contain public and unlisted activities.Ivan Tashkinov
2020-05-25Add OpenAPI spec for AdminAPI.OAuthAppContollerEgor Kislitsyn
2020-05-25Transmogrifier: Use a simpler way to get mentions.lain
2020-05-25Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
1808-pleroma-sucks
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
Add OpenAPI spec for AdminAPI.StatusController See merge request pleroma/pleroma!2566
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 'feature/configure-filename-truncate' into 'develop'lain
Configurable filename truncation threshold Closes #1799 See merge request pleroma/pleroma!2573
2020-05-22Add filename_display_max_length configRoman Chvanikov
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-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 '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-21Add OpenAPI spec for AdminAPI.StatusControllerEgor Kislitsyn
2020-05-21Credo fixes for the credo god.lain