Ivan Tashkinov 835ac2157c Merge remote-tracking branch 'remotes/upstream/develop' into 1427-oauth-admin-scopes ...

# Conflicts:
#	CHANGELOG.md

2019-12-10 08:55:14 +03:00

..

token

OAuth token cleanup: Get rid of compile-time configuration

2019-12-08 20:03:33 +03: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

…

oauth_controller.ex

[#1427] Initial support for OAuth admin scopes.

2019-11-29 18:57:19 +03:00

oauth_view.ex

…

scopes.ex

[#1427] Reworked admin scopes support.

2019-12-06 00:25:44 +03:00

token.ex

Replace Pleroma.FlakeId with flake_id hex package

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