Ivan Tashkinov 6ffa2b5f66 [#1260] Merge remote-tracking branch 'remotes/upstream/develop' into 1260-rate-limited-auth-actions ...

# Conflicts:
#	CHANGELOG.md

2019-09-30 17:41:20 +03:00

..

token

Bump copyright years of files changed in 2019

2019-09-18 23:21:11 +02:00

app.ex

tests for mastodon_api_controller.ex

2019-09-06 21:50:00 +03:00

authorization.ex

Replace Pleroma.FlakeId with flake_id hex package

2019-09-25 17:14:31 +07:00

fallback_controller.ex

Wrap error messages into gettext helpers

2019-07-10 18:10:09 +07:00

oauth_controller.ex

[#1260] Merge remote-tracking branch 'remotes/upstream/develop' into 1260-rate-limited-auth-actions

2019-09-30 17:41:20 +03:00

oauth_view.ex

[#923] OAuth: prototype of sign in / sign up with Twitter.

2019-03-15 17:08:03 +03:00

scopes.ex

Refactoring functions for dealing with oauth scopes.

2019-05-08 10:52:13 +00:00

token.ex

Replace Pleroma.FlakeId with flake_id hex package

2019-09-25 17:14:31 +07:00