Resolve follow activity from accept/reject without ID (#328)
[akkoma] / test / pleroma / web / mastodon_api / controllers / conversation_controller_test.exs
2021-12-26 Alex GleasonMerge remote-tracking branch 'origin/develop' into...
2021-11-15 lainMerge branch 'block-behavior' into 'develop'
2021-08-08 HaelwennMerge branch 'release/2.4.0' into 'stable'
2021-08-05 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-08-04 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-07-27 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-07-27 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-07-18 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-07-17 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-07-14 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-07-14 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-07-12 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-07-12 HaelwennMerge branch 'features/ingestion-page' into 'develop'
2021-06-30 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-06-27 sadpostermerge
2021-06-08 feldMerge branch 'improve-og-embed' into 'develop'
2021-06-07 feldMerge branch 'pleromapi' into 'develop'
2021-06-07 feldMerge branch 'develop' into 'fix/prune-hashtags'
2021-06-07 feldMerge branch 'fix/plug_parser_multipart' into 'develop'
2021-06-05 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-06-04 feldMerge branch 'fix/clear_config_warning' into 'develop'
2021-06-04 Sean KingFix merge conflicts with upstream
2021-06-04 HaelwennMerge branch 'tests/openapi-everywhere' into 'develop'
2021-04-30 Alex GleasonMerge remote-tracking branch 'upstream/develop' into...
2021-04-29 Alex GleasonMerge remote-tracking branch 'upstream/develop' into...
2021-03-19 rinpatchMerge branch 'fix/remove_auto_nsfw' into 'develop'
2021-03-15 Haelwenn (lanodan... OpenAPI: MastodonAPI Conversation Controller
2021-03-02 lainMerge branch 'release/2.3.0' into 'stable'
2021-02-28 lainMerge branch 'feat/client_app_details' into 'develop'
2021-02-26 feldMerge branch 'ecto-rollback-in-test-env' into 'develop'
2021-02-24 HaelwennMerge branch 'docfix/chat-token' into 'develop'
2021-02-23 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2021-02-20 sadposterMerge branch 'develop' of https://git.pleroma.social...
2021-02-18 rinpatchMerge branch 'fix/chats-no-unread-in-openapi' into...
2021-02-17 rinpatchMerge branch 'test-docker-images' into 'develop'
2021-02-17 HaelwennMerge branch 'chore/documentation-relicensing' into...
2021-02-17 HaelwennMerge branch 'feat/chat-list-pagination' into 'develop'
2021-02-17 rinpatchMerge branch 'remove-conversation-api' into 'develop'
2021-02-15 Egor KislitsynAdd API endpoint to remove a conversation
2021-01-23 sadposterMerge branch 'develop' of https://git.pleroma.social...
2021-01-20 feldMerge branch 'deprecate-public_endpoint' into 'develop'
2021-01-19 rinpatchMerge branch 'stable' into mergeback/2.2.2
2021-01-15 HaelwennMerge branch 'optimize-command_available' into 'develop'
2021-01-13 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2021-01-13 HaelwennMerge branch 'chores/bump-copyright' into 'develop'
2021-01-13 Haelwenn (lanodan... Bump Copyright to 2021
2021-01-06 Alex GleasonMerge remote-tracking branch 'upstream/develop' into...
2021-01-05 feldMerge branch 'fix/mediaproxy-config-descriptions' into...
2020-12-30 Alex GleasonMerge remote-tracking branch 'upstream/develop' into...
2020-12-29 sadposterMerge branch 'develop' of https://git.pleroma.social...
2020-12-28 HaelwennMerge branch 'features/hashtag-column' into 'develop'
2020-12-26 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2020-12-26 lainMerge branch 'cachex-test' into 'develop'
2020-12-23 lainMerge branch 'stable' into mergeback/2.2.1
2020-12-21 lainTests: Make as many tests as possible async.
2020-12-20 rinpatchMerge branch 'bugfix/mastofe-install-script' into ...
2020-12-17 Alex GleasonMerge remote-tracking branch 'upstream/develop' into...
2020-12-15 lainMerge branch 'support/2255_posix_errors' into 'develop'
2020-12-09 lainMerge branch 'auth-improvements' into 'develop'
2020-12-09 lainMerge branch 'stream-follow-updates' into 'develop'
2020-12-01 Egor KislitsynStream follow updates
2020-11-21 feldMerge branch 'libmagic' into 'develop'
2020-11-17 rinpatchImport stable commits into develop after releasing...
2020-11-15 sadposterMerge branch 'develop' of https://git.pleroma.social...
2020-11-15 Alex GleasonMerge remote-tracking branch 'upstream/develop' into...
2020-11-12 rinpatchMerge branch 'release/2.2.0' into 'stable'
2020-11-04 lainMerge branch 'default-mrf' into 'develop'
2020-11-04 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2020-11-04 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2020-11-04 lainMerge branch 'ejabberd-pleroma-auth' into 'develop'
2020-11-04 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2020-11-04 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2020-11-04 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2020-11-04 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2020-11-04 lainMerge branch 'hide-muted-chats' into 'develop'
2020-11-04 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2020-11-04 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2020-11-03 lainMerge branch 'chores/pleroma-favicon-logo' into 'develop'
2020-11-03 lainMerge branch 'patch-4' into 'develop'
2020-11-03 lainConversations: A few refactors
2020-11-03 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2020-11-02 lainMerge branch 'bugfix/poll_replies_count' into 'develop'
2020-11-02 minibikiniMerge branch 'develop' into 'frontend-admin-api'
2020-11-01 sadposterMerge branch 'develop' of https://git.pleroma.social...
2020-10-30 Egor KislitsynMerge remote-tracking branch 'origin/develop' into...
2020-10-30 Alibek OmarovConversationControllerTest: fix test, fix formatting
2020-10-30 Alibek OmarovConversationView: fix last_status.account being empty...
2020-10-30 Alibek OmarovConversationControllerTest: fix test
2020-10-30 minibikiniMerge branch 'develop' into 'feature/local-only-scope'
2020-10-29 HaelwennMerge branch 'issue/2069' into 'develop'
2020-10-26 HaelwennMerge branch 'docs/ap_c2s' into 'develop'
2020-10-17 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2020-10-14 Mark FelderMerge branch 'develop' into feature/account-export
2020-10-14 Alex GleasonMerge remote-tracking branch 'upstream/develop' into...
2020-10-14 Alex GleasonMerge remote-tracking branch 'upstream/develop' into...
2020-10-14 Alex GleasonMerge remote-tracking branch 'upstream/develop' into...
2020-10-14 Alex GleasonMerge remote-tracking branch 'upstream/develop' into...
2020-10-13 Mark FelderMerge branch 'develop' into feature/gen-magic
2020-10-13 Mark FelderMerge branch 'develop' into chore/elixir-1.11
2020-10-13 Mark FelderMerge branch 'develop' into refactor/locked_user_field
next