From bc868a9be9677c444f014589fc37571f57c9a222 Mon Sep 17 00:00:00 2001 From: alex quiambao Date: Sun, 19 Jun 2016 14:31:03 +0800 Subject: [PATCH 1/9] Added help section --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 7635a5c..010b1de 100644 --- a/README.md +++ b/README.md @@ -66,6 +66,9 @@ $ artisan ng:config name #New config inside angular/config/ #### [Read Full Documentation] (http://silverbux.github.io/laravel-angular-admin) +## Need Help? +You need help customizing? You have an awesome project and you need to hire a coder? hit me up with a message my email address is indicated on my [Github Profile] (https://github.com/silverbux) OR send me a message on skype: **silverbux** + ## Features * [JWT-Auth] (https://github.com/tymondesigns/jwt-auth) * [Socialite] (https://github.com/laravel/socialite) From 37e15025e64756f22c28b7211bfccd7f3c4d2928 Mon Sep 17 00:00:00 2001 From: Thomas Tong Date: Tue, 16 Aug 2016 06:59:38 +0800 Subject: [PATCH 2/9] Fix server side error display in login&forgot pages (#60) --- .../forgot-password/forgot-password.component.html | 3 ++- .../forgot-password/forgot-password.component.js | 8 +++++++- .../app/components/login-form/login-form.component.html | 4 ++++ angular/app/components/login-form/login-form.component.js | 7 +++++++ 4 files changed, 20 insertions(+), 2 deletions(-) diff --git a/angular/app/components/forgot-password/forgot-password.component.html b/angular/app/components/forgot-password/forgot-password.component.html index 0937071..d5d8b6e 100644 --- a/angular/app/components/forgot-password/forgot-password.component.html +++ b/angular/app/components/forgot-password/forgot-password.component.html @@ -3,11 +3,12 @@

Error:

Please check your email and try again.

-
+

This is not a valid email

Email is required.

+

{{ vm.serverError }}

diff --git a/angular/app/components/forgot-password/forgot-password.component.js b/angular/app/components/forgot-password/forgot-password.component.js index 3b2e644..8a702d5 100644 --- a/angular/app/components/forgot-password/forgot-password.component.js +++ b/angular/app/components/forgot-password/forgot-password.component.js @@ -5,6 +5,7 @@ class ForgotPasswordController { this.API = API this.$state = $state this.formSubmitted = false + this.serverError = '' } $onInit () { @@ -12,11 +13,16 @@ class ForgotPasswordController { } submit () { + this.serverError = '' + this.API.all('auth/password/email').post({ email: this.email }).then(() => { this.$state.go('login', { successMsg: `Please check your email for instructions on how to reset your password.` }) - }, () => { + }, (res) => { + for (var error in res.data.errors) { + this.serverError += res.data.errors[error] + ' ' + } this.formSubmitted = true }) } diff --git a/angular/app/components/login-form/login-form.component.html b/angular/app/components/login-form/login-form.component.html index f5441f0..214eedc 100644 --- a/angular/app/components/login-form/login-form.component.html +++ b/angular/app/components/login-form/login-form.component.html @@ -1,4 +1,8 @@
+
+

Login Failed

+

{{ vm.loginfailederror }}

+

Login Failed

Incorrect Email/Username or Password.

diff --git a/angular/app/components/login-form/login-form.component.js b/angular/app/components/login-form/login-form.component.js index 521e3f9..22b57a1 100644 --- a/angular/app/components/login-form/login-form.component.js +++ b/angular/app/components/login-form/login-form.component.js @@ -11,6 +11,7 @@ class LoginFormController { this.registerSuccess = $stateParams.registerSuccess this.successMsg = $stateParams.successMsg + this.loginfailederror = '' this.loginfailed = false this.unverified = false } @@ -21,6 +22,7 @@ class LoginFormController { } login () { + this.loginfailederror = '' this.loginfailed = false this.unverified = false @@ -51,6 +53,11 @@ class LoginFormController { } else { if (res.data.errors.message[0] == 'Email Unverified') { this.unverified = true + } else { + // other kinds of error returned from server + for (var error in res.data.errors) { + this.loginfailederror += res.data.errors[error] + ' ' + } } } } From 58d12a817b57b7e3b91bbb613c8ed9eef1aadc93 Mon Sep 17 00:00:00 2001 From: alex quiambao Date: Wed, 24 Aug 2016 09:03:07 +0800 Subject: [PATCH 3/9] Simply return login failed instead of min 8 char validation --- app/Http/Controllers/Auth/AuthController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/Auth/AuthController.php b/app/Http/Controllers/Auth/AuthController.php index 799eaeb..bb3daad 100644 --- a/app/Http/Controllers/Auth/AuthController.php +++ b/app/Http/Controllers/Auth/AuthController.php @@ -130,7 +130,7 @@ public function postLogin(Request $request) { $this->validate($request, [ 'email' => 'required|email', - 'password' => 'required|min:8', + 'password' => 'required', ]); $credentials = $request->only('email', 'password'); From e93774486b706b6ce3fd174adb30bad312da0e31 Mon Sep 17 00:00:00 2001 From: Alex Quiambao Date: Wed, 24 Aug 2016 10:17:32 +0800 Subject: [PATCH 4/9] Switching from less to sass (#63) --- angular/index.components.js | 2 + composer.json | 2 +- composer.lock | 632 +++++++++++++++--------------------- config/generators.php | 3 +- elixir.json | 2 +- 5 files changed, 275 insertions(+), 366 deletions(-) diff --git a/angular/index.components.js b/angular/index.components.js index 9d700cf..86b8635 100644 --- a/angular/index.components.js +++ b/angular/index.components.js @@ -1,3 +1,4 @@ +import {TesterComponent} from './app/components/tester/tester.component'; import { TablesSimpleComponent } from './app/components/tables-simple/tables-simple.component' import { UiModalComponent } from './app/components/ui-modal/ui-modal.component' import { UiTimelineComponent } from './app/components/ui-timeline/ui-timeline.component' @@ -28,6 +29,7 @@ import { LoginFormComponent } from './app/components/login-form/login-form.compo import { RegisterFormComponent } from './app/components/register-form/register-form.component' angular.module('app.components') + .component('tester', TesterComponent) .component('tablesSimple', TablesSimpleComponent) .component('uiModal', UiModalComponent) .component('uiTimeline', UiTimelineComponent) diff --git a/composer.json b/composer.json index 420267c..1a2b081 100644 --- a/composer.json +++ b/composer.json @@ -9,7 +9,7 @@ "laravel/framework": "5.2.*", "tymon/jwt-auth": "0.5.*", "barryvdh/laravel-cors": "0.7.x", - "laravelangular/generators": "2.3.x", + "laravelangular/generators": "2.7.x", "dingo/api": "1.0.x@dev", "laravel/socialite": "^2.0", "bican/roles": "2.1.*" diff --git a/composer.lock b/composer.lock index 82e247b..38fab74 100644 --- a/composer.lock +++ b/composer.lock @@ -4,8 +4,8 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "9800d16deae04521c1376776bb653ba4", - "content-hash": "f8f314fdc3d33683b028adc2722d16fe", + "hash": "a1a937d192813240363a6c990d1b8142", + "content-hash": "12ebb9df02df084fb6d26b06775dc9a4", "packages": [ { "name": "asm89/stack-cors", @@ -200,40 +200,40 @@ }, { "name": "dingo/api", - "version": "dev-master", + "version": "v1.0.0-beta3", "source": { "type": "git", "url": "https://github.com/dingo/api.git", - "reference": "8cd1a6cd7d2ba9fc96841fd0745ef8fc1ce2a530" + "reference": "7fa939c8edc0fb775c495ae10f220a8cf66d399c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/dingo/api/zipball/8cd1a6cd7d2ba9fc96841fd0745ef8fc1ce2a530", - "reference": "8cd1a6cd7d2ba9fc96841fd0745ef8fc1ce2a530", + "url": "https://api.github.com/repos/dingo/api/zipball/7fa939c8edc0fb775c495ae10f220a8cf66d399c", + "reference": "7fa939c8edc0fb775c495ae10f220a8cf66d399c", "shasum": "" }, "require": { "dingo/blueprint": "0.1.*", "doctrine/annotations": "1.2.*", - "illuminate/routing": "5.1.* || 5.2.*", - "illuminate/support": "5.1.* || 5.2.*", + "illuminate/routing": "~5.1", + "illuminate/support": "~5.1", "league/fractal": ">=0.12.0", - "php": "^5.5.9 || ^7.0", + "php": ">=5.5.9", "phpdocumentor/reflection-docblock": "2.0.*" }, "require-dev": { - "illuminate/auth": "5.1.* || 5.2.*", - "illuminate/cache": "5.1.* || 5.2.*", - "illuminate/console": "5.1.* || 5.2.*", - "illuminate/database": "5.1.* || 5.2.*", - "illuminate/events": "5.1.* || 5.2.*", - "illuminate/filesystem": "5.1.* || 5.2.*", - "illuminate/log": "5.1.* || 5.2.*", - "illuminate/pagination": "5.1.* || 5.2.*", - "laravel/lumen-framework": "5.1.* || 5.2.*", + "illuminate/auth": "~5.1", + "illuminate/cache": "~5.1", + "illuminate/console": "~5.1", + "illuminate/database": "~5.1", + "illuminate/events": "~5.1", + "illuminate/filesystem": "~5.1", + "illuminate/log": "~5.1", + "illuminate/pagination": "~5.1", + "laravel/lumen-framework": "~5.1", "lucadegasperi/oauth2-server-laravel": "5.0.*", "mockery/mockery": "~0.9", - "phpunit/phpunit": "^4.8 || ^5.0", + "phpunit/phpunit": "~4.0", "squizlabs/php_codesniffer": "~2.0", "tymon/jwt-auth": "1.0.*" }, @@ -249,7 +249,7 @@ }, "autoload": { "psr-4": { - "Dingo\\Api\\": "src/" + "Dingo\\Api\\": "src" }, "files": [ "src/helpers.php" @@ -272,20 +272,20 @@ "laravel", "restful" ], - "time": "2016-04-08 06:28:50" + "time": "2016-03-17 04:34:45" }, { "name": "dingo/blueprint", - "version": "v0.1.5", + "version": "v0.1.6", "source": { "type": "git", "url": "https://github.com/dingo/blueprint.git", - "reference": "0b01c9dc9d7032c64232996cfc93cd4838e15928" + "reference": "fbabe54262d9774589b560da0e35344f4ea40a28" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/dingo/blueprint/zipball/0b01c9dc9d7032c64232996cfc93cd4838e15928", - "reference": "0b01c9dc9d7032c64232996cfc93cd4838e15928", + "url": "https://api.github.com/repos/dingo/blueprint/zipball/fbabe54262d9774589b560da0e35344f4ea40a28", + "reference": "fbabe54262d9774589b560da0e35344f4ea40a28", "shasum": "" }, "require": { @@ -328,7 +328,7 @@ "docs", "laravel" ], - "time": "2016-03-31 11:16:28" + "time": "2016-04-12 06:00:10" }, { "name": "dnoegel/php-xdg-base-dir", @@ -552,124 +552,29 @@ ], "time": "2014-09-09 13:34:57" }, - { - "name": "guzzle/guzzle", - "version": "v3.9.3", - "source": { - "type": "git", - "url": "https://github.com/guzzle/guzzle3.git", - "reference": "0645b70d953bc1c067bbc8d5bc53194706b628d9" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/guzzle/guzzle3/zipball/0645b70d953bc1c067bbc8d5bc53194706b628d9", - "reference": "0645b70d953bc1c067bbc8d5bc53194706b628d9", - "shasum": "" - }, - "require": { - "ext-curl": "*", - "php": ">=5.3.3", - "symfony/event-dispatcher": "~2.1" - }, - "replace": { - "guzzle/batch": "self.version", - "guzzle/cache": "self.version", - "guzzle/common": "self.version", - "guzzle/http": "self.version", - "guzzle/inflection": "self.version", - "guzzle/iterator": "self.version", - "guzzle/log": "self.version", - "guzzle/parser": "self.version", - "guzzle/plugin": "self.version", - "guzzle/plugin-async": "self.version", - "guzzle/plugin-backoff": "self.version", - "guzzle/plugin-cache": "self.version", - "guzzle/plugin-cookie": "self.version", - "guzzle/plugin-curlauth": "self.version", - "guzzle/plugin-error-response": "self.version", - "guzzle/plugin-history": "self.version", - "guzzle/plugin-log": "self.version", - "guzzle/plugin-md5": "self.version", - "guzzle/plugin-mock": "self.version", - "guzzle/plugin-oauth": "self.version", - "guzzle/service": "self.version", - "guzzle/stream": "self.version" - }, - "require-dev": { - "doctrine/cache": "~1.3", - "monolog/monolog": "~1.0", - "phpunit/phpunit": "3.7.*", - "psr/log": "~1.0", - "symfony/class-loader": "~2.1", - "zendframework/zend-cache": "2.*,<2.3", - "zendframework/zend-log": "2.*,<2.3" - }, - "suggest": { - "guzzlehttp/guzzle": "Guzzle 5 has moved to a new package name. The package you have installed, Guzzle 3, is deprecated." - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.9-dev" - } - }, - "autoload": { - "psr-0": { - "Guzzle": "src/", - "Guzzle\\Tests": "tests/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Michael Dowling", - "email": "mtdowling@gmail.com", - "homepage": "https://github.com/mtdowling" - }, - { - "name": "Guzzle Community", - "homepage": "https://github.com/guzzle/guzzle/contributors" - } - ], - "description": "PHP HTTP client. This library is deprecated in favor of https://packagist.org/packages/guzzlehttp/guzzle", - "homepage": "http://guzzlephp.org/", - "keywords": [ - "client", - "curl", - "framework", - "http", - "http client", - "rest", - "web service" - ], - "time": "2015-03-18 18:23:50" - }, { "name": "guzzlehttp/guzzle", - "version": "6.2.0", + "version": "6.2.1", "source": { "type": "git", "url": "https://github.com/guzzle/guzzle.git", - "reference": "d094e337976dff9d8e2424e8485872194e768662" + "reference": "3f808fba627f2c5b69e2501217bf31af349c1427" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/guzzle/zipball/d094e337976dff9d8e2424e8485872194e768662", - "reference": "d094e337976dff9d8e2424e8485872194e768662", + "url": "https://api.github.com/repos/guzzle/guzzle/zipball/3f808fba627f2c5b69e2501217bf31af349c1427", + "reference": "3f808fba627f2c5b69e2501217bf31af349c1427", "shasum": "" }, "require": { - "guzzlehttp/promises": "~1.0", - "guzzlehttp/psr7": "~1.1", - "php": ">=5.5.0" + "guzzlehttp/promises": "^1.0", + "guzzlehttp/psr7": "^1.3.1", + "php": ">=5.5" }, "require-dev": { "ext-curl": "*", - "phpunit/phpunit": "~4.0", - "psr/log": "~1.0" + "phpunit/phpunit": "^4.0", + "psr/log": "^1.0" }, "type": "library", "extra": { @@ -707,20 +612,20 @@ "rest", "web service" ], - "time": "2016-03-21 20:02:09" + "time": "2016-07-15 17:22:37" }, { "name": "guzzlehttp/promises", - "version": "1.1.0", + "version": "1.2.0", "source": { "type": "git", "url": "https://github.com/guzzle/promises.git", - "reference": "bb9024c526b22f3fe6ae55a561fd70653d470aa8" + "reference": "c10d860e2a9595f8883527fa0021c7da9e65f579" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/promises/zipball/bb9024c526b22f3fe6ae55a561fd70653d470aa8", - "reference": "bb9024c526b22f3fe6ae55a561fd70653d470aa8", + "url": "https://api.github.com/repos/guzzle/promises/zipball/c10d860e2a9595f8883527fa0021c7da9e65f579", + "reference": "c10d860e2a9595f8883527fa0021c7da9e65f579", "shasum": "" }, "require": { @@ -758,20 +663,20 @@ "keywords": [ "promise" ], - "time": "2016-03-08 01:15:46" + "time": "2016-05-18 16:56:05" }, { "name": "guzzlehttp/psr7", - "version": "1.3.0", + "version": "1.3.1", "source": { "type": "git", "url": "https://github.com/guzzle/psr7.git", - "reference": "31382fef2889136415751badebbd1cb022a4ed72" + "reference": "5c6447c9df362e8f8093bda8f5d8873fe5c7f65b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/psr7/zipball/31382fef2889136415751badebbd1cb022a4ed72", - "reference": "31382fef2889136415751badebbd1cb022a4ed72", + "url": "https://api.github.com/repos/guzzle/psr7/zipball/5c6447c9df362e8f8093bda8f5d8873fe5c7f65b", + "reference": "5c6447c9df362e8f8093bda8f5d8873fe5c7f65b", "shasum": "" }, "require": { @@ -787,7 +692,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0-dev" + "dev-master": "1.4-dev" } }, "autoload": { @@ -816,7 +721,7 @@ "stream", "uri" ], - "time": "2016-04-13 19:56:01" + "time": "2016-06-24 23:00:38" }, { "name": "ircmaxell/password-compat", @@ -1007,16 +912,16 @@ }, { "name": "laravel/framework", - "version": "v5.2.30", + "version": "v5.2.44", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "ecfbbfbf96105439cc9a40bc78277bdb0268e34d" + "reference": "f24b7acfb494437ef00bdd062bed61eb21535546" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/ecfbbfbf96105439cc9a40bc78277bdb0268e34d", - "reference": "ecfbbfbf96105439cc9a40bc78277bdb0268e34d", + "url": "https://api.github.com/repos/laravel/framework/zipball/f24b7acfb494437ef00bdd062bed61eb21535546", + "reference": "f24b7acfb494437ef00bdd062bed61eb21535546", "shasum": "" }, "require": { @@ -1073,7 +978,8 @@ "illuminate/support": "self.version", "illuminate/translation": "self.version", "illuminate/validation": "self.version", - "illuminate/view": "self.version" + "illuminate/view": "self.version", + "tightenco/collect": "self.version" }, "require-dev": { "aws/aws-sdk-php": "~3.0", @@ -1096,7 +1002,7 @@ "pusher/pusher-php-server": "Required to use the Pusher broadcast driver (~2.0).", "symfony/css-selector": "Required to use some of the crawler integration testing tools (2.8.*|3.0.*).", "symfony/dom-crawler": "Required to use most of the crawler integration testing tools (2.8.*|3.0.*).", - "symfony/psr-http-message-bridge": "Required to psr7 bridging features (0.2.*)." + "symfony/psr-http-message-bridge": "Required to use psr7 bridging features (0.2.*)." }, "type": "library", "extra": { @@ -1132,20 +1038,20 @@ "framework", "laravel" ], - "time": "2016-04-19 19:12:18" + "time": "2016-08-23 13:03:29" }, { "name": "laravel/socialite", - "version": "v2.0.15", + "version": "v2.0.18", "source": { "type": "git", "url": "https://github.com/laravel/socialite.git", - "reference": "edd00ab96933e3ef053533cce81e958fb26921af" + "reference": "76ee5397fcdea5a062361392abca4eb397e519a3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/socialite/zipball/edd00ab96933e3ef053533cce81e958fb26921af", - "reference": "edd00ab96933e3ef053533cce81e958fb26921af", + "url": "https://api.github.com/repos/laravel/socialite/zipball/76ee5397fcdea5a062361392abca4eb397e519a3", + "reference": "76ee5397fcdea5a062361392abca4eb397e519a3", "shasum": "" }, "require": { @@ -1158,7 +1064,7 @@ }, "require-dev": { "mockery/mockery": "~0.9", - "phpunit/phpunit": "~4.0" + "phpunit/phpunit": "~4.0|~5.0" }, "type": "library", "extra": { @@ -1186,20 +1092,20 @@ "laravel", "oauth" ], - "time": "2016-03-21 14:30:30" + "time": "2016-06-22 12:40:16" }, { "name": "laravelangular/generators", - "version": "2.3.3", + "version": "2.7.0", "source": { "type": "git", "url": "https://github.com/jadjoubran/laravel-ng-artisan-generators.git", - "reference": "90d430e370d483817f9e095d31182fef056e18b8" + "reference": "58a54969f603947be47db2f3272b8c27992f4792" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/jadjoubran/laravel-ng-artisan-generators/zipball/90d430e370d483817f9e095d31182fef056e18b8", - "reference": "90d430e370d483817f9e095d31182fef056e18b8", + "url": "https://api.github.com/repos/jadjoubran/laravel-ng-artisan-generators/zipball/58a54969f603947be47db2f3272b8c27992f4792", + "reference": "58a54969f603947be47db2f3272b8c27992f4792", "shasum": "" }, "require": { @@ -1226,20 +1132,20 @@ } ], "description": "Angular generators for Artisan", - "time": "2016-04-16 15:52:22" + "time": "2016-07-07 21:23:16" }, { "name": "league/flysystem", - "version": "1.0.20", + "version": "1.0.27", "source": { "type": "git", "url": "https://github.com/thephpleague/flysystem.git", - "reference": "e87a786e3ae12a25cf78a71bb07b4b384bfaa83a" + "reference": "50e2045ed70a7e75a5e30bc3662904f3b67af8a9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/e87a786e3ae12a25cf78a71bb07b4b384bfaa83a", - "reference": "e87a786e3ae12a25cf78a71bb07b4b384bfaa83a", + "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/50e2045ed70a7e75a5e30bc3662904f3b67af8a9", + "reference": "50e2045ed70a7e75a5e30bc3662904f3b67af8a9", "shasum": "" }, "require": { @@ -1252,7 +1158,7 @@ "ext-fileinfo": "*", "mockery/mockery": "~0.9", "phpspec/phpspec": "^2.2", - "phpunit/phpunit": "~4.8 || ~5.0" + "phpunit/phpunit": "~4.8" }, "suggest": { "ext-fileinfo": "Required for MimeType", @@ -1309,7 +1215,7 @@ "sftp", "storage" ], - "time": "2016-03-14 21:54:11" + "time": "2016-08-10 08:55:11" }, { "name": "league/fractal", @@ -1376,26 +1282,26 @@ }, { "name": "league/oauth1-client", - "version": "1.6.1", + "version": "1.7.0", "source": { "type": "git", "url": "https://github.com/thephpleague/oauth1-client.git", - "reference": "cef3ceda13c78f89c323e4d5e6301c0eb7cea422" + "reference": "fca5f160650cb74d23fc11aa570dd61f86dcf647" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/oauth1-client/zipball/cef3ceda13c78f89c323e4d5e6301c0eb7cea422", - "reference": "cef3ceda13c78f89c323e4d5e6301c0eb7cea422", + "url": "https://api.github.com/repos/thephpleague/oauth1-client/zipball/fca5f160650cb74d23fc11aa570dd61f86dcf647", + "reference": "fca5f160650cb74d23fc11aa570dd61f86dcf647", "shasum": "" }, "require": { - "guzzle/guzzle": "3.*", - "php": ">=5.3.0" + "guzzlehttp/guzzle": "^6.0", + "php": ">=5.5.0" }, "require-dev": { - "mockery/mockery": "~0.9", - "phpunit/phpunit": "~4.0", - "squizlabs/php_codesniffer": "~2.0" + "mockery/mockery": "^0.9", + "phpunit/phpunit": "^4.0", + "squizlabs/php_codesniffer": "^2.0" }, "type": "library", "extra": { @@ -1435,20 +1341,20 @@ "tumblr", "twitter" ], - "time": "2015-10-23 04:02:07" + "time": "2016-08-17 00:36:58" }, { "name": "monolog/monolog", - "version": "1.19.0", + "version": "1.21.0", "source": { "type": "git", "url": "https://github.com/Seldaek/monolog.git", - "reference": "5f56ed5212dc509c8dc8caeba2715732abb32dbf" + "reference": "f42fbdfd53e306bda545845e4dbfd3e72edb4952" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/monolog/zipball/5f56ed5212dc509c8dc8caeba2715732abb32dbf", - "reference": "5f56ed5212dc509c8dc8caeba2715732abb32dbf", + "url": "https://api.github.com/repos/Seldaek/monolog/zipball/f42fbdfd53e306bda545845e4dbfd3e72edb4952", + "reference": "f42fbdfd53e306bda545845e4dbfd3e72edb4952", "shasum": "" }, "require": { @@ -1467,8 +1373,8 @@ "php-console/php-console": "^3.1.3", "phpunit/phpunit": "~4.5", "phpunit/phpunit-mock-objects": "2.3.0", - "raven/raven": "^0.13", "ruflin/elastica": ">=0.90 <3.0", + "sentry/sentry": "^0.13", "swiftmailer/swiftmailer": "~5.3" }, "suggest": { @@ -1480,9 +1386,9 @@ "mongodb/mongodb": "Allow sending log messages to a MongoDB server via PHP Driver", "php-amqplib/php-amqplib": "Allow sending log messages to an AMQP server using php-amqplib", "php-console/php-console": "Allow sending log messages to Google Chrome", - "raven/raven": "Allow sending log messages to a Sentry server", "rollbar/rollbar": "Allow sending log messages to Rollbar", - "ruflin/elastica": "Allow sending log messages to an Elastic Search server" + "ruflin/elastica": "Allow sending log messages to an Elastic Search server", + "sentry/sentry": "Allow sending log messages to a Sentry server" }, "type": "library", "extra": { @@ -1513,7 +1419,7 @@ "logging", "psr-3" ], - "time": "2016-04-12 18:29:35" + "time": "2016-07-29 03:23:52" }, { "name": "mtdowling/cron-expression", @@ -1904,16 +1810,16 @@ }, { "name": "psr/http-message", - "version": "1.0", + "version": "1.0.1", "source": { "type": "git", "url": "https://github.com/php-fig/http-message.git", - "reference": "85d63699f0dbedb190bbd4b0d2b9dc707ea4c298" + "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/http-message/zipball/85d63699f0dbedb190bbd4b0d2b9dc707ea4c298", - "reference": "85d63699f0dbedb190bbd4b0d2b9dc707ea4c298", + "url": "https://api.github.com/repos/php-fig/http-message/zipball/f6561bf28d520154e4b0ec72be95418abe6d9363", + "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363", "shasum": "" }, "require": { @@ -1941,6 +1847,7 @@ } ], "description": "Common interface for HTTP messages", + "homepage": "https://github.com/php-fig/http-message", "keywords": [ "http", "http-message", @@ -1949,7 +1856,7 @@ "request", "response" ], - "time": "2015-05-04 20:22:00" + "time": "2016-08-06 14:39:51" }, { "name": "psr/log", @@ -2063,23 +1970,23 @@ }, { "name": "swiftmailer/swiftmailer", - "version": "v5.4.1", + "version": "v5.4.3", "source": { "type": "git", "url": "https://github.com/swiftmailer/swiftmailer.git", - "reference": "0697e6aa65c83edf97bb0f23d8763f94e3f11421" + "reference": "4cc92842069c2bbc1f28daaaf1d2576ec4dfe153" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/0697e6aa65c83edf97bb0f23d8763f94e3f11421", - "reference": "0697e6aa65c83edf97bb0f23d8763f94e3f11421", + "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/4cc92842069c2bbc1f28daaaf1d2576ec4dfe153", + "reference": "4cc92842069c2bbc1f28daaaf1d2576ec4dfe153", "shasum": "" }, "require": { "php": ">=5.3.3" }, "require-dev": { - "mockery/mockery": "~0.9.1,<0.9.4" + "mockery/mockery": "~0.9.1" }, "type": "library", "extra": { @@ -2112,20 +2019,20 @@ "mail", "mailer" ], - "time": "2015-06-06 14:19:39" + "time": "2016-07-08 11:51:25" }, { "name": "symfony/console", - "version": "v3.0.4", + "version": "v3.0.9", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "6b1175135bc2a74c08a28d89761272de8beed8cd" + "reference": "926061e74229e935d3c5b4e9ba87237316c6693f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/6b1175135bc2a74c08a28d89761272de8beed8cd", - "reference": "6b1175135bc2a74c08a28d89761272de8beed8cd", + "url": "https://api.github.com/repos/symfony/console/zipball/926061e74229e935d3c5b4e9ba87237316c6693f", + "reference": "926061e74229e935d3c5b4e9ba87237316c6693f", "shasum": "" }, "require": { @@ -2172,20 +2079,20 @@ ], "description": "Symfony Console Component", "homepage": "https://symfony.com/", - "time": "2016-03-16 17:00:50" + "time": "2016-07-30 07:22:48" }, { "name": "symfony/debug", - "version": "v2.8.4", + "version": "v2.8.9", "source": { "type": "git", "url": "https://github.com/symfony/debug.git", - "reference": "056d028521c18f4932c421f1ffa4c74cd644cda8" + "reference": "f7c5256f43debdabec79146a5db226fd15aedbea" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/debug/zipball/056d028521c18f4932c421f1ffa4c74cd644cda8", - "reference": "056d028521c18f4932c421f1ffa4c74cd644cda8", + "url": "https://api.github.com/repos/symfony/debug/zipball/f7c5256f43debdabec79146a5db226fd15aedbea", + "reference": "f7c5256f43debdabec79146a5db226fd15aedbea", "shasum": "" }, "require": { @@ -2229,31 +2136,31 @@ ], "description": "Symfony Debug Component", "homepage": "https://symfony.com/", - "time": "2016-03-16 15:31:59" + "time": "2016-07-30 07:20:35" }, { "name": "symfony/event-dispatcher", - "version": "v2.8.4", + "version": "v3.0.9", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "47d2d8cade9b1c3987573d2943bb9352536cdb87" + "reference": "54da3ff63dec3c9c0e32ec3f95a7d94ef64baa00" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/47d2d8cade9b1c3987573d2943bb9352536cdb87", - "reference": "47d2d8cade9b1c3987573d2943bb9352536cdb87", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/54da3ff63dec3c9c0e32ec3f95a7d94ef64baa00", + "reference": "54da3ff63dec3c9c0e32ec3f95a7d94ef64baa00", "shasum": "" }, "require": { - "php": ">=5.3.9" + "php": ">=5.5.9" }, "require-dev": { "psr/log": "~1.0", - "symfony/config": "~2.0,>=2.0.5|~3.0.0", - "symfony/dependency-injection": "~2.6|~3.0.0", - "symfony/expression-language": "~2.6|~3.0.0", - "symfony/stopwatch": "~2.3|~3.0.0" + "symfony/config": "~2.8|~3.0", + "symfony/dependency-injection": "~2.8|~3.0", + "symfony/expression-language": "~2.8|~3.0", + "symfony/stopwatch": "~2.8|~3.0" }, "suggest": { "symfony/dependency-injection": "", @@ -2262,7 +2169,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.8-dev" + "dev-master": "3.0-dev" } }, "autoload": { @@ -2289,20 +2196,20 @@ ], "description": "Symfony EventDispatcher Component", "homepage": "https://symfony.com/", - "time": "2016-03-07 14:04:32" + "time": "2016-07-19 10:44:15" }, { "name": "symfony/finder", - "version": "v3.0.4", + "version": "v3.0.9", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "c54e407b35bc098916704e9fd090da21da4c4f52" + "reference": "3eb4e64c6145ef8b92adefb618a74ebdde9e3fe9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/c54e407b35bc098916704e9fd090da21da4c4f52", - "reference": "c54e407b35bc098916704e9fd090da21da4c4f52", + "url": "https://api.github.com/repos/symfony/finder/zipball/3eb4e64c6145ef8b92adefb618a74ebdde9e3fe9", + "reference": "3eb4e64c6145ef8b92adefb618a74ebdde9e3fe9", "shasum": "" }, "require": { @@ -2338,20 +2245,20 @@ ], "description": "Symfony Finder Component", "homepage": "https://symfony.com/", - "time": "2016-03-10 11:13:05" + "time": "2016-06-29 05:40:00" }, { "name": "symfony/http-foundation", - "version": "v2.8.4", + "version": "v2.8.9", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "06d6b2c755b2f34ce21e688b62072e9c625709c4" + "reference": "f20bea598906c990eebe3c70a63ca5ed18cdbc11" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/06d6b2c755b2f34ce21e688b62072e9c625709c4", - "reference": "06d6b2c755b2f34ce21e688b62072e9c625709c4", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/f20bea598906c990eebe3c70a63ca5ed18cdbc11", + "reference": "f20bea598906c990eebe3c70a63ca5ed18cdbc11", "shasum": "" }, "require": { @@ -2393,20 +2300,20 @@ ], "description": "Symfony HttpFoundation Component", "homepage": "https://symfony.com/", - "time": "2016-03-27 12:57:53" + "time": "2016-07-30 07:20:35" }, { "name": "symfony/http-kernel", - "version": "v2.8.4", + "version": "v2.8.9", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "2c45576fee2eb228d4771342a05b0565e4711ba2" + "reference": "c4bcdce4fc1f4ec1a20264fc45802a2814b42c5f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/2c45576fee2eb228d4771342a05b0565e4711ba2", - "reference": "2c45576fee2eb228d4771342a05b0565e4711ba2", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/c4bcdce4fc1f4ec1a20264fc45802a2814b42c5f", + "reference": "c4bcdce4fc1f4ec1a20264fc45802a2814b42c5f", "shasum": "" }, "require": { @@ -2414,7 +2321,7 @@ "psr/log": "~1.0", "symfony/debug": "~2.6,>=2.6.2", "symfony/event-dispatcher": "~2.6,>=2.6.7|~3.0.0", - "symfony/http-foundation": "~2.5,>=2.5.4|~3.0.0" + "symfony/http-foundation": "~2.7.15|~2.8.8|~3.0.8" }, "conflict": { "symfony/config": "<2.7" @@ -2475,20 +2382,20 @@ ], "description": "Symfony HttpKernel Component", "homepage": "https://symfony.com/", - "time": "2016-03-25 01:40:30" + "time": "2016-07-30 08:48:39" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.1.1", + "version": "v1.2.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "1289d16209491b584839022f29257ad859b8532d" + "reference": "dff51f72b0706335131b00a7f49606168c582594" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/1289d16209491b584839022f29257ad859b8532d", - "reference": "1289d16209491b584839022f29257ad859b8532d", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/dff51f72b0706335131b00a7f49606168c582594", + "reference": "dff51f72b0706335131b00a7f49606168c582594", "shasum": "" }, "require": { @@ -2500,7 +2407,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.1-dev" + "dev-master": "1.2-dev" } }, "autoload": { @@ -2534,20 +2441,20 @@ "portable", "shim" ], - "time": "2016-01-20 09:13:37" + "time": "2016-05-18 14:26:46" }, { "name": "symfony/polyfill-php54", - "version": "v1.1.1", + "version": "v1.2.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php54.git", - "reference": "9ba741ca01c77282ecf5796c2c1d667f03454ffb" + "reference": "34d761992f6f2cc6092cc0e5e93f38b53ba5e4f1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php54/zipball/9ba741ca01c77282ecf5796c2c1d667f03454ffb", - "reference": "9ba741ca01c77282ecf5796c2c1d667f03454ffb", + "url": "https://api.github.com/repos/symfony/polyfill-php54/zipball/34d761992f6f2cc6092cc0e5e93f38b53ba5e4f1", + "reference": "34d761992f6f2cc6092cc0e5e93f38b53ba5e4f1", "shasum": "" }, "require": { @@ -2556,7 +2463,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.1-dev" + "dev-master": "1.2-dev" } }, "autoload": { @@ -2592,20 +2499,20 @@ "portable", "shim" ], - "time": "2016-01-25 19:13:00" + "time": "2016-05-18 14:26:46" }, { "name": "symfony/polyfill-php55", - "version": "v1.1.1", + "version": "v1.2.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php55.git", - "reference": "b4f3f07d91702f8f926339fc4fcf81671d8c27e6" + "reference": "bf2ff9ad6be1a4772cb873e4eea94d70daa95c6d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php55/zipball/b4f3f07d91702f8f926339fc4fcf81671d8c27e6", - "reference": "b4f3f07d91702f8f926339fc4fcf81671d8c27e6", + "url": "https://api.github.com/repos/symfony/polyfill-php55/zipball/bf2ff9ad6be1a4772cb873e4eea94d70daa95c6d", + "reference": "bf2ff9ad6be1a4772cb873e4eea94d70daa95c6d", "shasum": "" }, "require": { @@ -2615,7 +2522,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.1-dev" + "dev-master": "1.2-dev" } }, "autoload": { @@ -2648,20 +2555,20 @@ "portable", "shim" ], - "time": "2016-01-20 09:13:37" + "time": "2016-05-18 14:26:46" }, { "name": "symfony/polyfill-php56", - "version": "v1.1.1", + "version": "v1.2.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php56.git", - "reference": "4d891fff050101a53a4caabb03277284942d1ad9" + "reference": "3edf57a8fbf9a927533344cef65ad7e1cf31030a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php56/zipball/4d891fff050101a53a4caabb03277284942d1ad9", - "reference": "4d891fff050101a53a4caabb03277284942d1ad9", + "url": "https://api.github.com/repos/symfony/polyfill-php56/zipball/3edf57a8fbf9a927533344cef65ad7e1cf31030a", + "reference": "3edf57a8fbf9a927533344cef65ad7e1cf31030a", "shasum": "" }, "require": { @@ -2671,7 +2578,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.1-dev" + "dev-master": "1.2-dev" } }, "autoload": { @@ -2704,20 +2611,20 @@ "portable", "shim" ], - "time": "2016-01-20 09:13:37" + "time": "2016-05-18 14:26:46" }, { "name": "symfony/polyfill-util", - "version": "v1.1.1", + "version": "v1.2.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-util.git", - "reference": "8de62801aa12bc4dfcf85eef5d21981ae7bb3cc4" + "reference": "ef830ce3d218e622b221d6bfad42c751d974bf99" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-util/zipball/8de62801aa12bc4dfcf85eef5d21981ae7bb3cc4", - "reference": "8de62801aa12bc4dfcf85eef5d21981ae7bb3cc4", + "url": "https://api.github.com/repos/symfony/polyfill-util/zipball/ef830ce3d218e622b221d6bfad42c751d974bf99", + "reference": "ef830ce3d218e622b221d6bfad42c751d974bf99", "shasum": "" }, "require": { @@ -2726,7 +2633,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.1-dev" + "dev-master": "1.2-dev" } }, "autoload": { @@ -2756,20 +2663,20 @@ "polyfill", "shim" ], - "time": "2016-01-20 09:13:37" + "time": "2016-05-18 14:26:46" }, { "name": "symfony/process", - "version": "v3.0.4", + "version": "v3.0.9", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "e6f1f98bbd355d209a992bfff45e7edfbd4a0776" + "reference": "768debc5996f599c4372b322d9061dba2a4bf505" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/e6f1f98bbd355d209a992bfff45e7edfbd4a0776", - "reference": "e6f1f98bbd355d209a992bfff45e7edfbd4a0776", + "url": "https://api.github.com/repos/symfony/process/zipball/768debc5996f599c4372b322d9061dba2a4bf505", + "reference": "768debc5996f599c4372b322d9061dba2a4bf505", "shasum": "" }, "require": { @@ -2805,20 +2712,20 @@ ], "description": "Symfony Process Component", "homepage": "https://symfony.com/", - "time": "2016-03-30 10:41:14" + "time": "2016-07-28 11:13:34" }, { "name": "symfony/routing", - "version": "v3.0.4", + "version": "v3.0.9", "source": { "type": "git", "url": "https://github.com/symfony/routing.git", - "reference": "d061b609f2d0769494c381ec92f5c5cc5e4a20aa" + "reference": "9038984bd9c05ab07280121e9e10f61a7231457b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/routing/zipball/d061b609f2d0769494c381ec92f5c5cc5e4a20aa", - "reference": "d061b609f2d0769494c381ec92f5c5cc5e4a20aa", + "url": "https://api.github.com/repos/symfony/routing/zipball/9038984bd9c05ab07280121e9e10f61a7231457b", + "reference": "9038984bd9c05ab07280121e9e10f61a7231457b", "shasum": "" }, "require": { @@ -2880,20 +2787,20 @@ "uri", "url" ], - "time": "2016-03-23 13:23:25" + "time": "2016-06-29 05:40:00" }, { "name": "symfony/translation", - "version": "v3.0.4", + "version": "v3.0.9", "source": { "type": "git", "url": "https://github.com/symfony/translation.git", - "reference": "f7a07af51ea067745a521dab1e3152044a2fb1f2" + "reference": "eee6c664853fd0576f21ae25725cfffeafe83f26" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation/zipball/f7a07af51ea067745a521dab1e3152044a2fb1f2", - "reference": "f7a07af51ea067745a521dab1e3152044a2fb1f2", + "url": "https://api.github.com/repos/symfony/translation/zipball/eee6c664853fd0576f21ae25725cfffeafe83f26", + "reference": "eee6c664853fd0576f21ae25725cfffeafe83f26", "shasum": "" }, "require": { @@ -2944,20 +2851,20 @@ ], "description": "Symfony Translation Component", "homepage": "https://symfony.com/", - "time": "2016-03-25 01:41:20" + "time": "2016-07-30 07:22:48" }, { "name": "symfony/var-dumper", - "version": "v3.0.4", + "version": "v3.0.9", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "3841ed86527d18ee2c35fe4afb1b2fc60f8fae79" + "reference": "1f7e071aafc6676fcb6e3f0497f87c2397247377" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/3841ed86527d18ee2c35fe4afb1b2fc60f8fae79", - "reference": "3841ed86527d18ee2c35fe4afb1b2fc60f8fae79", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/1f7e071aafc6676fcb6e3f0497f87c2397247377", + "reference": "1f7e071aafc6676fcb6e3f0497f87c2397247377", "shasum": "" }, "require": { @@ -3007,7 +2914,7 @@ "debug", "dump" ], - "time": "2016-03-10 10:34:12" + "time": "2016-07-26 08:03:56" }, { "name": "tymon/jwt-auth", @@ -3074,28 +2981,28 @@ }, { "name": "vlucas/phpdotenv", - "version": "v2.2.0", + "version": "v2.3.0", "source": { "type": "git", "url": "https://github.com/vlucas/phpdotenv.git", - "reference": "9caf304153dc2288e4970caec6f1f3b3bc205412" + "reference": "9ca5644c536654e9509b9d257f53c58630eb2a6a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/9caf304153dc2288e4970caec6f1f3b3bc205412", - "reference": "9caf304153dc2288e4970caec6f1f3b3bc205412", + "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/9ca5644c536654e9509b9d257f53c58630eb2a6a", + "reference": "9ca5644c536654e9509b9d257f53c58630eb2a6a", "shasum": "" }, "require": { "php": ">=5.3.9" }, "require-dev": { - "phpunit/phpunit": "^4.8|^5.0" + "phpunit/phpunit": "^4.8 || ^5.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.2-dev" + "dev-master": "2.3-dev" } }, "autoload": { @@ -3105,7 +3012,7 @@ }, "notification-url": "https://packagist.org/downloads/", "license": [ - "BSD" + "BSD-3-Clause-Attribution" ], "authors": [ { @@ -3115,13 +3022,12 @@ } ], "description": "Loads environment variables from `.env` to `getenv()`, `$_ENV` and `$_SERVER` automagically.", - "homepage": "http://github.com/vlucas/phpdotenv", "keywords": [ "dotenv", "env", "environment" ], - "time": "2015-12-29 15:10:30" + "time": "2016-06-14 14:14:52" } ], "packages-dev": [ @@ -3181,33 +3087,29 @@ }, { "name": "fzaninotto/faker", - "version": "v1.5.0", + "version": "v1.6.0", "source": { "type": "git", "url": "https://github.com/fzaninotto/Faker.git", - "reference": "d0190b156bcca848d401fb80f31f504f37141c8d" + "reference": "44f9a286a04b80c76a4e5fb7aad8bb539b920123" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/fzaninotto/Faker/zipball/d0190b156bcca848d401fb80f31f504f37141c8d", - "reference": "d0190b156bcca848d401fb80f31f504f37141c8d", + "url": "https://api.github.com/repos/fzaninotto/Faker/zipball/44f9a286a04b80c76a4e5fb7aad8bb539b920123", + "reference": "44f9a286a04b80c76a4e5fb7aad8bb539b920123", "shasum": "" }, "require": { - "php": ">=5.3.3" + "php": "^5.3.3|^7.0" }, "require-dev": { + "ext-intl": "*", "phpunit/phpunit": "~4.0", "squizlabs/php_codesniffer": "~1.5" }, - "suggest": { - "ext-intl": "*" - }, "type": "library", "extra": { - "branch-alias": { - "dev-master": "1.5.x-dev" - } + "branch-alias": [] }, "autoload": { "psr-4": { @@ -3229,7 +3131,7 @@ "faker", "fixtures" ], - "time": "2015-05-29 06:29:14" + "time": "2016-04-29 12:21:54" }, { "name": "hamcrest/hamcrest-php", @@ -3278,16 +3180,16 @@ }, { "name": "mockery/mockery", - "version": "0.9.4", + "version": "0.9.5", "source": { "type": "git", "url": "https://github.com/padraic/mockery.git", - "reference": "70bba85e4aabc9449626651f48b9018ede04f86b" + "reference": "4db079511a283e5aba1b3c2fb19037c645e70fc2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/padraic/mockery/zipball/70bba85e4aabc9449626651f48b9018ede04f86b", - "reference": "70bba85e4aabc9449626651f48b9018ede04f86b", + "url": "https://api.github.com/repos/padraic/mockery/zipball/4db079511a283e5aba1b3c2fb19037c645e70fc2", + "reference": "4db079511a283e5aba1b3c2fb19037c645e70fc2", "shasum": "" }, "require": { @@ -3339,36 +3241,36 @@ "test double", "testing" ], - "time": "2015-04-02 19:54:00" + "time": "2016-05-22 21:52:33" }, { "name": "phpspec/prophecy", - "version": "v1.6.0", + "version": "v1.6.1", "source": { "type": "git", "url": "https://github.com/phpspec/prophecy.git", - "reference": "3c91bdf81797d725b14cb62906f9a4ce44235972" + "reference": "58a8137754bc24b25740d4281399a4a3596058e0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpspec/prophecy/zipball/3c91bdf81797d725b14cb62906f9a4ce44235972", - "reference": "3c91bdf81797d725b14cb62906f9a4ce44235972", + "url": "https://api.github.com/repos/phpspec/prophecy/zipball/58a8137754bc24b25740d4281399a4a3596058e0", + "reference": "58a8137754bc24b25740d4281399a4a3596058e0", "shasum": "" }, "require": { "doctrine/instantiator": "^1.0.2", "php": "^5.3|^7.0", - "phpdocumentor/reflection-docblock": "~2.0", - "sebastian/comparator": "~1.1", - "sebastian/recursion-context": "~1.0" + "phpdocumentor/reflection-docblock": "^2.0|^3.0.2", + "sebastian/comparator": "^1.1", + "sebastian/recursion-context": "^1.0" }, "require-dev": { - "phpspec/phpspec": "~2.0" + "phpspec/phpspec": "^2.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.5.x-dev" + "dev-master": "1.6.x-dev" } }, "autoload": { @@ -3401,7 +3303,7 @@ "spy", "stub" ], - "time": "2016-02-15 07:46:21" + "time": "2016-06-07 08:13:47" }, { "name": "phpunit/php-code-coverage", @@ -3555,21 +3457,24 @@ }, { "name": "phpunit/php-timer", - "version": "1.0.7", + "version": "1.0.8", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-timer.git", - "reference": "3e82f4e9fc92665fafd9157568e4dcb01d014e5b" + "reference": "38e9124049cf1a164f1e4537caf19c99bf1eb260" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/3e82f4e9fc92665fafd9157568e4dcb01d014e5b", - "reference": "3e82f4e9fc92665fafd9157568e4dcb01d014e5b", + "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/38e9124049cf1a164f1e4537caf19c99bf1eb260", + "reference": "38e9124049cf1a164f1e4537caf19c99bf1eb260", "shasum": "" }, "require": { "php": ">=5.3.3" }, + "require-dev": { + "phpunit/phpunit": "~4|~5" + }, "type": "library", "autoload": { "classmap": [ @@ -3592,7 +3497,7 @@ "keywords": [ "timer" ], - "time": "2015-06-21 08:01:12" + "time": "2016-05-12 18:03:57" }, { "name": "phpunit/php-token-stream", @@ -3645,16 +3550,16 @@ }, { "name": "phpunit/phpunit", - "version": "4.8.24", + "version": "4.8.27", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "a1066c562c52900a142a0e2bbf0582994671385e" + "reference": "c062dddcb68e44b563f66ee319ddae2b5a322a90" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/a1066c562c52900a142a0e2bbf0582994671385e", - "reference": "a1066c562c52900a142a0e2bbf0582994671385e", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/c062dddcb68e44b563f66ee319ddae2b5a322a90", + "reference": "c062dddcb68e44b563f66ee319ddae2b5a322a90", "shasum": "" }, "require": { @@ -3668,7 +3573,7 @@ "phpunit/php-code-coverage": "~2.1", "phpunit/php-file-iterator": "~1.4", "phpunit/php-text-template": "~1.2", - "phpunit/php-timer": ">=1.0.6", + "phpunit/php-timer": "^1.0.6", "phpunit/phpunit-mock-objects": "~2.3", "sebastian/comparator": "~1.1", "sebastian/diff": "~1.2", @@ -3713,7 +3618,7 @@ "testing", "xunit" ], - "time": "2016-03-14 06:16:08" + "time": "2016-07-21 06:48:14" }, { "name": "phpunit/phpunit-mock-objects", @@ -3889,23 +3794,23 @@ }, { "name": "sebastian/environment", - "version": "1.3.5", + "version": "1.3.8", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/environment.git", - "reference": "dc7a29032cf72b54f36dac15a1ca5b3a1b6029bf" + "reference": "be2c607e43ce4c89ecd60e75c6a85c126e754aea" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/dc7a29032cf72b54f36dac15a1ca5b3a1b6029bf", - "reference": "dc7a29032cf72b54f36dac15a1ca5b3a1b6029bf", + "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/be2c607e43ce4c89ecd60e75c6a85c126e754aea", + "reference": "be2c607e43ce4c89ecd60e75c6a85c126e754aea", "shasum": "" }, "require": { - "php": ">=5.3.3" + "php": "^5.3.3 || ^7.0" }, "require-dev": { - "phpunit/phpunit": "~4.4" + "phpunit/phpunit": "^4.8 || ^5.0" }, "type": "library", "extra": { @@ -3935,20 +3840,20 @@ "environment", "hhvm" ], - "time": "2016-02-26 18:40:46" + "time": "2016-08-18 05:49:44" }, { "name": "sebastian/exporter", - "version": "1.2.1", + "version": "1.2.2", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/exporter.git", - "reference": "7ae5513327cb536431847bcc0c10edba2701064e" + "reference": "42c4c2eec485ee3e159ec9884f95b431287edde4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/7ae5513327cb536431847bcc0c10edba2701064e", - "reference": "7ae5513327cb536431847bcc0c10edba2701064e", + "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/42c4c2eec485ee3e159ec9884f95b431287edde4", + "reference": "42c4c2eec485ee3e159ec9884f95b431287edde4", "shasum": "" }, "require": { @@ -3956,12 +3861,13 @@ "sebastian/recursion-context": "~1.0" }, "require-dev": { + "ext-mbstring": "*", "phpunit/phpunit": "~4.4" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.2.x-dev" + "dev-master": "1.3.x-dev" } }, "autoload": { @@ -4001,7 +3907,7 @@ "export", "exporter" ], - "time": "2015-06-21 07:55:53" + "time": "2016-06-17 09:04:28" }, { "name": "sebastian/global-state", @@ -4144,16 +4050,16 @@ }, { "name": "squizlabs/php_codesniffer", - "version": "2.6.0", + "version": "2.6.2", "source": { "type": "git", "url": "https://github.com/squizlabs/PHP_CodeSniffer.git", - "reference": "1bcdf03b068a530ac1962ce671dead356eeba43b" + "reference": "4edb770cb853def6e60c93abb088ad5ac2010c83" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/1bcdf03b068a530ac1962ce671dead356eeba43b", - "reference": "1bcdf03b068a530ac1962ce671dead356eeba43b", + "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/4edb770cb853def6e60c93abb088ad5ac2010c83", + "reference": "4edb770cb853def6e60c93abb088ad5ac2010c83", "shasum": "" }, "require": { @@ -4218,20 +4124,20 @@ "phpcs", "standards" ], - "time": "2016-04-03 22:58:34" + "time": "2016-07-13 23:29:13" }, { "name": "symfony/css-selector", - "version": "v3.0.4", + "version": "v3.0.9", "source": { "type": "git", "url": "https://github.com/symfony/css-selector.git", - "reference": "65e764f404685f2dc20c057e889b3ad04b2e2db0" + "reference": "b8999c1f33c224b2b66b38253f5e3a838d0d0115" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/css-selector/zipball/65e764f404685f2dc20c057e889b3ad04b2e2db0", - "reference": "65e764f404685f2dc20c057e889b3ad04b2e2db0", + "url": "https://api.github.com/repos/symfony/css-selector/zipball/b8999c1f33c224b2b66b38253f5e3a838d0d0115", + "reference": "b8999c1f33c224b2b66b38253f5e3a838d0d0115", "shasum": "" }, "require": { @@ -4271,20 +4177,20 @@ ], "description": "Symfony CssSelector Component", "homepage": "https://symfony.com/", - "time": "2016-03-04 07:55:57" + "time": "2016-06-29 05:40:00" }, { "name": "symfony/dom-crawler", - "version": "v3.0.4", + "version": "v3.0.9", "source": { "type": "git", "url": "https://github.com/symfony/dom-crawler.git", - "reference": "18a06d7a9af41718c20764a674a0ebba3bc40d1f" + "reference": "dff8fecf1f56990d88058e3a1885c2a5f1b8e970" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/18a06d7a9af41718c20764a674a0ebba3bc40d1f", - "reference": "18a06d7a9af41718c20764a674a0ebba3bc40d1f", + "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/dff8fecf1f56990d88058e3a1885c2a5f1b8e970", + "reference": "dff8fecf1f56990d88058e3a1885c2a5f1b8e970", "shasum": "" }, "require": { @@ -4327,20 +4233,20 @@ ], "description": "Symfony DomCrawler Component", "homepage": "https://symfony.com/", - "time": "2016-03-23 13:23:25" + "time": "2016-07-30 07:22:48" }, { "name": "symfony/yaml", - "version": "v3.0.4", + "version": "v3.1.3", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "0047c8366744a16de7516622c5b7355336afae96" + "reference": "1819adf2066880c7967df7180f4f662b6f0567ac" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/0047c8366744a16de7516622c5b7355336afae96", - "reference": "0047c8366744a16de7516622c5b7355336afae96", + "url": "https://api.github.com/repos/symfony/yaml/zipball/1819adf2066880c7967df7180f4f662b6f0567ac", + "reference": "1819adf2066880c7967df7180f4f662b6f0567ac", "shasum": "" }, "require": { @@ -4349,7 +4255,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.0-dev" + "dev-master": "3.1-dev" } }, "autoload": { @@ -4376,7 +4282,7 @@ ], "description": "Symfony Yaml Component", "homepage": "https://symfony.com/", - "time": "2016-03-04 07:55:57" + "time": "2016-07-17 14:02:08" } ], "aliases": [], diff --git a/config/generators.php b/config/generators.php index eb91e7e..a639696 100644 --- a/config/generators.php +++ b/config/generators.php @@ -10,7 +10,7 @@ 'filters' => 'filters', 'services' => 'services', ], - 'prefix' => [ + 'suffix' => [ 'component' => '.component.js', 'componentView' => '.component.html', 'dialog' => '.dialog.js', @@ -19,6 +19,7 @@ 'config' => '.config.js', 'filter' => '.filter.js', 'pageView' => '.page.html', + 'stylesheet' => 'scss', ], 'tests' => [ 'enable' => [ diff --git a/elixir.json b/elixir.json index 79e00be..55952d2 100644 --- a/elixir.json +++ b/elixir.json @@ -4,7 +4,7 @@ }, "css": { "outputFolder": "public/css", - "less": { + "sass": { "folder": "../../angular/" }, "lteSkin": "skin-blue.css" From e3352ee04531e6bc7a9b7fc93e8cf0f66f740007 Mon Sep 17 00:00:00 2001 From: alex quiambao Date: Wed, 24 Aug 2016 10:37:40 +0800 Subject: [PATCH 5/9] Added gulp-sass on package.json --- angular/index.components.js | 2 -- package.json | 1 + 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/angular/index.components.js b/angular/index.components.js index 86b8635..9d700cf 100644 --- a/angular/index.components.js +++ b/angular/index.components.js @@ -1,4 +1,3 @@ -import {TesterComponent} from './app/components/tester/tester.component'; import { TablesSimpleComponent } from './app/components/tables-simple/tables-simple.component' import { UiModalComponent } from './app/components/ui-modal/ui-modal.component' import { UiTimelineComponent } from './app/components/ui-timeline/ui-timeline.component' @@ -29,7 +28,6 @@ import { LoginFormComponent } from './app/components/login-form/login-form.compo import { RegisterFormComponent } from './app/components/register-form/register-form.component' angular.module('app.components') - .component('tester', TesterComponent) .component('tablesSimple', TablesSimpleComponent) .component('uiModal', UiModalComponent) .component('uiTimeline', UiTimelineComponent) diff --git a/package.json b/package.json index 29dc308..fec6b3d 100644 --- a/package.json +++ b/package.json @@ -41,6 +41,7 @@ "gulp-ng-html2js": "^0.2.0", "gulp-notify": "^2.0.0", "gulp-phpcs": "^1.0.0", + "gulp-sass": "^2.3.2", "gulp-sourcemaps": "^1", "gulp-uglify": "^1", "gulp-util": "^3.0.3", From d7e7c56c85c8417a2452ff01d84e6ba60a9d16a2 Mon Sep 17 00:00:00 2001 From: Alex Quiambao Date: Wed, 24 Aug 2016 12:22:55 +0800 Subject: [PATCH 6/9] Asset Concatination (#64) --- gulpfile.js | 41 +++++++++++++++++++++------------ resources/views/index.blade.php | 8 ++----- tasks/concatScripts.task.js | 18 +++++++++++++++ 3 files changed, 46 insertions(+), 21 deletions(-) create mode 100644 tasks/concatScripts.task.js diff --git a/gulpfile.js b/gulpfile.js index 9fef53e..3af5f57 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -1,4 +1,6 @@ var elixir = require('laravel-elixir') + +require('./tasks/concatScripts.task.js'); require('laravel-elixir-karma') require('./tasks/angular.task.js') require('./tasks/bower.task.js') @@ -25,27 +27,36 @@ elixir(function (mix) { var fontsOutputFolder = config.fonts.outputFolder var buildPath = config.buildPath - var assets = [ - jsOutputFolder + '/vendor.js', - jsOutputFolder + '/partials.js', - jsOutputFolder + '/app.js', - cssOutputFolder + '/vendor.css', - cssOutputFolder + '/app.css' - ], - karmaJsDir = [ - jsOutputFolder + '/vendor.js', - 'node_modules/angular-mocks/angular-mocks.js', - 'node_modules/ng-describe/dist/ng-describe.js', - jsOutputFolder + '/partials.js', - jsOutputFolder + '/app.js', - 'tests/angular/**/*.spec.js' - ] + var assets = [ + 'public/js/final.js', + 'public/css/final.css' + ], + scripts = [ + './public/js/vendor.js', + './public/js/partials.js', + './public/js/app.js', + './public/dist/js/app.js' + ], + styles = [ + './public/css/vendor.css', + './public/css/app.css' + ], + karmaJsDir = [ + jsOutputFolder + '/vendor.js', + 'node_modules/angular-mocks/angular-mocks.js', + 'node_modules/ng-describe/dist/ng-describe.js', + jsOutputFolder + '/partials.js', + jsOutputFolder + '/app.js', + 'tests/angular/**/*.spec.js' + ]; mix .bower() .angular('./angular/') .ngHtml2Js('./angular/**/*.html') + .concatScripts(scripts, 'final.js') .sass('./angular/**/*.scss', 'public/css') + .styles(styles, './public/css/final.css') .version(assets) .browserSync({ proxy: 'localhost:8000' diff --git a/resources/views/index.blade.php b/resources/views/index.blade.php index 85d893c..0048909 100644 --- a/resources/views/index.blade.php +++ b/resources/views/index.blade.php @@ -4,8 +4,7 @@ - - + @@ -22,11 +21,8 @@
- - -
- + diff --git a/tasks/concatScripts.task.js b/tasks/concatScripts.task.js new file mode 100644 index 0000000..7e46cce --- /dev/null +++ b/tasks/concatScripts.task.js @@ -0,0 +1,18 @@ +var gulp = require('gulp'); +var concat = require('gulp-concat'); + +var Elixir = require('laravel-elixir'); + +var Task = Elixir.Task; + +Elixir.extend('concatScripts', function(scripts, dest) { + + new Task('concat-scripts', function() { + + return gulp.src(scripts) + .pipe(concat(dest)) + .pipe(gulp.dest(Elixir.config.js.outputFolder)); + + }).watch(scripts); + +}); From 45fae8e85786178258a4b4fbd09fb897d0ec15d0 Mon Sep 17 00:00:00 2001 From: alex quiambao Date: Wed, 24 Aug 2016 12:24:27 +0800 Subject: [PATCH 7/9] Executed standard-format --- README.md | 2 +- gulpfile.js | 46 ++++++++++++++++++------------------- tasks/concatScripts.task.js | 24 ++++++++----------- 3 files changed, 34 insertions(+), 38 deletions(-) diff --git a/README.md b/README.md index 010b1de..b18889c 100644 --- a/README.md +++ b/README.md @@ -119,4 +119,4 @@ This project wont be possible without the following, We acknowledge and are grat ## License -This project is licensed under the MIT License - see the [LICENSE](LICENSE) file for details +This project is licensed under the MIT License - see the [LICENSE](LICENSE) file for details \ No newline at end of file diff --git a/gulpfile.js b/gulpfile.js index 3af5f57..c9488da 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -1,6 +1,6 @@ var elixir = require('laravel-elixir') -require('./tasks/concatScripts.task.js'); +require('./tasks/concatScripts.task.js') require('laravel-elixir-karma') require('./tasks/angular.task.js') require('./tasks/bower.task.js') @@ -27,28 +27,28 @@ elixir(function (mix) { var fontsOutputFolder = config.fonts.outputFolder var buildPath = config.buildPath - var assets = [ - 'public/js/final.js', - 'public/css/final.css' - ], - scripts = [ - './public/js/vendor.js', - './public/js/partials.js', - './public/js/app.js', - './public/dist/js/app.js' - ], - styles = [ - './public/css/vendor.css', - './public/css/app.css' - ], - karmaJsDir = [ - jsOutputFolder + '/vendor.js', - 'node_modules/angular-mocks/angular-mocks.js', - 'node_modules/ng-describe/dist/ng-describe.js', - jsOutputFolder + '/partials.js', - jsOutputFolder + '/app.js', - 'tests/angular/**/*.spec.js' - ]; + var assets = [ + 'public/js/final.js', + 'public/css/final.css' + ], + scripts = [ + './public/js/vendor.js', + './public/js/partials.js', + './public/js/app.js', + './public/dist/js/app.js' + ], + styles = [ + './public/css/vendor.css', + './public/css/app.css' + ], + karmaJsDir = [ + jsOutputFolder + '/vendor.js', + 'node_modules/angular-mocks/angular-mocks.js', + 'node_modules/ng-describe/dist/ng-describe.js', + jsOutputFolder + '/partials.js', + jsOutputFolder + '/app.js', + 'tests/angular/**/*.spec.js' + ] mix .bower() diff --git a/tasks/concatScripts.task.js b/tasks/concatScripts.task.js index 7e46cce..e948401 100644 --- a/tasks/concatScripts.task.js +++ b/tasks/concatScripts.task.js @@ -1,18 +1,14 @@ -var gulp = require('gulp'); -var concat = require('gulp-concat'); +var gulp = require('gulp') +var concat = require('gulp-concat') -var Elixir = require('laravel-elixir'); +var Elixir = require('laravel-elixir') -var Task = Elixir.Task; - -Elixir.extend('concatScripts', function(scripts, dest) { - - new Task('concat-scripts', function() { +var Task = Elixir.Task +Elixir.extend('concatScripts', function (scripts, dest) { + new Task('concat-scripts', function () { return gulp.src(scripts) - .pipe(concat(dest)) - .pipe(gulp.dest(Elixir.config.js.outputFolder)); - - }).watch(scripts); - -}); + .pipe(concat(dest)) + .pipe(gulp.dest(Elixir.config.js.outputFolder)) + }).watch(scripts) +}) From 0508ebf06d44472bc5f8caa3d2e344a5f0d23f2f Mon Sep 17 00:00:00 2001 From: alex quiambao Date: Wed, 24 Aug 2016 12:55:34 +0800 Subject: [PATCH 8/9] Updated changelog for version v0.4.2 release --- CHANGELOG.md | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2504276..d2bff42 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,36 @@ # Change Log +## [v0.4.2](https://github.com/silverbux/laravel-angular-admin/tree/v0.4.2) (2016-08-24) +[Full Changelog](https://github.com/silverbux/laravel-angular-admin/compare/v0.4.1...v0.4.2) + +**Closed issues:** + +- Using Gulp watch will result in JWT failure [\#62](https://github.com/silverbux/laravel-angular-admin/issues/62) +- Error when updating user profile [\#61](https://github.com/silverbux/laravel-angular-admin/issues/61) +- Bootstrap modals have lost their rounded corners [\#59](https://github.com/silverbux/laravel-angular-admin/issues/59) +- login error [\#58](https://github.com/silverbux/laravel-angular-admin/issues/58) +- Error: the fixed layout requires the slimscroll plugin! [\#57](https://github.com/silverbux/laravel-angular-admin/issues/57) +- \[question\] acl: protect a route [\#56](https://github.com/silverbux/laravel-angular-admin/issues/56) +- Warnings during installation [\#55](https://github.com/silverbux/laravel-angular-admin/issues/55) +- can't use new module [\#54](https://github.com/silverbux/laravel-angular-admin/issues/54) +- Problem running the "Gulp" part of the install [\#53](https://github.com/silverbux/laravel-angular-admin/issues/53) +- Adding datatables.buttons [\#52](https://github.com/silverbux/laravel-angular-admin/issues/52) +- How to create a new Angular Component [\#51](https://github.com/silverbux/laravel-angular-admin/issues/51) +- gulp --production error [\#50](https://github.com/silverbux/laravel-angular-admin/issues/50) +- How to enable auto/live reload [\#49](https://github.com/silverbux/laravel-angular-admin/issues/49) +- Role Based Access Control [\#48](https://github.com/silverbux/laravel-angular-admin/issues/48) +- Does this compatible with laravel5-angular-material-starter? [\#47](https://github.com/silverbux/laravel-angular-admin/issues/47) +- composer install errors [\#46](https://github.com/silverbux/laravel-angular-admin/issues/46) +- file\_get\_contents\(C:\xampp\htdocs\AngLara\public\build/rev-manifest.json\): failed to open stream: No such file or directory [\#43](https://github.com/silverbux/laravel-angular-admin/issues/43) + +**Merged pull requests:** + +- Asset Concatination [\#64](https://github.com/silverbux/laravel-angular-admin/pull/64) ([silverbux](https://github.com/silverbux)) +- Switching from less to sass [\#63](https://github.com/silverbux/laravel-angular-admin/pull/63) ([silverbux](https://github.com/silverbux)) +- Fix server side error display in login & forgot pages [\#60](https://github.com/silverbux/laravel-angular-admin/pull/60) ([thomasmktong](https://github.com/thomasmktong)) +- Added simple tables component [\#45](https://github.com/silverbux/laravel-angular-admin/pull/45) ([silverbux](https://github.com/silverbux)) +- Added deploy to heroku button [\#44](https://github.com/silverbux/laravel-angular-admin/pull/44) ([silverbux](https://github.com/silverbux)) + ## [v0.4.1](https://github.com/silverbux/laravel-angular-admin/tree/v0.4.1) (2016-06-12) [Full Changelog](https://github.com/silverbux/laravel-angular-admin/compare/v0.4.0...v0.4.1) From edf8c77220befe83cbd6b10c1fa463b8d8c76738 Mon Sep 17 00:00:00 2001 From: Zach Mowrey Date: Sun, 2 Oct 2016 00:44:24 -0400 Subject: [PATCH 9/9] Fix oauth_provider and oauth_provider_id being set to null (#77) * Fix oauth_provider and oauth_provider_id being set to null Current User model sets oauth_provider and provider_id to null, rather than expected values; this situation prevents repeat log-in using any oauth method (creates a user with no password and no oauth_provider). This patch resolves. * Update for CI check Updating initial pull request --- app/User.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/User.php b/app/User.php index 9914c10..bc3ca57 100644 --- a/app/User.php +++ b/app/User.php @@ -22,7 +22,7 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon * @var array */ protected $fillable = [ - 'name', 'email', 'password', 'avatar', + 'name', 'email', 'password', 'avatar', 'oauth_provider', 'oauth_provider_id', ]; /**