Merge branch 'object-normalize-refactor' into 'develop'
[akkoma] / lib / pleroma / web / mastodon_api / controllers / conversation_controller.ex
2020-11-21 feldMerge branch 'libmagic' into 'develop'
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-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-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
2020-10-13 Mark FelderMerge branch 'develop' into refactor/discoverable_user_...
2020-10-13 feldMerge branch 'feature/1822-files-consistency' into...
2020-10-13 Alexander Strizhakovalias alphabetically order
2020-10-13 Alexander StrizhakovOAuthScopesPlug module name
2020-08-28 lainMerge branch 'release/2.1.0' into 'stable'
2020-08-25 lainMerge branch 'stable' of git.pleroma.social:pleroma...
2020-06-20 lainMerge branch 'bugfix/mix.exs-version-dot-git-less'...
2020-06-17 rinpatchMerge branch 'features/users-raw_bio' into 'develop'
2020-06-12 Mark FelderMerge branch 'develop' into preload-data
2020-06-08 Egor KislitsynMerge branch 'develop' into global-status-expiration
2020-06-08 lainMerge branch 'openapi/admin/relay' into 'develop'
2020-06-08 lainMerge branch 'feature/delete-follow-requests-on-user...
2020-06-08 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2020-06-08 lainMerge branch 'activity-pub-use-atoms-as-keys' into...
2020-06-05 Egor KislitsynMerge remote-tracking branch 'origin/develop' into...
2020-06-05 HaelwennMerge branch 'features/apc2s-pagination' into 'develop'
2020-06-04 Egor KislitsynUse atoms as keys in `ActivityPub.fetch_*` functions...
2020-06-04 Egor KislitsynMerge branch 'develop' into openapi/admin/config
2020-06-03 stwfMerge branch 'preload-data' of git.pleroma.social:stwf...
2020-06-02 feldMerge branch 'fix/1794-hashtag-search-results' into...
2020-06-02 Egor KislitsynMerge branch 'develop' into openapi/admin/relay
2020-06-02 lainMerge branch 'openapi/admin/oauth-apps' into 'develop'
2020-06-02 lainMerge branch 'tagline' into 'develop'
2020-06-02 lainMerge branch 'openapi/admin/invites' into 'develop'
2020-06-02 lainMerge branch 'feature/status-by-id-account-view' into...
2020-06-01 Egor KislitsynMerge remote-tracking branch 'origin/develop' into...
2020-06-01 Egor KislitsynMerge remote-tracking branch 'origin/develop' into...
2020-05-30 HaelwennMerge branch 'chore/bump-hackney' into 'develop'
2020-05-30 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2020-05-30 lainMerge branch 'conversation-pagination' into 'develop'
2020-05-30 Steven FuchsConversation pagination
2020-05-18 lainMerge branch 'docs/storing-remote-media' into 'develop'
2020-05-16 lainMerge branch 'develop' into 'remove-twitter-api'
2020-05-14 lainMerge branch 'features/openrc-console' into 'develop'
2020-05-10 lainMerge branch 'shortening-modules-name' into 'develop'
2020-05-08 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2020-05-07 HaelwennMerge branch 'feature/restrict-c2s' into 'develop'
2020-05-07 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2020-05-07 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2020-05-07 lainMerge branch 'openapi/polls' into 'develop'
2020-05-06 rinpatchMerge branch 'feature/delete-validator' into 'develop'
2020-05-06 Maksim PechnikovMerge branch 'develop' into issue/1276-2
2020-05-06 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2020-05-06 lainMerge branch 'plug-if-unless-func-options-refactoring...
2020-05-06 lainMerge branch 'openapi/subscriptions' into 'develop'
2020-05-06 lainMerge branch 'openapi/markers' into 'develop'
2020-05-06 lainMerge branch 'bugfix/sensitive_object' into 'develop'
2020-05-06 lainMerge branch 'fix/1726-user-pagination' into 'develop'
2020-05-06 lainMerge branch 'openapi/follow_requests' into 'develop'
2020-05-06 lainMerge branch 'openapi/filters' into 'develop'
2020-05-06 lainMerge branch 'feature/1728-webfinger-acct-scheme' into...
2020-05-06 lainMerge branch 'openapi/instance' into 'develop'
2020-05-06 lainMerge branch 'openapi/lists' into 'develop'
2020-05-06 lainMerge branch 'openapi/conversations' into 'develop'
2020-05-05 Egor KislitsynAdd OpenAPI spec for ConversationController
2020-05-05 Egor KislitsynMerge branch 'develop' into global-status-expiration
2020-05-02 rinpatchMerge branch 'feature/1710-consolidate-instance-info...
2020-05-01 lainMerge branch 'issue/1577' into 'develop'
2020-05-01 Maksim PechnikovMerge branch 'develop' into issue/1276-2
2020-04-30 lainMerge branch '1364-no-pushes-from-blocked-domains-users...
2020-04-30 Egor KislitsynMerge branch 'develop' into openapi/notifications
2020-04-30 Egor KislitsynMerge branch 'develop' into openapi/reports
2020-04-29 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2020-04-29 lainMerge branch 'automatic-authentication-and-instance...
2020-04-28 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2020-04-22 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2020-04-22 lainMerge branch 'docs/debian-packages' into 'develop'
2020-04-21 Ivan Tashkinovchecks of authentication / instance publicity. Definiti...
2020-03-19 lainMerge branch 'remake-remodel' into develop
2020-03-13 rinpatchMerge branch 'feature/mastofe-admin-scope' into 'develop'
2020-03-13 rinpatchMerge branch 'docs/direct_conversation_id' into 'develop'
2020-03-13 rinpatchMerge branch 'static-accept-missing' into 'develop'
2020-03-12 Egor KislitsynMerge remote-tracking branch 'origin/develop' into...
2020-03-11 feldMerge branch 'fix/signup-without-email' into 'develop'
2020-03-11 feldMerge branch 'relay-list-change' into 'develop'
2020-03-09 lainMerge branch 'patch-1' into 'develop'
2020-03-08 Maksim PechnikovMerge branch 'develop' into issue/1276
2020-03-08 rinpatchMerge branch 'release/2.0.0' into 'stable'
2020-03-07 rinpatchMerge branch 'restart-fix-for-mix-tasks' into 'develop'
2020-03-06 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2020-03-05 rinpatchMerge branch 'stable' into release/2.0.0
2020-03-05 rinpatchMerge branch 'stable' into release/2.0.0
2020-03-04 feldMerge branch 'exclude-reblogs-from-admin-api-by-default...
2020-03-04 lainMerge branch 'fix/no-email-no-fail' into 'develop'
next