Backport all fixes from the master to 1.1

2015-08-03 14:23:46 +01:00
parent 5bdbc87bf2
commit 90baf18724
7 changed files with 109 additions and 24 deletions
@@ -127,7 +127,12 @@ return [
        'password'       => 'Password',
        'api-token'      => 'API Token',
        'api-token-help' => 'Regenerating your API token will prevent existing applications from accessing Cachet.',
-        '2fa'            => [
+        'user_level'     => 'User Level',
+        'levels'         => [
+            'admin' => 'Admin',
+            'user'  => 'User',
+        ],
+        '2fa' => [
            'help' => 'Enabling two factor authentication increases security of your account. You will need to download <a href="https://support.google.com/accounts/answer/1066447?hl=en">Google Authenticator</a> or a similar app on to your mobile device. When you login you will be asked to provide a token generated by the app.',
        ],
    ],