Merge branch 'master' of https://github.com/joshuawoodward/grafana into joshuawoodward-master

This commit is contained in:
Torkel Ödegaard
2019-03-11 13:10:45 +01:00
6 changed files with 7 additions and 1 deletions

View File

@@ -25,6 +25,7 @@ export class LoginCtrl {
$scope.disableLoginForm = config.disableLoginForm;
$scope.disableUserSignUp = config.disableUserSignUp;
$scope.loginHint = config.loginHint;
$scope.passwordHint = config.passwordHint;
$scope.loginMode = true;
$scope.submitBtnText = 'Log in';