akkoma/lib/pleroma/web/oauth
Ivan Tashkinov 37925cbe78 Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
# Conflicts:
#	lib/pleroma/web/oauth/oauth_controller.ex
#	lib/pleroma/web/router.ex
2019-04-02 14:05:34 +03:00
..
app.ex [#468] Merged upstream/develop, resolved conflicts. 2019-02-17 14:07:04 +03:00
authorization.ex Ecto 3.0.5 migration 2019-03-20 15:59:54 +03:00
fallback_controller.ex Correctly handle invalid credentials on auth login. 2019-01-28 11:41:47 +01:00
oauth_controller.ex Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth 2019-04-02 14:05:34 +03:00
oauth_view.ex [#923] OAuth: prototype of sign in / sign up with Twitter. 2019-03-15 17:08:03 +03:00
token.ex change Repo.get(User, id) => User.get_by_id(id) 2019-04-02 17:01:26 +07:00