[#468] Merged `upstream/develop`, resolved conflicts.
[akkoma] / lib / pleroma / web / oauth / oauth_controller.ex
2018-04-01 KANEKO YoshitakaFix conflict
2018-03-30 lainFormat the code.
2018-03-25 lambdaMerge branch 'feature/oauth-token-password' into 'develop'
2018-03-23 William Pitcockoauth: implement grant_type=password for single-page...
2018-02-12 lainMerge branch 'hakabahitoyo/pleroma-feature/atom-feed...
2018-02-11 Hakaba HitoyoMerge remote-tracking branch 'hakabahitoyo/feature...
2018-02-11 Roger BraunMerge branch 'develop' into feature/activitypub
2018-02-09 lambdaMerge branch 'develop' into 'develop'
2018-02-08 Calv CollinsMerge branch 'develop' of https://git.pleroma.social...
2018-02-08 Calv CollinsCreate action_fallback for username/password incorrect...
2017-12-09 Roger BraunMerge branch 'develop' into feature/activitypub
2017-11-12 lambdaMerge branch 'mastodon-notification-endpoints' into...
2017-11-10 Roger BraunHandle existing redirect params.
2017-11-06 lambdaMerge branch 'fix-tootdon-oauth' into 'develop'
2017-11-06 ealFix tootdon logins.
2017-09-16 Roger BraunFix callback state.
2017-09-14 Roger BraunPreserve state in oauth
2017-09-11 lambadalambdaMerge branch 'oauth2' into 'develop'
2017-09-11 Roger BraunMerge branch 'develop' into oauth2
2017-09-09 Roger BraunDo oauth redirect.
2017-09-09 Roger BraunUse token exchange method.
2017-09-07 Roger BraunSlight cleanup.
2017-09-06 Roger BraunAdd very basic oauth and mastodon api support.