aboutsummaryrefslogtreecommitdiff
path: root/test/web
AgeCommit message (Collapse)Author
2020-06-02Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
remake-remodel-dms
2020-06-02Activity: Remove notifications-related functions.lain
2020-06-02NotificationController: Don't return chat_mentions by default.lain
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-02Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
remake-remodel-dms
2020-06-02replies filtering for blocked domainsAlexander Strizhakov
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-01exclude replies on blocked domainsAlexander Strizhakov
2020-06-01CommonAPI: Newlines -> br for chat messages.lain
2020-06-01Merge remote-tracking branch 'origin/develop' into global-status-expirationEgor Kislitsyn
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 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
remake-remodel-dms
2020-05-30CommonAPI: Linkify chat messages.lain
2020-05-30SafeText: Let through basic html.lain
2020-05-30Merge branch 'conversation-pagination' into 'develop'lain
Conversation pagination See merge request pleroma/pleroma!2601
2020-05-30Conversation paginationSteven Fuchs
2020-05-30[#1794] Fixed search query splitting regex to deal with Unicode. Adjusted a ↵Ivan Tashkinov
test.
2020-05-30Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
fix/1794-hashtag-search-results
2020-05-29fix unused var warningRoman Chvanikov
2020-05-29[#1794] Improvements to hashtags extraction from search query.Ivan Tashkinov
2020-05-30Add test for stream boosts of mastodon userkPherox
2020-05-29AP C2S: allow limit & order on outbox & read_inboxHaelwenn (lanodan) Monnier
2020-05-29Bugfix: Reuse Controller.Helper pagination for APC2SHaelwenn (lanodan) Monnier
2020-05-29SideEffects: Stream out chat messages.lain
2020-05-29Streamer: Add a chat message stream.lain
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 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
remake-remodel-dms
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-28Add OpenApi spec to AdminAPI.ConfigControllerEgor Kislitsyn
2020-05-28Move config actions to AdminAPI.ConfigControllerEgor Kislitsyn
2020-05-28Merge branch 'feature/1792-update-actor-type' into 'develop'lain
Validate actor type See merge request pleroma/pleroma!2593
2020-05-28Refactor notification settingsMark Felder
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-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-25Transmogrifier: Use a simpler way to get mentions.lain