summaryrefslogtreecommitdiff
path: root/test
AgeCommit message (Expand)Author
2020-04-16Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remo...lain
2020-04-16AccountView: Return user ap_id.lain
2020-04-16ChatMessages: Better validation.lain
2020-04-16CommonAPI: Escape HTML for chat messages.lain
2020-04-15Chat: Add views, don't return them in timeline queries.lain
2020-04-15Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remo...lain
2020-04-15remote_ip plug adds remote_ip_found flagAlexander Strizhakov
2020-04-14Revert "Merge branch 'issue/1276' into 'develop'"lain
2020-04-14Merge branch 'logger-configuration' into 'develop'feld
2020-04-14Merge branch 'issue/1276' into 'develop'Haelwenn
2020-04-13Add OpenAPI spec for DomainBlockControllerEgor Kislitsyn
2020-04-13Merge branch 'develop' into issue/1276Maksim Pechnikov
2020-04-13Merge remote-tracking branch 'remotes/origin/develop' into output-of-relation...Ivan Tashkinov
2020-04-13fix for logger configuration through admin-feAlexander Strizhakov
2020-04-11Merge branch 'following-relationships-optimizations' into 'develop'rinpatch
2020-04-10Chat: Only create them for valid users for now.lain
2020-04-10Merge branch 'develop' into fix/support-conversations-paginationEgor Kislitsyn
2020-04-10Merge branch 'bugfix/apc2s_upload_activity' into 'develop'Haelwenn
2020-04-09ChatController: Basic message posting.lain
2020-04-09ChatController: Basic support for returning messages.lain
2020-04-09ChatController: Add creation and return of chats.lain
2020-04-09Add `/api/v1/notifications/:id/dismiss` endpointEgor Kislitsyn
2020-04-09Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remo...lain
2020-04-09CommonAPI: Basic ChatMessage support.lain
2020-04-09SideEffects: Extend ChatMessage test.lain
2020-04-09SideEffects: Handle ChatMessage creation.lain
2020-04-09Merge branch 'fix/1658-invite-send' into 'develop'lain
2020-04-09Apply suggestion to test/web/admin_api/admin_api_controller_test.exsAlexander Strizhakov
2020-04-09Apply suggestion to test/web/admin_api/admin_api_controller_test.exsAlexander Strizhakov
2020-04-09Merge branch 'open-api' into 'develop'lain
2020-04-08formatter.ex: Use Phoenix.HTML for mention/hashtag generationrinpatch
2020-04-08ChatMessage: Basic incoming handling.lain
2020-04-07Merge branch 'fix-auto-link-for-profile-fields' into 'develop'rinpatch
2020-04-07Merge branch 'develop' into issue/1276Maksim Pechnikov
2020-04-07Apply suggestion to test/web/mastodon_api/controllers/account_controller/upda...kPherox
2020-04-06Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remo...lain
2020-04-06Merge branch 'featureflag/emoji_reactions' into 'develop'lain
2020-04-06Merge branch 'improving-test-coverage' into 'develop'lain
2020-04-06Merge branch 'remake-remodel-2' into 'develop'lain
2020-04-06using another fn for file deletionAlexander Strizhakov
2020-04-06tests for emoji mix taskAlexander Strizhakov
2020-04-02Merge remote-tracking branch 'remotes/origin/2323-accounts-relationships-hotf...Ivan Tashkinov
2020-04-02[#2323] Fixed a typo causing /accounts/relationships to render default relati...Ivan Tashkinov
2020-04-02Chats: Basic implementation.lain
2020-04-02Merge branch 'develop' into issue/1276Maksim Pechnikov
2020-04-01Add OpenAPIEgor Kislitsyn
2020-04-01error improvement for email_invite endpointAlexander Strizhakov
2020-04-01Merge remote-tracking branch 'remotes/origin/develop' into output-of-relation...Ivan Tashkinov
2020-04-01Merge branch 'gun' into 'develop'feld
2020-04-01Ability to control the output of account/pleroma/relationship in statuses in ...Ivan Tashkinov