aboutsummaryrefslogtreecommitdiff
path: root/test/web
AgeCommit message (Expand)Author
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
2020-05-30Merge branch 'develop' into refactor/fe-bundlesRoman Chvanikov
2020-05-30Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remo...lain
2020-05-30CommonAPI: Linkify chat messages.lain
2020-05-30SafeText: Let through basic html.lain
2020-05-30Merge branch 'conversation-pagination' into 'develop'lain
2020-05-30Conversation paginationSteven Fuchs
2020-05-30[#1794] Fixed search query splitting regex to deal with Unicode. Adjusted a t...Ivan Tashkinov
2020-05-30Merge remote-tracking branch 'remotes/origin/develop' into fix/1794-hashtag-s...Ivan Tashkinov
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
2020-05-29Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remo...lain
2020-05-29Merge branch 'fix/mediaproxy-bypass-emoji' into 'develop'rinpatch
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
2020-05-28Refactor notification settingsMark Felder
2020-05-28Merge developRoman Chvanikov
2020-05-27AccountView: Use mediaproxy URLs for emojisrinpatch
2020-05-27MediaProxy test: use config macros instead of directly putting valuesrinpatch
2020-05-27Exclude post actor from to of relay announcekPherox
2020-05-27Merge branch 'refactor-add-mention-step-one' into 'develop'rinpatch
2020-05-27validate actor typeAlexander Strizhakov
2020-05-26Merge branch '1808-pleroma-sucks' into 'develop'rinpatch
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 remake-remo...lain
2020-05-25Transmogrifier: Use a simpler way to get mentions.lain
2020-05-25Add OpenAPI spec for AdminAPI.RelayControllerEgor Kislitsyn
2020-05-25Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1808-plerom...lain
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 remake-remo...lain
2020-05-25StealEmojiPolicyTest: Fix flaky test.lain
2020-05-25Merge branch 'openapi/admin/status' into 'develop'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