Skip to content

S
syncEnrollments
Commit e20ad704 authored by Graham Campbell's avatar Graham Campbell
Browse files
Options

Merge branch 'master' into develop

parents 749bb11a 716e6526
Show whitespace changes
Inline Side-by-side
Showing with 45 additions and 6 deletions
app/Http/Controllers/Controller.php
View file @ e20ad704
...@@ -5,8 +5,9 @@ namespace App\Http\Controllers; ...@@ -5,8 +5,9 @@ namespace App\Http\Controllers;
use Illuminate\Foundation\Bus\DispatchesJobs; use Illuminate\Foundation\Bus\DispatchesJobs;
use Illuminate\Routing\Controller as BaseController; use Illuminate\Routing\Controller as BaseController;
use Illuminate\Foundation\Validation\ValidatesRequests; use Illuminate\Foundation\Validation\ValidatesRequests;
use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
abstract class Controller extends BaseController abstract class Controller extends BaseController
{ {
use DispatchesJobs, ValidatesRequests; use AuthorizesRequests, DispatchesJobs, ValidatesRequests;
} }
app/Jobs/Job.php
View file @ e20ad704
...@@ -13,7 +13,7 @@ abstract class Job ...@@ -13,7 +13,7 @@ abstract class Job
| |
| This job base class provides a central location to place any logic that | This job base class provides a central location to place any logic that
| is shared across all of your jobs. The trait included with the class | is shared across all of your jobs. The trait included with the class
| provides access to the "queueOn" and "delay" queue helper methods. | provides access to the "onQueue" and "delay" queue helper methods.
| |
*/ */
......
app/Providers/AuthServiceProvider.php 0 → 100644
View file @ e20ad704
<?php
namespace App\Providers;
use Illuminate\Contracts\Auth\Access\Gate as GateContract;
use Illuminate\Foundation\Support\Providers\AuthServiceProvider as ServiceProvider;
class AuthServiceProvider extends ServiceProvider
{
/**
* The policy mappings for the application.
*
* @var array
*/
protected $policies = [
'App\Model' => 'App\Policies\ModelPolicy',
];
/**
* Register any application authentication / authorization services.
*
* @param \Illuminate\Contracts\Auth\Access\Gate $gate
* @return void
*/
public function boot(GateContract $gate)
{
parent::registerPolicies($gate);
//
}
}
app/User.php
View file @ e20ad704
...@@ -5,12 +5,16 @@ namespace App; ...@@ -5,12 +5,16 @@ namespace App;
use Illuminate\Auth\Authenticatable; use Illuminate\Auth\Authenticatable;
use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Model;
use Illuminate\Auth\Passwords\CanResetPassword; use Illuminate\Auth\Passwords\CanResetPassword;
use Illuminate\Foundation\Auth\Access\Authorizable;
use Illuminate\Contracts\Auth\Authenticatable as AuthenticatableContract; use Illuminate\Contracts\Auth\Authenticatable as AuthenticatableContract;
use Illuminate\Contracts\Auth\Access\Authorizable as AuthorizableContract;
use Illuminate\Contracts\Auth\CanResetPassword as CanResetPasswordContract; use Illuminate\Contracts\Auth\CanResetPassword as CanResetPasswordContract;
class User extends Model implements AuthenticatableContract, CanResetPasswordContract class User extends Model implements AuthenticatableContract,
AuthorizableContract,
CanResetPasswordContract
{ {
use Authenticatable, CanResetPassword; use Authenticatable, Authorizable, CanResetPassword;
/** /**
* The database table used by the model. * The database table used by the model.
......
config/app.php
View file @ e20ad704
...@@ -141,6 +141,7 @@ return [ ...@@ -141,6 +141,7 @@ return [
* Application Service Providers... * Application Service Providers...
*/ */
App\Providers\AppServiceProvider::class, App\Providers\AppServiceProvider::class,
App\Providers\AuthServiceProvider::class,
App\Providers\EventServiceProvider::class, App\Providers\EventServiceProvider::class,
App\Providers\RouteServiceProvider::class, App\Providers\RouteServiceProvider::class,
...@@ -172,6 +173,7 @@ return [ ...@@ -172,6 +173,7 @@ return [
'Eloquent' => Illuminate\Database\Eloquent\Model::class, 'Eloquent' => Illuminate\Database\Eloquent\Model::class,
'Event' => Illuminate\Support\Facades\Event::class, 'Event' => Illuminate\Support\Facades\Event::class,
'File' => Illuminate\Support\Facades\File::class, 'File' => Illuminate\Support\Facades\File::class,
'Gate' => Illuminate\Support\Facades\Gate::class,
'Hash' => Illuminate\Support\Facades\Hash::class, 'Hash' => Illuminate\Support\Facades\Hash::class,
'Input' => Illuminate\Support\Facades\Input::class, 'Input' => Illuminate\Support\Facades\Input::class,
'Inspiring' => Illuminate\Foundation\Inspiring::class, 'Inspiring' => Illuminate\Foundation\Inspiring::class,
......
resources/lang/en/validation.php
View file @ e20ad704
...@@ -41,6 +41,7 @@ return [ ...@@ -41,6 +41,7 @@ return [
'in' => 'The selected :attribute is invalid.', 'in' => 'The selected :attribute is invalid.',
'integer' => 'The :attribute must be an integer.', 'integer' => 'The :attribute must be an integer.',
'ip' => 'The :attribute must be a valid IP address.', 'ip' => 'The :attribute must be a valid IP address.',
'json' => 'The :attribute must be a valid JSON string.',
'max' => [ 'max' => [
'numeric' => 'The :attribute may not be greater than :max.', 'numeric' => 'The :attribute may not be greater than :max.',
'file' => 'The :attribute may not be greater than :max kilobytes.', 'file' => 'The :attribute may not be greater than :max kilobytes.',
......
resources/views/errors/503.blade.php
View file @ e20ad704
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<head> <head>
<title>Be right back.</title> <title>Be right back.</title>
<link href="//fonts.googleapis.com/css?family=Lato:100" rel="stylesheet" type="text/css"> <link href="https://fonts.googleapis.com/css?family=Lato:100" rel="stylesheet" type="text/css">
<style> <style>
html, body { html, body {
......
resources/views/welcome.blade.php
View file @ e20ad704
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<head> <head>
<title>Laravel</title> <title>Laravel</title>
<link href="//fonts.googleapis.com/css?family=Lato:100" rel="stylesheet" type="text/css"> <link href="https://fonts.googleapis.com/css?family=Lato:100" rel="stylesheet" type="text/css">
<style> <style>
html, body { html, body {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment