Merge branch 'develop' into feature/upgrade-laravel-to-5.6

This commit is contained in:
Dane Everitt 2018-05-20 16:30:42 -07:00 committed by GitHub
commit 7e2e5fd7c1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
129 changed files with 234 additions and 202 deletions

View file

@ -10,7 +10,7 @@ class AuthenticateApplicationUser
{
/**
* Authenticate that the currently authenticated user is an administrator
* and should be allowed to proceede through the application API.
* and should be allowed to proceed through the application API.
*
* @param \Illuminate\Http\Request $request
* @param \Closure $next

View file

@ -25,7 +25,7 @@ class RequireTwoFactorAuthentication
private $alert;
/**
* The names of routes that should be accessable without 2FA enabled.
* The names of routes that should be accessible without 2FA enabled.
*
* @var array
*/

View file

@ -33,7 +33,7 @@ class AuthenticateAsSubuser
}
/**
* Determine if a subuser has permissions to access a server, if so set thier access token.
* Determine if a subuser has permissions to access a server, if so set their access token.
*
* @param \Illuminate\Http\Request $request
* @param \Closure $next