Fix merge conflicts with upstream
[akkoma] / lib / pleroma / web / mastodon_api / controllers / status_controller.ex
2021-06-04 Sean KingFix merge conflicts with upstream
2021-06-04 HaelwennMerge branch 'tests/openapi-everywhere' into 'develop'
2021-06-01 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-06-01 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-06-01 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-06-01 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-06-01 HaelwennMerge branch 'features/validators-note' into 'develop'
2021-05-31 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-05-30 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-05-29 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-05-29 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-05-29 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-05-29 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-05-29 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-05-28 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-05-28 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-05-28 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-05-19 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-05-19 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-05-16 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-05-16 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-05-14 Alex GleasonMerge remote-tracking branch 'upstream/attachment-meta...
2021-05-13 Alex GleasonMerge remote-tracking branch 'upstream/develop' into...
2021-05-03 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-04-30 Alex GleasonMerge remote-tracking branch 'upstream/develop' into...
2021-04-30 Alex GleasonMerge remote-tracking branch 'upstream/develop' into...
2021-04-29 Alex GleasonMerge remote-tracking branch 'upstream/develop' into...
2021-04-16 rinpatchMerge branch 'features/ingestion-ecto-tag' into 'develop'
2021-04-16 rinpatchMerge branch 'feature/521-pinned-post-federation' into...
2021-03-25 Alexander StrizhakovLet pins federate
2021-03-19 rinpatchMerge branch 'fix/remove_auto_nsfw' into 'develop'
2021-03-03 lainRevert "StatusController: Deactivate application suppor...
2021-03-02 lainMerge branch 'release/2.3.0' into 'stable'
2021-03-02 lainLinting.
2021-03-02 lainStatusController: Deactivate application support for...
2021-03-02 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2021-03-01 HaelwennMerge branch 'application-to-generator' into 'develop'
2021-03-01 Mark FelderStore application details in the object under the gener...
2021-02-28 lainMerge branch 'features/reports-enhancements' into ...
2021-02-28 lainMerge branch 'admin-api-versioning' into 'develop'
2021-02-28 lainMerge branch 'bugfix/peertube-mpegURL-object' into...
2021-02-28 lainMerge branch 'feat/client_app_details' into 'develop'
2021-02-27 Mark FelderStore the client application data in ActivityStreams...
2021-02-26 feldMerge branch 'ecto-rollback-in-test-env' into 'develop'
2021-02-18 Mark FelderTests to validate client disclosure obeys user setting
2021-02-18 Mark FelderMastodon makes this field null when posting with MastoF...
2021-02-12 Mark FelderApp is already preloaded into the token, so avoid an...
2021-02-11 Mark FelderConsistency
2021-02-11 Mark FelderRevert to original formatting for these function defs
2021-02-11 Mark FelderPrefer naming this put_application because we're puttin...
2021-02-11 Mark Felder%Token{} may not be in the conn, so avoid breaking...
2021-02-10 Mark FelderEnsure we capture the application details into the...
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-08 Alex GleasonMerge remote-tracking branch 'upstream/develop' into...
2021-01-08 lainMerge branch 'fix/missing_emoji_steal_dir' into 'develop'
2021-01-07 lainMerge branch 'cleanup/unused-proxy-opts' into 'develop'
2021-01-07 lainMerge branch 'object-normalize-refactor' into 'develop'
2021-01-05 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2021-01-04 lainObject: Rework how Object.normalize works
2020-12-30 Alex GleasonMerge remote-tracking branch 'upstream/develop' into...
2020-12-23 lainMerge branch 'stable' into mergeback/2.2.1
2020-12-15 lainMerge branch 'support/2255_posix_errors' into 'develop'
2020-11-21 feldMerge branch 'libmagic' into 'develop'
2020-11-21 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2020-11-21 Alex GleasonMerge remote-tracking branch 'upstream/develop' into...
2020-11-20 feldMerge branch 'fix/2302-report-duplicates' into 'develop'
2020-11-19 feldMerge branch 'oban-jobs-to-simple-tasks' into 'develop'
2020-11-19 HaelwennMerge branch '2317-old-reset-tokens' into 'develop'
2020-11-19 lainMerge branch 'hide-muted-reactions' into 'develop'
2020-11-18 minibikiniMerge branch 'develop' into 'hide-muted-reactions'
2020-11-17 Egor KislitsynMerge remote-tracking branch 'origin/develop' into...
2020-11-17 Egor KislitsynMerge branch 'develop' into hide-muted-reactions
2020-11-17 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2020-11-17 rinpatchImport stable commits into develop after releasing...
2020-11-16 Egor KislitsynHide reactions from muted and blocked users
2020-11-15 Alex GleasonMerge remote-tracking branch 'upstream/develop' into...
2020-11-12 rinpatchMerge branch 'release/2.2.0' into 'stable'
2020-11-11 Egor KislitsynMerge branch 'develop' into frontend-admin-api
2020-11-10 lainMerge branch '2260-wrong-report-link' into 'develop'
2020-11-05 lainMerge branch 'feature/expire-mutes' into 'develop'
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 feldMerge branch 'chore/elixir-1.11' into 'develop'
2020-11-04 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2020-10-29 HaelwennMerge branch 'issue/2069' into 'develop'
2020-10-29 feldMerge branch 'fix/frontend-cli-docs' into 'develop'
2020-10-29 feldMerge branch 'issue/2137-user-filters-admin-fe' into...
2020-10-29 Egor KislitsynMerge remote-tracking branch 'origin/develop' into...
2020-10-28 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2020-10-27 minibikiniMerge branch 'develop' into 'feature/local-only-scope'
2020-10-27 Mark FelderMerge branch 'develop' into feature/account-export
2020-10-27 feldMerge branch '1668-prometheus-access-restrictions'...
next