Merge remote-tracking branch 'pleroma/develop' into cycles-constants
[akkoma] / lib / pleroma / web / pleroma_api / controllers / user_import_controller.ex
2021-06-01 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
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-01 rinpatchMerge branch 'refactor/object_validator_validate' into...
2021-03-21 rinpatchMerge branch 'richmedia-workaround' into 'develop'
2021-03-19 rinpatchMerge branch 'mediaproxy-decode' into 'develop'
2021-03-19 rinpatchMerge branch 'fix/remove_auto_nsfw' into 'develop'
2021-03-19 rinpatchMerge branch 'bugfix/bridgy-user-icon' into 'develop'
2021-03-16 HaelwennMerge branch 'update_open_api_spex' into 'develop'
2021-03-05 Egor KislitsynUpdate OpenApiSpex dependency
2021-03-02 lainMerge branch 'release/2.3.0' into 'stable'
2021-02-26 feldMerge branch 'ecto-rollback-in-test-env' into 'develop'
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
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 Strizhakovchanges after rebase
2020-10-09 Mark FelderMerge branch 'develop' into feature/gen-magic
2020-10-08 Alex GleasonMerge remote-tracking branch 'upstream/develop' into...
2020-10-08 Alex GleasonMerge remote-tracking branch 'upstream/develop' into...
2020-09-23 Mark FelderMerge branch 'develop' into feature/bulk-confirmation
2020-09-23 Roman ChvanikovMerge develop
2020-09-22 Maksim PechnikovMerge branch 'develop' into issue/1975
2020-09-22 Alex GleasonMerge remote-tracking branch 'upstream/develop' into...
2020-09-22 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2020-09-21 feldMerge branch 'fix/fedsocket-useragent' into 'develop'
2020-09-21 lainMerge branch 'bugfix/federator-actor-error' into 'develop'
2020-09-21 lainMerge branch '2074-streaming-api-oauth-scopes-validatio...
2020-09-21 lainMerge branch 'issue/2099' into 'develop'
2020-09-18 Maksim PechnikovMerge branch 'develop' into issue/2099
2020-09-18 Maksim PechnikovMerge branch 'develop' into issue/2099
2020-09-17 Maksim PechnikovMerge branch 'develop' into issue/2099
2020-09-07 Maksim Pechnikovadded api spec
2020-09-06 Maksim Pechnikovadded import mutes