Merge remote-tracking branch 'origin/develop' into password-reset
[akkoma] / lib / pleroma / web / mastodon_api / controllers / auth_controller.ex
2021-12-03 Alex GleasonMerge remote-tracking branch 'origin/develop' into...
2021-11-15 lainMerge branch 'block-behavior' into 'develop'
2021-11-15 lainMerge branch 'instance-deletion' into 'develop'
2021-11-15 lainMerge branch 'fix-object-deletion-timeout' into 'develop'
2021-11-15 lainMerge branch 'userfeed-fe-fallback' into 'develop'
2021-10-06 HaelwennMerge branch 'bugfix/crypt-pragma' into 'develop'
2021-10-06 HaelwennMerge branch 'from/develop/tusooa/add-remove-emails...
2021-09-07 HaelwennMerge branch 'remove/mastofe' into 'develop'
2021-08-08 HaelwennMerge branch 'release/2.4.0' into 'stable'
2021-08-06 Sean KingMerge branch 'develop' of git.pleroma.social:pleroma...
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-10 Sean KingMerge develop branch upstream
2021-06-30 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-06-07 feldMerge branch 'develop' into 'fix/prune-hashtags'
2021-06-05 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-06-04 Sean KingFix more build errors
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 HaelwennMerge branch 'features/validators-note' into 'develop'
2021-05-31 HaelwennMerge branch 'docs/goto-libera' into 'develop'
2021-05-30 Alex GleasonMerge commit '07fed0fda2473fc4e1e3b01e863217391fd2902f...
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 feldMerge branch 'cycles-router-api-routes' into 'develop'
2021-05-28 feldMerge branch 'simplepolicy-announce-leak' into 'develop'
2021-05-28 feldMerge branch 'gitignore-runtime-exs' into 'develop'
2021-05-28 feldMerge branch 'alias-router-helpers' into 'develop'
2021-05-19 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-05-18 Alex GleasonSwitch to aliasing `Router.Helpers` instead of importing
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 Sean KingRemove MastoFE-related backend code and frontend pieces
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
2021-01-06 Alex GleasonMerge remote-tracking branch 'upstream/develop' into...
2020-12-30 Alex GleasonMerge remote-tracking branch 'upstream/develop' into...
2020-12-23 lainMerge branch 'stable' into mergeback/2.2.1
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-07 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2020-12-06 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2020-11-28 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2020-11-28 Ivan TashkinovOAuth form user remembering feature. Local MastoFE...
2020-11-25 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2020-11-25 Ivan TashkinovSession token setting on token exchange. Auth-related...
2020-11-21 feldMerge branch 'libmagic' into 'develop'
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 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'...
2020-10-27 feldMerge branch 'develop' into 'feature/autofollowing'
2020-10-26 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2020-10-26 lainMerge branch 'docs/clients-apc2s' into 'develop'
2020-10-26 HaelwennMerge branch 'docs/ap_c2s' into 'develop'
2020-10-23 HaelwennMerge branch 'fix/sendmail' into 'develop'
2020-10-23 rinpatchMerge branch '2242-nsfw-case' into 'develop'
2020-10-22 feldMerge branch 'chore/elixir-1.11' into 'develop'
2020-10-17 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/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
next