diff --git a/bootstrap/autoload.php b/bootstrap/autoload.php
index bc04666..2c35b3f 100644
--- a/bootstrap/autoload.php
+++ b/bootstrap/autoload.php
@@ -27,7 +27,7 @@
|
*/
-$compiledPath = __DIR__.'/../vendor/compiled.php';
+$compiledPath = __DIR__.'/cache/compiled.php';
if (file_exists($compiledPath))
{
diff --git a/bootstrap/cache/.gitignore b/bootstrap/cache/.gitignore
new file mode 100644
index 0000000..d6b7ef3
--- /dev/null
+++ b/bootstrap/cache/.gitignore
@@ -0,0 +1,2 @@
+*
+!.gitignore
diff --git a/composer.json b/composer.json
index 377e29f..f693fcf 100644
--- a/composer.json
+++ b/composer.json
@@ -8,20 +8,20 @@
"license": "MIT",
"type": "project",
"require": {
- "laravel/framework": "~5.0",
+ "laravel/framework": "~5.1",
"pingpong/support": "~2.0",
- "pingpong/modules": "dev-hotfix/migrations",
+ "pingpong/modules": "dev-feature/5.1",
"cartalyst/sentry": "dev-feature/laravel-5",
- "asgardcms/core-module": "dev-develop",
- "asgardcms/dashboard-module": "dev-develop",
- "asgardcms/user-module": "dev-develop",
- "asgardcms/setting-module": "dev-develop",
- "asgardcms/media-module": "dev-develop",
- "asgardcms/page-module": "dev-develop",
- "asgardcms/menu-module": "dev-develop",
- "asgardcms/workshop-module": "dev-develop",
- "asgardcms/flatly-theme": "dev-master",
- "asgardcms/adminlte-theme": "dev-master",
+ "asgardcms/core-module": "~1.0",
+ "asgardcms/dashboard-module": "~1.0",
+ "asgardcms/user-module": "~1.0",
+ "asgardcms/setting-module": "~1.0",
+ "asgardcms/media-module": "~1.0",
+ "asgardcms/page-module": "~1.0",
+ "asgardcms/menu-module": "~1.0",
+ "asgardcms/workshop-module": "~1.0",
+ "asgardcms/flatly-theme": "~1.0",
+ "asgardcms/adminlte-theme": "~1.0",
"guzzlehttp/guzzle": "~5.0",
"kzykhys/git": "dev-patch-1",
"daylerees/kurenai": "~1.0",
@@ -31,7 +31,7 @@
"bugsnag/bugsnag-laravel": "1.4.2",
"predis/predis": "~1.1@dev",
"mailchimp/mailchimp": "2.0.6",
- "asgardcms/blog-module": "dev-develop"
+ "asgardcms/blog-module": "~1.0"
},
"require-dev": {
"phpunit/phpunit": "~4.0",
diff --git a/composer.lock b/composer.lock
index 987ac32..87d7bb0 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,20 +4,20 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
],
- "hash": "6ee7eb47733bf1fbcaab31784dcf2e34",
+ "hash": "152fdb3e9885425ed626a642f26420aa",
"packages": [
{
"name": "asgardcms/adminlte-theme",
- "version": "dev-master",
+ "version": "1.0.0",
"source": {
"type": "git",
"url": "https://github.com/AsgardCms/AdminLTE.git",
- "reference": "fe2d87dd11f13ed08bee10d9a22ee7d25ad69eae"
+ "reference": "7d46dc4602d079b7b05d52760fac3c31a550ad04"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/AsgardCms/AdminLTE/zipball/fe2d87dd11f13ed08bee10d9a22ee7d25ad69eae",
- "reference": "fe2d87dd11f13ed08bee10d9a22ee7d25ad69eae",
+ "url": "https://api.github.com/repos/AsgardCms/AdminLTE/zipball/7d46dc4602d079b7b05d52760fac3c31a550ad04",
+ "reference": "7d46dc4602d079b7b05d52760fac3c31a550ad04",
"shasum": ""
},
"require": {
@@ -40,20 +40,20 @@
"keywords": [
"asgard-cms"
],
- "time": "2015-04-29 06:51:37"
+ "time": "2015-06-10 14:09:13"
},
{
"name": "asgardcms/blog-module",
- "version": "dev-develop",
+ "version": "1.0.0",
"source": {
"type": "git",
"url": "https://github.com/AsgardCms/Blog.git",
- "reference": "27585060efd636a61ec13fcab24e69b30adaac91"
+ "reference": "7dcc6ce2bd1450e3aae7b76168f2dbe92a23ec27"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/AsgardCms/Blog/zipball/27585060efd636a61ec13fcab24e69b30adaac91",
- "reference": "27585060efd636a61ec13fcab24e69b30adaac91",
+ "url": "https://api.github.com/repos/AsgardCms/Blog/zipball/7dcc6ce2bd1450e3aae7b76168f2dbe92a23ec27",
+ "reference": "7dcc6ce2bd1450e3aae7b76168f2dbe92a23ec27",
"shasum": ""
},
"require": {
@@ -78,37 +78,37 @@
"blog",
"journal"
],
- "time": "2015-06-05 17:58:29"
+ "time": "2015-06-09 11:17:12"
},
{
"name": "asgardcms/core-module",
- "version": "dev-develop",
+ "version": "1.0.2",
"source": {
"type": "git",
"url": "https://github.com/AsgardCms/Core.git",
- "reference": "d5631e1f3536b08110b870b7dea25d36578daffe"
+ "reference": "3960de2f9f7de8e8082f8f2f6805d55ab08a0735"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/AsgardCms/Core/zipball/d5631e1f3536b08110b870b7dea25d36578daffe",
- "reference": "d5631e1f3536b08110b870b7dea25d36578daffe",
+ "url": "https://api.github.com/repos/AsgardCms/Core/zipball/3960de2f9f7de8e8082f8f2f6805d55ab08a0735",
+ "reference": "3960de2f9f7de8e8082f8f2f6805d55ab08a0735",
"shasum": ""
},
"require": {
"composer/installers": "~1.0",
"dimsav/laravel-translatable": "~5.0",
- "floatingpoint/stylist": "dev-master",
+ "floatingpoint/stylist": "~0.1",
"guzzlehttp/guzzle": "~5.0",
"laracasts/flash": "~1.3",
"laracasts/presenter": "~0.2",
"laravelcollective/html": "~5.0",
"maatwebsite/laravel-sidebar": "~1.0",
- "mcamara/laravel-localization": "~1.0",
+ "mcamara/laravel-localization": "dev-master",
"php": ">=5.4",
- "pingpong/modules": "dev-hotfix/migrations"
+ "pingpong/modules": "dev-feature/5.1"
},
"require-dev": {
- "orchestra/testbench": "~3.0",
+ "orchestra/testbench": "~3.1",
"phpunit/phpunit": "~4.0"
},
"type": "asgard-module",
@@ -128,20 +128,20 @@
"asgardcms",
"core"
],
- "time": "2015-06-06 10:03:03"
+ "time": "2015-06-10 15:11:59"
},
{
"name": "asgardcms/dashboard-module",
- "version": "dev-develop",
+ "version": "1.0.0",
"source": {
"type": "git",
"url": "https://github.com/AsgardCms/Dashboard.git",
- "reference": "e21eedb0f7a4e3222134ec860bd59607c612f500"
+ "reference": "68baf1e07a4bf36cb22514cf5c2a90038a63405c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/AsgardCms/Dashboard/zipball/e21eedb0f7a4e3222134ec860bd59607c612f500",
- "reference": "e21eedb0f7a4e3222134ec860bd59607c612f500",
+ "url": "https://api.github.com/repos/AsgardCms/Dashboard/zipball/68baf1e07a4bf36cb22514cf5c2a90038a63405c",
+ "reference": "68baf1e07a4bf36cb22514cf5c2a90038a63405c",
"shasum": ""
},
"require": {
@@ -165,20 +165,20 @@
"asgardcms",
"dashboard"
],
- "time": "2015-06-05 15:05:02"
+ "time": "2015-06-09 11:17:00"
},
{
"name": "asgardcms/flatly-theme",
- "version": "dev-master",
+ "version": "1.0.0",
"source": {
"type": "git",
"url": "https://github.com/AsgardCms/Flatly-theme.git",
- "reference": "87a29ee7b6d6a8231ce27ac4ecbea91bc4718f72"
+ "reference": "fc4822410b0e4dfb9e6629aa0d2f900ec3e1d87e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/AsgardCms/Flatly-theme/zipball/87a29ee7b6d6a8231ce27ac4ecbea91bc4718f72",
- "reference": "87a29ee7b6d6a8231ce27ac4ecbea91bc4718f72",
+ "url": "https://api.github.com/repos/AsgardCms/Flatly-theme/zipball/fc4822410b0e4dfb9e6629aa0d2f900ec3e1d87e",
+ "reference": "fc4822410b0e4dfb9e6629aa0d2f900ec3e1d87e",
"shasum": ""
},
"require": {
@@ -201,30 +201,30 @@
"keywords": [
"asgard-cms"
],
- "time": "2015-04-21 10:19:32"
+ "time": "2015-06-10 14:08:32"
},
{
"name": "asgardcms/media-module",
- "version": "dev-develop",
+ "version": "1.0.1",
"source": {
"type": "git",
"url": "https://github.com/AsgardCms/Media.git",
- "reference": "f4901d195b178502d0d1ab029ab61f87c1d5cacc"
+ "reference": "e956e1493f9fc9a71ef622c2e663efaeaacaf248"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/AsgardCms/Media/zipball/f4901d195b178502d0d1ab029ab61f87c1d5cacc",
- "reference": "f4901d195b178502d0d1ab029ab61f87c1d5cacc",
+ "url": "https://api.github.com/repos/AsgardCms/Media/zipball/e956e1493f9fc9a71ef622c2e663efaeaacaf248",
+ "reference": "e956e1493f9fc9a71ef622c2e663efaeaacaf248",
"shasum": ""
},
"require": {
- "asgardcms/core-module": "dev-develop",
+ "asgardcms/core-module": "~1.0",
"composer/installers": "~1.0",
"intervention/image": "~2.1",
"php": ">=5.4"
},
"require-dev": {
- "orchestra/testbench": "~3.0",
+ "orchestra/testbench": "~3.1",
"phpunit/phpunit": "~4.0"
},
"type": "asgard-module",
@@ -248,34 +248,34 @@
"library",
"media"
],
- "time": "2015-06-05 15:04:36"
+ "time": "2015-06-10 14:21:30"
},
{
"name": "asgardcms/menu-module",
- "version": "dev-develop",
+ "version": "1.0.1",
"source": {
"type": "git",
"url": "https://github.com/AsgardCms/Menu.git",
- "reference": "db11bfbfe2f942d00a51ce35e0becdfc2c8f4fe9"
+ "reference": "44b6192e0809890b83d3c8dea9a22910c7a275f2"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/AsgardCms/Menu/zipball/db11bfbfe2f942d00a51ce35e0becdfc2c8f4fe9",
- "reference": "db11bfbfe2f942d00a51ce35e0becdfc2c8f4fe9",
+ "url": "https://api.github.com/repos/AsgardCms/Menu/zipball/44b6192e0809890b83d3c8dea9a22910c7a275f2",
+ "reference": "44b6192e0809890b83d3c8dea9a22910c7a275f2",
"shasum": ""
},
"require": {
- "asgardcms/core-module": "dev-develop",
+ "asgardcms/core-module": "~1.0",
"composer/installers": "~1.0",
"dimsav/laravel-translatable": "~5.0",
"php": ">=5.4",
"pingpong/menus": "2.*@dev",
- "typicms/nestablecollection": "~1.1.0"
+ "typicms/nestablecollection": "1.1.1"
},
"require-dev": {
- "doctrine/dbal": "2.5.*@dev",
+ "doctrine/dbal": "~2.5",
"fzaninotto/faker": "1.4.0",
- "orchestra/testbench": "~3.0",
+ "orchestra/testbench": "~3.1",
"phpunit/phpunit": "~4.0"
},
"type": "asgard-module",
@@ -297,11 +297,11 @@
"nested sets",
"tree"
],
- "time": "2015-06-05 12:37:38"
+ "time": "2015-06-10 14:19:15"
},
{
"name": "asgardcms/page-module",
- "version": "dev-develop",
+ "version": "1.0.0",
"source": {
"type": "git",
"url": "https://github.com/AsgardCms/Page.git",
@@ -338,25 +338,25 @@
},
{
"name": "asgardcms/setting-module",
- "version": "dev-develop",
+ "version": "1.0.1",
"source": {
"type": "git",
"url": "https://github.com/AsgardCms/Setting.git",
- "reference": "9fcfbf1ad0a99c0b95c421093c1bff4787734656"
+ "reference": "9a80794fb193b9f73adba8365ededf4e7d8b1f21"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/AsgardCms/Setting/zipball/9fcfbf1ad0a99c0b95c421093c1bff4787734656",
- "reference": "9fcfbf1ad0a99c0b95c421093c1bff4787734656",
+ "url": "https://api.github.com/repos/AsgardCms/Setting/zipball/9a80794fb193b9f73adba8365ededf4e7d8b1f21",
+ "reference": "9a80794fb193b9f73adba8365ededf4e7d8b1f21",
"shasum": ""
},
"require": {
- "asgardcms/core-module": "dev-develop",
+ "asgardcms/core-module": "~1.0",
"composer/installers": "~1.0",
"php": ">=5.4"
},
"require-dev": {
- "orchestra/testbench": "~3.0",
+ "orchestra/testbench": "~3.1",
"phpunit/phpunit": "~4.0"
},
"type": "asgard-module",
@@ -376,27 +376,40 @@
"Settings",
"asgardcms"
],
- "time": "2015-06-06 18:16:23"
+ "time": "2015-06-10 14:19:15"
},
{
"name": "asgardcms/user-module",
- "version": "dev-develop",
+ "version": "1.0.1",
"source": {
"type": "git",
"url": "https://github.com/AsgardCms/User.git",
- "reference": "f28d8e0f65afbde27d030bfacb23cb097a67ef9b"
+ "reference": "a8e464e1ed5004102e02b1fa5d8f43a1b4feb107"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/AsgardCms/User/zipball/f28d8e0f65afbde27d030bfacb23cb097a67ef9b",
- "reference": "f28d8e0f65afbde27d030bfacb23cb097a67ef9b",
+ "url": "https://api.github.com/repos/AsgardCms/User/zipball/a8e464e1ed5004102e02b1fa5d8f43a1b4feb107",
+ "reference": "a8e464e1ed5004102e02b1fa5d8f43a1b4feb107",
"shasum": ""
},
"require": {
+ "asgardcms/core-module": "~1.0",
"composer/installers": "~1.0",
"php": ">=5.4"
},
+ "require-dev": {
+ "fzaninotto/faker": "~1.5",
+ "orchestra/testbench": "~3.1",
+ "phpunit/phpunit": "~4.0",
+ "scrutinizer/ocular": "~1.1"
+ },
"type": "asgard-module",
+ "autoload": {
+ "psr-4": {
+ "Modules\\User\\": ".",
+ "Modules\\": "Modules/"
+ }
+ },
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
@@ -415,31 +428,31 @@
"authorisation",
"user"
],
- "time": "2015-06-05 13:48:53"
+ "time": "2015-06-10 14:19:16"
},
{
"name": "asgardcms/workshop-module",
- "version": "dev-develop",
+ "version": "1.0.1",
"source": {
"type": "git",
"url": "https://github.com/AsgardCms/Workshop.git",
- "reference": "38569a42d373d9abee0dd1d75b7ffd6c96c214ad"
+ "reference": "544ffb7d75dabd03305d1da97cf69e473d9ff60e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/AsgardCms/Workshop/zipball/38569a42d373d9abee0dd1d75b7ffd6c96c214ad",
- "reference": "38569a42d373d9abee0dd1d75b7ffd6c96c214ad",
+ "url": "https://api.github.com/repos/AsgardCms/Workshop/zipball/544ffb7d75dabd03305d1da97cf69e473d9ff60e",
+ "reference": "544ffb7d75dabd03305d1da97cf69e473d9ff60e",
"shasum": ""
},
"require": {
- "asgardcms/core-module": "dev-develop",
- "asgardcms/menu-module": "dev-develop",
+ "asgardcms/core-module": "~1.0",
+ "asgardcms/menu-module": "~1.0",
"composer/installers": "~1.0",
"php": ">=5.4",
- "pingpong/modules": "dev-hotfix/migrations"
+ "pingpong/modules": "dev-feature/5.1"
},
"require-dev": {
- "orchestra/testbench": "~3.0",
+ "orchestra/testbench": "~3.1",
"phpunit/phpunit": "~4.0"
},
"type": "asgard-module",
@@ -460,7 +473,7 @@
"modules",
"workshop"
],
- "time": "2015-06-06 09:13:10"
+ "time": "2015-06-10 14:19:16"
},
{
"name": "bugsnag/bugsnag",
@@ -1609,27 +1622,26 @@
},
{
"name": "floatingpoint/stylist",
- "version": "dev-master",
+ "version": "0.1",
"source": {
"type": "git",
"url": "https://github.com/floatingpointsoftware/stylist.git",
- "reference": "94bd8f0e94a3fc27b6c9b148406801316c8d14e2"
+ "reference": "ff90cb1af68b8c6daeab0922a5ce475eed81907f"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/floatingpointsoftware/stylist/zipball/94bd8f0e94a3fc27b6c9b148406801316c8d14e2",
- "reference": "94bd8f0e94a3fc27b6c9b148406801316c8d14e2",
+ "url": "https://api.github.com/repos/floatingpointsoftware/stylist/zipball/ff90cb1af68b8c6daeab0922a5ce475eed81907f",
+ "reference": "ff90cb1af68b8c6daeab0922a5ce475eed81907f",
"shasum": ""
},
"require": {
- "illuminate/html": "5.0.*",
- "illuminate/support": "5.0.*",
- "php": ">=5.4.0"
+ "illuminate/support": "~5.0",
+ "laravelcollective/html": "~5.0",
+ "php": ">=5.5.0"
},
"require-dev": {
- "barryvdh/laravel-ide-helper": "~2.0",
"mockery/mockery": "dev-master@dev",
- "orchestra/testbench": "3.0.*@dev",
+ "orchestra/testbench": "3.0.x",
"phpunit/phpunit": "4.2.*"
},
"type": "library",
@@ -1651,7 +1663,7 @@
}
],
"description": "Laravel 5 theming package.",
- "time": "2015-03-31 12:45:58"
+ "time": "2015-06-09 18:46:08"
},
{
"name": "guzzle/guzzle",
@@ -1907,52 +1919,6 @@
],
"time": "2014-10-12 19:18:40"
},
- {
- "name": "illuminate/html",
- "version": "v5.0.0",
- "source": {
- "type": "git",
- "url": "https://github.com/illuminate/html.git",
- "reference": "3d1009bb8e0f25720c914af5c1f4015dd373c9ef"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/illuminate/html/zipball/3d1009bb8e0f25720c914af5c1f4015dd373c9ef",
- "reference": "3d1009bb8e0f25720c914af5c1f4015dd373c9ef",
- "shasum": ""
- },
- "require": {
- "illuminate/http": "~5.0",
- "illuminate/session": "~5.0",
- "illuminate/support": "~5.0",
- "php": ">=5.4.0"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "5.0-dev"
- }
- },
- "autoload": {
- "psr-4": {
- "Illuminate\\Html\\": ""
- },
- "files": [
- "helpers.php"
- ]
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Taylor Otwell",
- "email": "taylorotwell@gmail.com"
- }
- ],
- "time": "2015-01-01 16:31:18"
- },
{
"name": "intervention/image",
"version": "2.2.1",
@@ -2009,48 +1975,6 @@
],
"time": "2015-05-09 16:06:30"
},
- {
- "name": "ircmaxell/password-compat",
- "version": "v1.0.4",
- "source": {
- "type": "git",
- "url": "https://github.com/ircmaxell/password_compat.git",
- "reference": "5c5cde8822a69545767f7c7f3058cb15ff84614c"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/ircmaxell/password_compat/zipball/5c5cde8822a69545767f7c7f3058cb15ff84614c",
- "reference": "5c5cde8822a69545767f7c7f3058cb15ff84614c",
- "shasum": ""
- },
- "require-dev": {
- "phpunit/phpunit": "4.*"
- },
- "type": "library",
- "autoload": {
- "files": [
- "lib/password.php"
- ]
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Anthony Ferrara",
- "email": "ircmaxell@php.net",
- "homepage": "http://blog.ircmaxell.com"
- }
- ],
- "description": "A compatibility library for the proposed simplified password hashing algorithm: https://wiki.php.net/rfc/password_hash",
- "homepage": "https://github.com/ircmaxell/password_compat",
- "keywords": [
- "hashing",
- "password"
- ],
- "time": "2014-11-20 16:49:30"
- },
{
"name": "jakub-onderka/php-console-color",
"version": "0.1",
@@ -2395,16 +2319,16 @@
},
{
"name": "laravel/framework",
- "version": "v5.0.32",
+ "version": "v5.1.1",
"source": {
"type": "git",
"url": "https://github.com/laravel/framework.git",
- "reference": "85f12207cf45cc288e9e6b9b5d184aad5f08e2ca"
+ "reference": "3a44db7e70146dc1282b39887b5faa67c8583015"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/laravel/framework/zipball/85f12207cf45cc288e9e6b9b5d184aad5f08e2ca",
- "reference": "85f12207cf45cc288e9e6b9b5d184aad5f08e2ca",
+ "url": "https://api.github.com/repos/laravel/framework/zipball/3a44db7e70146dc1282b39887b5faa67c8583015",
+ "reference": "3a44db7e70146dc1282b39887b5faa67c8583015",
"shasum": ""
},
"require": {
@@ -2412,31 +2336,31 @@
"danielstjules/stringy": "~1.8",
"doctrine/inflector": "~1.0",
"ext-mbstring": "*",
- "ext-mcrypt": "*",
"ext-openssl": "*",
- "ircmaxell/password-compat": "~1.0",
"jeremeamia/superclosure": "~2.0",
"league/flysystem": "~1.0",
"monolog/monolog": "~1.11",
"mtdowling/cron-expression": "~1.0",
- "nesbot/carbon": "~1.0",
- "php": ">=5.4.0",
+ "nesbot/carbon": "~1.19",
+ "php": ">=5.5.9",
"psy/psysh": "0.4.*",
"swiftmailer/swiftmailer": "~5.1",
- "symfony/console": "2.6.*",
- "symfony/debug": "2.6.*",
- "symfony/finder": "2.6.*",
- "symfony/http-foundation": "2.6.*",
- "symfony/http-kernel": "2.6.*",
- "symfony/process": "2.6.*",
- "symfony/routing": "2.6.*",
- "symfony/security-core": "2.6.*",
- "symfony/translation": "2.6.*",
- "symfony/var-dumper": "2.6.*",
+ "symfony/console": "2.7.*",
+ "symfony/css-selector": "2.7.*",
+ "symfony/debug": "2.7.*",
+ "symfony/dom-crawler": "2.7.*",
+ "symfony/finder": "2.7.*",
+ "symfony/http-foundation": "2.7.*",
+ "symfony/http-kernel": "2.7.*",
+ "symfony/process": "2.7.*",
+ "symfony/routing": "2.7.*",
+ "symfony/translation": "2.7.*",
+ "symfony/var-dumper": "2.7.*",
"vlucas/phpdotenv": "~1.0"
},
"replace": {
"illuminate/auth": "self.version",
+ "illuminate/broadcasting": "self.version",
"illuminate/bus": "self.version",
"illuminate/cache": "self.version",
"illuminate/config": "self.version",
@@ -2466,27 +2390,29 @@
"illuminate/view": "self.version"
},
"require-dev": {
- "aws/aws-sdk-php": "~2.4",
- "iron-io/iron_mq": "~1.5",
- "mockery/mockery": "~0.9",
+ "aws/aws-sdk-php": "~3.0",
+ "iron-io/iron_mq": "~2.0",
+ "mockery/mockery": "~0.9.1",
"pda/pheanstalk": "~3.0",
"phpunit/phpunit": "~4.0",
"predis/predis": "~1.0"
},
"suggest": {
- "aws/aws-sdk-php": "Required to use the SQS queue driver and SES mail driver (~2.4).",
+ "aws/aws-sdk-php": "Required to use the SQS queue driver and SES mail driver (~3.0).",
"doctrine/dbal": "Required to rename columns and drop SQLite columns (~2.4).",
- "guzzlehttp/guzzle": "Required to use the Mailgun and Mandrill mail drivers (~5.0).",
- "iron-io/iron_mq": "Required to use the iron queue driver (~1.5).",
- "league/flysystem-aws-s3-v2": "Required to use the Flysystem S3 driver (~1.0).",
+ "fzaninotto/faker": "Required to use the eloquent factory builder (~1.4).",
+ "guzzlehttp/guzzle": "Required to use the Mailgun and Mandrill mail drivers (~5.3|~6.0).",
+ "iron-io/iron_mq": "Required to use the iron queue driver (~2.0).",
+ "league/flysystem-aws-s3-v3": "Required to use the Flysystem S3 driver (~1.0).",
"league/flysystem-rackspace": "Required to use the Flysystem Rackspace driver (~1.0).",
"pda/pheanstalk": "Required to use the beanstalk queue driver (~3.0).",
- "predis/predis": "Required to use the redis cache and queue drivers (~1.0)."
+ "predis/predis": "Required to use the redis cache and queue drivers (~1.0).",
+ "pusher/pusher-php-server": "Required to use the Pusher broadcast driver (~2.0)."
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "5.0-dev"
+ "dev-master": "5.1-dev"
}
},
"autoload": {
@@ -2517,27 +2443,27 @@
"framework",
"laravel"
],
- "time": "2015-05-29 18:56:49"
+ "time": "2015-06-09 14:13:59"
},
{
"name": "laravelcollective/html",
- "version": "v5.0.4",
+ "version": "v5.0.5",
"source": {
"type": "git",
"url": "https://github.com/LaravelCollective/html.git",
- "reference": "c55fda58b1a9a1b58bd04f97e0fb9ebc238a0a94"
+ "reference": "f1eddc7a7834854a3cb147a7601547394d345213"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/LaravelCollective/html/zipball/c55fda58b1a9a1b58bd04f97e0fb9ebc238a0a94",
- "reference": "c55fda58b1a9a1b58bd04f97e0fb9ebc238a0a94",
+ "url": "https://api.github.com/repos/LaravelCollective/html/zipball/f1eddc7a7834854a3cb147a7601547394d345213",
+ "reference": "f1eddc7a7834854a3cb147a7601547394d345213",
"shasum": ""
},
"require": {
- "illuminate/http": "~5.0",
- "illuminate/routing": "~5.0",
- "illuminate/session": "~5.0",
- "illuminate/support": "~5.0",
+ "illuminate/http": "~5.1",
+ "illuminate/routing": "~5.1",
+ "illuminate/session": "~5.1",
+ "illuminate/support": "~5.1",
"php": ">=5.4.0"
},
"require-dev": {
@@ -2545,6 +2471,11 @@
"phpunit/phpunit": "~4.0"
},
"type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "5.1-dev"
+ }
+ },
"autoload": {
"psr-4": {
"Collective\\Html\\": "src/"
@@ -2567,23 +2498,24 @@
"email": "adam@laravelcollective.com"
}
],
- "time": "2015-05-06 14:23:37"
+ "time": "2015-05-21 16:45:14"
},
{
"name": "league/flysystem",
- "version": "1.0.3",
+ "version": "1.0.4",
"source": {
"type": "git",
"url": "https://github.com/thephpleague/flysystem.git",
- "reference": "3c2400a99ccc3be6884d40361890010449c6b447"
+ "reference": "56862959b45131ad33e5a7727a25db19f2cf090b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/3c2400a99ccc3be6884d40361890010449c6b447",
- "reference": "3c2400a99ccc3be6884d40361890010449c6b447",
+ "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/56862959b45131ad33e5a7727a25db19f2cf090b",
+ "reference": "56862959b45131ad33e5a7727a25db19f2cf090b",
"shasum": ""
},
"require": {
+ "ext-mbstring": "*",
"php": ">=5.4.0"
},
"require-dev": {
@@ -2650,29 +2582,31 @@
"sftp",
"storage"
],
- "time": "2015-03-29 14:01:43"
+ "time": "2015-06-07 21:27:37"
},
{
"name": "maatwebsite/laravel-sidebar",
- "version": "1.0.2",
+ "version": "1.1.1",
"source": {
"type": "git",
"url": "https://github.com/Maatwebsite/Laravel-Sidebar.git",
- "reference": "310878dabaf85dd7fc331a35c11b953d7bd9b6c2"
+ "reference": "ef312369995fbb34eff7bcedd7739579aa77de2d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/Maatwebsite/Laravel-Sidebar/zipball/310878dabaf85dd7fc331a35c11b953d7bd9b6c2",
- "reference": "310878dabaf85dd7fc331a35c11b953d7bd9b6c2",
+ "url": "https://api.github.com/repos/Maatwebsite/Laravel-Sidebar/zipball/ef312369995fbb34eff7bcedd7739579aa77de2d",
+ "reference": "ef312369995fbb34eff7bcedd7739579aa77de2d",
"shasum": ""
},
"require": {
"illuminate/contracts": "~5.0",
+ "illuminate/routing": "~5.0",
"illuminate/support": "~5.0",
"illuminate/view": "~5.0",
"php": ">=5.4.0"
},
"require-dev": {
+ "mockery/mockery": "~0.9",
"phpunit/phpunit": "~4.1"
},
"type": "library",
@@ -2696,7 +2630,7 @@
"acp",
"laravel"
],
- "time": "2015-05-27 09:55:55"
+ "time": "2015-06-08 19:03:23"
},
{
"name": "mailchimp/mailchimp",
@@ -2746,20 +2680,20 @@
},
{
"name": "mcamara/laravel-localization",
- "version": "1.0.7",
+ "version": "dev-master",
"source": {
"type": "git",
"url": "https://github.com/mcamara/laravel-localization.git",
- "reference": "952d26841ab9f4bc76460514609d38b98311c898"
+ "reference": "7f19639e1650f786fa7158ca59c3445995902a4c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/mcamara/laravel-localization/zipball/952d26841ab9f4bc76460514609d38b98311c898",
- "reference": "952d26841ab9f4bc76460514609d38b98311c898",
+ "url": "https://api.github.com/repos/mcamara/laravel-localization/zipball/7f19639e1650f786fa7158ca59c3445995902a4c",
+ "reference": "7f19639e1650f786fa7158ca59c3445995902a4c",
"shasum": ""
},
"require": {
- "laravel/framework": "5.0.*",
+ "laravel/framework": "~5.0",
"php": ">=5.4.0"
},
"require-dev": {
@@ -2790,7 +2724,7 @@
"localization",
"php"
],
- "time": "2015-03-11 16:51:00"
+ "time": "2015-06-09 15:25:30"
},
{
"name": "michelf/php-markdown",
@@ -3104,24 +3038,24 @@
},
{
"name": "pingpong/generators",
- "version": "2.0.10",
+ "version": "2.1.x-dev",
"source": {
"type": "git",
"url": "https://github.com/pingpong-labs/generators.git",
- "reference": "5c4284f7b7d47b0a36922b0bc553bc38d5b23351"
+ "reference": "37f50e61918ccc8b9c5ea7614814a814b2b4fee4"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/pingpong-labs/generators/zipball/5c4284f7b7d47b0a36922b0bc553bc38d5b23351",
- "reference": "5c4284f7b7d47b0a36922b0bc553bc38d5b23351",
+ "url": "https://api.github.com/repos/pingpong-labs/generators/zipball/37f50e61918ccc8b9c5ea7614814a814b2b4fee4",
+ "reference": "37f50e61918ccc8b9c5ea7614814a814b2b4fee4",
"shasum": ""
},
"require": {
"doctrine/dbal": "~2.5",
- "illuminate/filesystem": "5.0.*",
- "illuminate/support": "5.0.*",
+ "illuminate/filesystem": "5.1.*@dev",
+ "illuminate/support": "5.1.*@dev",
"php": ">=5.4.0",
- "pingpong/support": "~2.0"
+ "pingpong/support": "2.1.*@dev"
},
"require-dev": {
"mockery/mockery": "~0.9",
@@ -3149,26 +3083,26 @@
"laravel",
"pingpong"
],
- "time": "2015-06-05 07:04:03"
+ "time": "2015-06-09 14:29:37"
},
{
"name": "pingpong/menus",
- "version": "2.0.10",
+ "version": "2.1.x-dev",
"source": {
"type": "git",
"url": "https://github.com/pingpong-labs/menus.git",
- "reference": "f18489c7c3e7461a9c137671fd1e348c96e0359b"
+ "reference": "4e790eeb083576519c253df9a04535be943672f1"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/pingpong-labs/menus/zipball/f18489c7c3e7461a9c137671fd1e348c96e0359b",
- "reference": "f18489c7c3e7461a9c137671fd1e348c96e0359b",
+ "url": "https://api.github.com/repos/pingpong-labs/menus/zipball/4e790eeb083576519c253df9a04535be943672f1",
+ "reference": "4e790eeb083576519c253df9a04535be943672f1",
"shasum": ""
},
"require": {
- "illuminate/config": "5.0.*",
- "illuminate/support": "5.0.*",
- "illuminate/view": "5.0.*",
+ "illuminate/config": "5.1.*@dev",
+ "illuminate/support": "5.1.*@dev",
+ "illuminate/view": "5.1.*@dev",
"laravelcollective/html": "~5.0",
"php": ">=5.3.0"
},
@@ -3201,28 +3135,28 @@
"navigation",
"pingpong"
],
- "time": "2015-06-05 07:04:03"
+ "time": "2015-06-09 14:29:37"
},
{
"name": "pingpong/modules",
- "version": "dev-hotfix/migrations",
+ "version": "dev-feature/5.1",
"source": {
"type": "git",
"url": "https://github.com/nWidart/modules.git",
- "reference": "c3e5540c97094085f9f20ecba3a0eeb245cccb76"
+ "reference": "f8dea9ac96113eb87ba0b199f037076a5454b123"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/nWidart/modules/zipball/c3e5540c97094085f9f20ecba3a0eeb245cccb76",
- "reference": "c3e5540c97094085f9f20ecba3a0eeb245cccb76",
+ "url": "https://api.github.com/repos/nWidart/modules/zipball/f8dea9ac96113eb87ba0b199f037076a5454b123",
+ "reference": "f8dea9ac96113eb87ba0b199f037076a5454b123",
"shasum": ""
},
"require": {
- "laravel/framework": "^5.0",
+ "laravel/framework": "~5.1",
"laravelcollective/html": "~5.0",
"php": ">=5.4.0",
- "pingpong/generators": "~2.0",
- "pingpong/support": "~2.0"
+ "pingpong/generators": "2.1.*@dev",
+ "pingpong/support": "2.1.*@dev"
},
"require-dev": {
"mockery/mockery": "~0.9",
@@ -3252,28 +3186,28 @@
"pingpong"
],
"support": {
- "source": "https://github.com/nWidart/modules/tree/hotfix/migrations"
+ "source": "https://github.com/nWidart/modules/tree/feature/5.1"
},
- "time": "2015-06-06 09:17:31"
+ "time": "2015-06-09 19:03:07"
},
{
"name": "pingpong/support",
- "version": "2.0.10",
+ "version": "2.1.x-dev",
"source": {
"type": "git",
"url": "https://github.com/pingpong-labs/support.git",
- "reference": "a2057526e0b3bfadbb50edda879b20f7acb7496b"
+ "reference": "32738943416ca41174110e10543972f1f9561403"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/pingpong-labs/support/zipball/a2057526e0b3bfadbb50edda879b20f7acb7496b",
- "reference": "a2057526e0b3bfadbb50edda879b20f7acb7496b",
+ "url": "https://api.github.com/repos/pingpong-labs/support/zipball/32738943416ca41174110e10543972f1f9561403",
+ "reference": "32738943416ca41174110e10543972f1f9561403",
"shasum": ""
},
"require": {
"erusev/parsedown-extra": "0.7.*",
- "illuminate/filesystem": "5.0.*",
- "illuminate/support": "5.0.*",
+ "illuminate/filesystem": "5.1.*@dev",
+ "illuminate/support": "5.1.*@dev",
"php": ">=5.4.0"
},
"type": "library",
@@ -3296,7 +3230,7 @@
}
],
"description": "Support Component of Pingpong Sky Package",
- "time": "2015-06-05 07:04:03"
+ "time": "2015-06-05 09:49:29"
},
{
"name": "predis/predis",
@@ -3561,21 +3495,20 @@
},
{
"name": "symfony/console",
- "version": "v2.6.9",
- "target-dir": "Symfony/Component/Console",
+ "version": "v2.7.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/Console.git",
- "reference": "b5ec0c11a204718f2b656357f5505a8e578f30dd"
+ "reference": "7f0bec04961c61c961df0cb8c2ae88dbfd83f399"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/Console/zipball/b5ec0c11a204718f2b656357f5505a8e578f30dd",
- "reference": "b5ec0c11a204718f2b656357f5505a8e578f30dd",
+ "url": "https://api.github.com/repos/symfony/Console/zipball/7f0bec04961c61c961df0cb8c2ae88dbfd83f399",
+ "reference": "7f0bec04961c61c961df0cb8c2ae88dbfd83f399",
"shasum": ""
},
"require": {
- "php": ">=5.3.3"
+ "php": ">=5.3.9"
},
"require-dev": {
"psr/log": "~1.0",
@@ -3591,11 +3524,11 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.6-dev"
+ "dev-master": "2.7-dev"
}
},
"autoload": {
- "psr-0": {
+ "psr-4": {
"Symfony\\Component\\Console\\": ""
}
},
@@ -3615,25 +3548,77 @@
],
"description": "Symfony Console Component",
"homepage": "https://symfony.com",
- "time": "2015-05-29 14:42:58"
+ "time": "2015-05-29 16:22:24"
+ },
+ {
+ "name": "symfony/css-selector",
+ "version": "v2.7.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/symfony/CssSelector.git",
+ "reference": "0b5c07b516226b7dd32afbbc82fe547a469c5092"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/symfony/CssSelector/zipball/0b5c07b516226b7dd32afbbc82fe547a469c5092",
+ "reference": "0b5c07b516226b7dd32afbbc82fe547a469c5092",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.3.9"
+ },
+ "require-dev": {
+ "symfony/phpunit-bridge": "~2.7"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "2.7-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "Symfony\\Component\\CssSelector\\": ""
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Jean-François Simon",
+ "email": "jeanfrancois.simon@sensiolabs.com"
+ },
+ {
+ "name": "Fabien Potencier",
+ "email": "fabien@symfony.com"
+ },
+ {
+ "name": "Symfony Community",
+ "homepage": "https://symfony.com/contributors"
+ }
+ ],
+ "description": "Symfony CssSelector Component",
+ "homepage": "https://symfony.com",
+ "time": "2015-05-15 13:33:16"
},
{
"name": "symfony/debug",
- "version": "v2.6.9",
- "target-dir": "Symfony/Component/Debug",
+ "version": "v2.7.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/Debug.git",
- "reference": "4851a041c48e76b91a221db84ab5850daa6a7b33"
+ "reference": "1df2971b27a6ff73dae4ea622f42802000ec332d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/Debug/zipball/4851a041c48e76b91a221db84ab5850daa6a7b33",
- "reference": "4851a041c48e76b91a221db84ab5850daa6a7b33",
+ "url": "https://api.github.com/repos/symfony/Debug/zipball/1df2971b27a6ff73dae4ea622f42802000ec332d",
+ "reference": "1df2971b27a6ff73dae4ea622f42802000ec332d",
"shasum": ""
},
"require": {
- "php": ">=5.3.3",
+ "php": ">=5.3.9",
"psr/log": "~1.0"
},
"conflict": {
@@ -3652,11 +3637,11 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.6-dev"
+ "dev-master": "2.7-dev"
}
},
"autoload": {
- "psr-0": {
+ "psr-4": {
"Symfony\\Component\\Debug\\": ""
}
},
@@ -3676,7 +3661,60 @@
],
"description": "Symfony Debug Component",
"homepage": "https://symfony.com",
- "time": "2015-05-20 13:09:45"
+ "time": "2015-05-22 14:54:25"
+ },
+ {
+ "name": "symfony/dom-crawler",
+ "version": "v2.7.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/symfony/DomCrawler.git",
+ "reference": "11d8eb8ccc1533f4c2d89a025f674894fda520b3"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/symfony/DomCrawler/zipball/11d8eb8ccc1533f4c2d89a025f674894fda520b3",
+ "reference": "11d8eb8ccc1533f4c2d89a025f674894fda520b3",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.3.9"
+ },
+ "require-dev": {
+ "symfony/css-selector": "~2.3",
+ "symfony/phpunit-bridge": "~2.7"
+ },
+ "suggest": {
+ "symfony/css-selector": ""
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "2.7-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "Symfony\\Component\\DomCrawler\\": ""
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Fabien Potencier",
+ "email": "fabien@symfony.com"
+ },
+ {
+ "name": "Symfony Community",
+ "homepage": "https://symfony.com/contributors"
+ }
+ ],
+ "description": "Symfony DomCrawler Component",
+ "homepage": "https://symfony.com",
+ "time": "2015-05-22 14:54:25"
},
{
"name": "symfony/event-dispatcher",
@@ -3787,21 +3825,20 @@
},
{
"name": "symfony/finder",
- "version": "v2.6.9",
- "target-dir": "Symfony/Component/Finder",
+ "version": "v2.7.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/Finder.git",
- "reference": "ffedd3e0ff8155188155e9322fe21b9ee012ac14"
+ "reference": "ccb8ed8339cf24824f2ef35dacec30d92ff44368"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/Finder/zipball/ffedd3e0ff8155188155e9322fe21b9ee012ac14",
- "reference": "ffedd3e0ff8155188155e9322fe21b9ee012ac14",
+ "url": "https://api.github.com/repos/symfony/Finder/zipball/ccb8ed8339cf24824f2ef35dacec30d92ff44368",
+ "reference": "ccb8ed8339cf24824f2ef35dacec30d92ff44368",
"shasum": ""
},
"require": {
- "php": ">=5.3.3"
+ "php": ">=5.3.9"
},
"require-dev": {
"symfony/phpunit-bridge": "~2.7"
@@ -3809,11 +3846,11 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.6-dev"
+ "dev-master": "2.7-dev"
}
},
"autoload": {
- "psr-0": {
+ "psr-4": {
"Symfony\\Component\\Finder\\": ""
}
},
@@ -3833,25 +3870,24 @@
],
"description": "Symfony Finder Component",
"homepage": "https://symfony.com",
- "time": "2015-05-15 13:32:45"
+ "time": "2015-05-15 14:02:48"
},
{
"name": "symfony/http-foundation",
- "version": "v2.6.9",
- "target-dir": "Symfony/Component/HttpFoundation",
+ "version": "v2.7.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/HttpFoundation.git",
- "reference": "f9b28dcc6d3e50f5568b42dda7292656a9fe8432"
+ "reference": "729de183da037c125c5f6366bd4f0631ba1a1abb"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/HttpFoundation/zipball/f9b28dcc6d3e50f5568b42dda7292656a9fe8432",
- "reference": "f9b28dcc6d3e50f5568b42dda7292656a9fe8432",
+ "url": "https://api.github.com/repos/symfony/HttpFoundation/zipball/729de183da037c125c5f6366bd4f0631ba1a1abb",
+ "reference": "729de183da037c125c5f6366bd4f0631ba1a1abb",
"shasum": ""
},
"require": {
- "php": ">=5.3.3"
+ "php": ">=5.3.9"
},
"require-dev": {
"symfony/expression-language": "~2.4",
@@ -3860,15 +3896,15 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.6-dev"
+ "dev-master": "2.7-dev"
}
},
"autoload": {
- "psr-0": {
+ "psr-4": {
"Symfony\\Component\\HttpFoundation\\": ""
},
"classmap": [
- "Symfony/Component/HttpFoundation/Resources/stubs"
+ "Resources/stubs"
]
},
"notification-url": "https://packagist.org/downloads/",
@@ -3887,34 +3923,36 @@
],
"description": "Symfony HttpFoundation Component",
"homepage": "https://symfony.com",
- "time": "2015-05-22 14:53:08"
+ "time": "2015-05-22 14:54:25"
},
{
"name": "symfony/http-kernel",
- "version": "v2.6.9",
- "target-dir": "Symfony/Component/HttpKernel",
+ "version": "v2.7.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/HttpKernel.git",
- "reference": "7c883eb1a5d8b52b1fa6d4134b82304c6bb7007f"
+ "reference": "74acbb7ef9c4aae0620d3250b9b990d2fff28d16"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/HttpKernel/zipball/7c883eb1a5d8b52b1fa6d4134b82304c6bb7007f",
- "reference": "7c883eb1a5d8b52b1fa6d4134b82304c6bb7007f",
+ "url": "https://api.github.com/repos/symfony/HttpKernel/zipball/74acbb7ef9c4aae0620d3250b9b990d2fff28d16",
+ "reference": "74acbb7ef9c4aae0620d3250b9b990d2fff28d16",
"shasum": ""
},
"require": {
- "php": ">=5.3.3",
+ "php": ">=5.3.9",
"psr/log": "~1.0",
"symfony/debug": "~2.6,>=2.6.2",
"symfony/event-dispatcher": "~2.5.9|~2.6,>=2.6.2",
"symfony/http-foundation": "~2.5,>=2.5.4"
},
+ "conflict": {
+ "symfony/config": "<2.7"
+ },
"require-dev": {
"symfony/browser-kit": "~2.3",
"symfony/class-loader": "~2.1",
- "symfony/config": "~2.0,>=2.0.5",
+ "symfony/config": "~2.7",
"symfony/console": "~2.3",
"symfony/css-selector": "~2.0,>=2.0.5",
"symfony/dependency-injection": "~2.2",
@@ -3941,11 +3979,11 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.6-dev"
+ "dev-master": "2.7-dev"
}
},
"autoload": {
- "psr-0": {
+ "psr-4": {
"Symfony\\Component\\HttpKernel\\": ""
}
},
@@ -3965,7 +4003,7 @@
],
"description": "Symfony HttpKernel Component",
"homepage": "https://symfony.com",
- "time": "2015-05-29 22:55:07"
+ "time": "2015-05-30 16:52:28"
},
{
"name": "symfony/options-resolver",
@@ -4023,21 +4061,20 @@
},
{
"name": "symfony/process",
- "version": "v2.6.9",
- "target-dir": "Symfony/Component/Process",
+ "version": "v2.7.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/Process.git",
- "reference": "7856d78ab6cce6e59d02d9e1a873441f6bd21306"
+ "reference": "e0a82b58e36afc60f8e79b8bc85a22bb064077c1"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/Process/zipball/7856d78ab6cce6e59d02d9e1a873441f6bd21306",
- "reference": "7856d78ab6cce6e59d02d9e1a873441f6bd21306",
+ "url": "https://api.github.com/repos/symfony/Process/zipball/e0a82b58e36afc60f8e79b8bc85a22bb064077c1",
+ "reference": "e0a82b58e36afc60f8e79b8bc85a22bb064077c1",
"shasum": ""
},
"require": {
- "php": ">=5.3.3"
+ "php": ">=5.3.9"
},
"require-dev": {
"symfony/phpunit-bridge": "~2.7"
@@ -4045,11 +4082,11 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.6-dev"
+ "dev-master": "2.7-dev"
}
},
"autoload": {
- "psr-0": {
+ "psr-4": {
"Symfony\\Component\\Process\\": ""
}
},
@@ -4069,31 +4106,33 @@
],
"description": "Symfony Process Component",
"homepage": "https://symfony.com",
- "time": "2015-05-15 13:32:45"
+ "time": "2015-05-15 13:33:16"
},
{
"name": "symfony/routing",
- "version": "v2.6.9",
- "target-dir": "Symfony/Component/Routing",
+ "version": "v2.7.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/Routing.git",
- "reference": "dc9df18a1cfe87de65e270e8f01407ca6d7c39cb"
+ "reference": "6f0333fb8b89cf6f8fd9d6740c5e83b73d9c95b9"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/Routing/zipball/dc9df18a1cfe87de65e270e8f01407ca6d7c39cb",
- "reference": "dc9df18a1cfe87de65e270e8f01407ca6d7c39cb",
+ "url": "https://api.github.com/repos/symfony/Routing/zipball/6f0333fb8b89cf6f8fd9d6740c5e83b73d9c95b9",
+ "reference": "6f0333fb8b89cf6f8fd9d6740c5e83b73d9c95b9",
"shasum": ""
},
"require": {
- "php": ">=5.3.3"
+ "php": ">=5.3.9"
+ },
+ "conflict": {
+ "symfony/config": "<2.7"
},
"require-dev": {
"doctrine/annotations": "~1.0",
"doctrine/common": "~2.2",
"psr/log": "~1.0",
- "symfony/config": "~2.2",
+ "symfony/config": "~2.7",
"symfony/expression-language": "~2.4",
"symfony/http-foundation": "~2.3",
"symfony/phpunit-bridge": "~2.7",
@@ -4108,11 +4147,11 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.6-dev"
+ "dev-master": "2.7-dev"
}
},
"autoload": {
- "psr-0": {
+ "psr-4": {
"Symfony\\Component\\Routing\\": ""
}
},
@@ -4138,93 +4177,31 @@
"uri",
"url"
],
- "time": "2015-05-15 13:32:45"
- },
- {
- "name": "symfony/security-core",
- "version": "v2.6.9",
- "target-dir": "Symfony/Component/Security/Core",
- "source": {
- "type": "git",
- "url": "https://github.com/symfony/security-core.git",
- "reference": "1ad0ee4b2a1ab32924cd0be397f0196b5d47e5d0"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/symfony/security-core/zipball/1ad0ee4b2a1ab32924cd0be397f0196b5d47e5d0",
- "reference": "1ad0ee4b2a1ab32924cd0be397f0196b5d47e5d0",
- "shasum": ""
- },
- "require": {
- "php": ">=5.3.3"
- },
- "require-dev": {
- "ircmaxell/password-compat": "1.0.*",
- "psr/log": "~1.0",
- "symfony/event-dispatcher": "~2.1",
- "symfony/expression-language": "~2.6",
- "symfony/http-foundation": "~2.4",
- "symfony/phpunit-bridge": "~2.7",
- "symfony/translation": "~2.0,>=2.0.5",
- "symfony/validator": "~2.5,>=2.5.5"
- },
- "suggest": {
- "ircmaxell/password-compat": "For using the BCrypt password encoder in PHP <5.5",
- "symfony/event-dispatcher": "",
- "symfony/expression-language": "For using the expression voter",
- "symfony/http-foundation": "",
- "symfony/validator": "For using the user password constraint"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "2.6-dev"
- }
- },
- "autoload": {
- "psr-0": {
- "Symfony\\Component\\Security\\Core\\": ""
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Fabien Potencier",
- "email": "fabien@symfony.com"
- },
- {
- "name": "Symfony Community",
- "homepage": "https://symfony.com/contributors"
- }
- ],
- "description": "Symfony Security Component - Core Library",
- "homepage": "https://symfony.com",
- "time": "2015-05-15 13:53:19"
+ "time": "2015-05-19 06:58:17"
},
{
"name": "symfony/translation",
- "version": "v2.6.9",
- "target-dir": "Symfony/Component/Translation",
+ "version": "v2.7.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/Translation.git",
- "reference": "89cdf3c43bc24c85dd8173dfcf5a979a95e5bd9c"
+ "reference": "cc1907bbeacfcc703c031b67545400d6e7d1eb79"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/Translation/zipball/89cdf3c43bc24c85dd8173dfcf5a979a95e5bd9c",
- "reference": "89cdf3c43bc24c85dd8173dfcf5a979a95e5bd9c",
+ "url": "https://api.github.com/repos/symfony/Translation/zipball/cc1907bbeacfcc703c031b67545400d6e7d1eb79",
+ "reference": "cc1907bbeacfcc703c031b67545400d6e7d1eb79",
"shasum": ""
},
"require": {
- "php": ">=5.3.3"
+ "php": ">=5.3.9"
+ },
+ "conflict": {
+ "symfony/config": "<2.7"
},
"require-dev": {
"psr/log": "~1.0",
- "symfony/config": "~2.3,>=2.3.12",
+ "symfony/config": "~2.7",
"symfony/intl": "~2.3",
"symfony/phpunit-bridge": "~2.7",
"symfony/yaml": "~2.2"
@@ -4237,11 +4214,11 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.6-dev"
+ "dev-master": "2.7-dev"
}
},
"autoload": {
- "psr-0": {
+ "psr-4": {
"Symfony\\Component\\Translation\\": ""
}
},
@@ -4261,25 +4238,24 @@
],
"description": "Symfony Translation Component",
"homepage": "https://symfony.com",
- "time": "2015-05-29 14:42:58"
+ "time": "2015-05-29 14:44:44"
},
{
"name": "symfony/var-dumper",
- "version": "v2.6.9",
- "target-dir": "Symfony/Component/VarDumper",
+ "version": "v2.7.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/var-dumper.git",
- "reference": "89eec96645fb44af4a454a26c74c72ba6311f5bc"
+ "reference": "120b187ec46215f7a53a506e53aa91a81c82a082"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/var-dumper/zipball/89eec96645fb44af4a454a26c74c72ba6311f5bc",
- "reference": "89eec96645fb44af4a454a26c74c72ba6311f5bc",
+ "url": "https://api.github.com/repos/symfony/var-dumper/zipball/120b187ec46215f7a53a506e53aa91a81c82a082",
+ "reference": "120b187ec46215f7a53a506e53aa91a81c82a082",
"shasum": ""
},
"require": {
- "php": ">=5.3.3"
+ "php": ">=5.3.9"
},
"require-dev": {
"symfony/phpunit-bridge": "~2.7"
@@ -4290,14 +4266,14 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.6-dev"
+ "dev-master": "2.7-dev"
}
},
"autoload": {
"files": [
"Resources/functions/dump.php"
],
- "psr-0": {
+ "psr-4": {
"Symfony\\Component\\VarDumper\\": ""
}
},
@@ -4321,7 +4297,7 @@
"debug",
"dump"
],
- "time": "2015-05-01 14:14:24"
+ "time": "2015-05-02 15:21:08"
},
{
"name": "typicms/nestablecollection",
@@ -4419,20 +4395,20 @@
"packages-dev": [
{
"name": "barryvdh/laravel-debugbar",
- "version": "v2.0.3",
+ "version": "v2.0.4",
"source": {
"type": "git",
"url": "https://github.com/barryvdh/laravel-debugbar.git",
- "reference": "77be5170f3777e2e899ec98105ce5686cd4aa63b"
+ "reference": "3edaea0e8056edde00f7d0af13ed0d406412182d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/barryvdh/laravel-debugbar/zipball/77be5170f3777e2e899ec98105ce5686cd4aa63b",
- "reference": "77be5170f3777e2e899ec98105ce5686cd4aa63b",
+ "url": "https://api.github.com/repos/barryvdh/laravel-debugbar/zipball/3edaea0e8056edde00f7d0af13ed0d406412182d",
+ "reference": "3edaea0e8056edde00f7d0af13ed0d406412182d",
"shasum": ""
},
"require": {
- "illuminate/support": "5.0.x",
+ "illuminate/support": "~5.0.17|5.1.*",
"maximebf/debugbar": "~1.10.2",
"php": ">=5.4.0",
"symfony/finder": "~2.6"
@@ -4469,28 +4445,28 @@
"profiler",
"webprofiler"
],
- "time": "2015-03-07 15:15:23"
+ "time": "2015-06-07 07:19:29"
},
{
"name": "barryvdh/laravel-ide-helper",
- "version": "v2.0.3",
+ "version": "v2.0.4",
"source": {
"type": "git",
"url": "https://github.com/barryvdh/laravel-ide-helper.git",
- "reference": "d8d5517f2cc55d534a7fc8f50ff62cb55115e1aa"
+ "reference": "bb3bba2c5beb6c372dc3c144239ff20f48998bd6"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/barryvdh/laravel-ide-helper/zipball/d8d5517f2cc55d534a7fc8f50ff62cb55115e1aa",
- "reference": "d8d5517f2cc55d534a7fc8f50ff62cb55115e1aa",
+ "url": "https://api.github.com/repos/barryvdh/laravel-ide-helper/zipball/bb3bba2c5beb6c372dc3c144239ff20f48998bd6",
+ "reference": "bb3bba2c5beb6c372dc3c144239ff20f48998bd6",
"shasum": ""
},
"require": {
- "illuminate/console": "5.0.x",
- "illuminate/filesystem": "5.0.x",
- "illuminate/support": "5.0.x",
+ "illuminate/console": "5.0.x|5.1.x",
+ "illuminate/filesystem": "5.0.x|5.1.x",
+ "illuminate/support": "5.0.x|5.1.x",
"php": ">=5.4.0",
- "phpdocumentor/reflection-docblock": "2.0.x",
+ "phpdocumentor/reflection-docblock": "2.0.4",
"symfony/class-loader": "~2.3"
},
"require-dev": {
@@ -4532,7 +4508,7 @@
"phpstorm",
"sublime"
],
- "time": "2015-03-17 08:00:28"
+ "time": "2015-06-08 07:04:31"
},
{
"name": "behat/behat",
@@ -4884,16 +4860,16 @@
},
{
"name": "deployer/deployer",
- "version": "v3.0.4",
+ "version": "v3.0.5",
"source": {
"type": "git",
"url": "https://github.com/deployphp/deployer.git",
- "reference": "da7f8b9586aeed59c293fdd7fb432dad2496e64a"
+ "reference": "da62fc4c2247c30a71dfe900662787ada9856859"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/deployphp/deployer/zipball/da7f8b9586aeed59c293fdd7fb432dad2496e64a",
- "reference": "da7f8b9586aeed59c293fdd7fb432dad2496e64a",
+ "url": "https://api.github.com/repos/deployphp/deployer/zipball/da62fc4c2247c30a71dfe900662787ada9856859",
+ "reference": "da62fc4c2247c30a71dfe900662787ada9856859",
"shasum": ""
},
"require": {
@@ -4933,7 +4909,7 @@
}
],
"description": "Deployment Tool",
- "time": "2015-05-26 11:33:07"
+ "time": "2015-06-09 09:11:21"
},
{
"name": "deployphp/recipes",
@@ -5643,12 +5619,12 @@
"source": {
"type": "git",
"url": "https://github.com/phpseclib/phpseclib.git",
- "reference": "62fdd160e3ae2bb265a7e1f7c9426d552f55df47"
+ "reference": "8bb48f3adfde60c96f261cabeab4d6ace2a7bff8"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/62fdd160e3ae2bb265a7e1f7c9426d552f55df47",
- "reference": "62fdd160e3ae2bb265a7e1f7c9426d552f55df47",
+ "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/8bb48f3adfde60c96f261cabeab4d6ace2a7bff8",
+ "reference": "8bb48f3adfde60c96f261cabeab4d6ace2a7bff8",
"shasum": ""
},
"require": {
@@ -5720,7 +5696,7 @@
"x.509",
"x509"
],
- "time": "2015-05-07 13:22:25"
+ "time": "2015-06-09 15:19:26"
},
{
"name": "phpspec/php-diff",
@@ -5896,16 +5872,16 @@
},
{
"name": "phpunit/php-code-coverage",
- "version": "2.1.4",
+ "version": "2.1.5",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/php-code-coverage.git",
- "reference": "3703c4bb67c8700957dd41c843254658539d091d"
+ "reference": "be2286cb8c7e1773eded49d9719219e6f74f9e3e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/3703c4bb67c8700957dd41c843254658539d091d",
- "reference": "3703c4bb67c8700957dd41c843254658539d091d",
+ "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/be2286cb8c7e1773eded49d9719219e6f74f9e3e",
+ "reference": "be2286cb8c7e1773eded49d9719219e6f74f9e3e",
"shasum": ""
},
"require": {
@@ -5954,7 +5930,7 @@
"testing",
"xunit"
],
- "time": "2015-06-06 08:33:23"
+ "time": "2015-06-09 13:05:42"
},
{
"name": "phpunit/php-file-iterator",
@@ -7323,59 +7299,6 @@
"homepage": "https://symfony.com",
"time": "2015-05-15 13:33:16"
},
- {
- "name": "symfony/css-selector",
- "version": "v2.7.0",
- "source": {
- "type": "git",
- "url": "https://github.com/symfony/CssSelector.git",
- "reference": "0b5c07b516226b7dd32afbbc82fe547a469c5092"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/symfony/CssSelector/zipball/0b5c07b516226b7dd32afbbc82fe547a469c5092",
- "reference": "0b5c07b516226b7dd32afbbc82fe547a469c5092",
- "shasum": ""
- },
- "require": {
- "php": ">=5.3.9"
- },
- "require-dev": {
- "symfony/phpunit-bridge": "~2.7"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "2.7-dev"
- }
- },
- "autoload": {
- "psr-4": {
- "Symfony\\Component\\CssSelector\\": ""
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Jean-François Simon",
- "email": "jeanfrancois.simon@sensiolabs.com"
- },
- {
- "name": "Fabien Potencier",
- "email": "fabien@symfony.com"
- },
- {
- "name": "Symfony Community",
- "homepage": "https://symfony.com/contributors"
- }
- ],
- "description": "Symfony CssSelector Component",
- "homepage": "https://symfony.com",
- "time": "2015-05-15 13:33:16"
- },
{
"name": "symfony/dependency-injection",
"version": "v2.7.0",
@@ -7436,59 +7359,6 @@
"homepage": "https://symfony.com",
"time": "2015-05-29 14:44:44"
},
- {
- "name": "symfony/dom-crawler",
- "version": "v2.7.0",
- "source": {
- "type": "git",
- "url": "https://github.com/symfony/DomCrawler.git",
- "reference": "11d8eb8ccc1533f4c2d89a025f674894fda520b3"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/symfony/DomCrawler/zipball/11d8eb8ccc1533f4c2d89a025f674894fda520b3",
- "reference": "11d8eb8ccc1533f4c2d89a025f674894fda520b3",
- "shasum": ""
- },
- "require": {
- "php": ">=5.3.9"
- },
- "require-dev": {
- "symfony/css-selector": "~2.3",
- "symfony/phpunit-bridge": "~2.7"
- },
- "suggest": {
- "symfony/css-selector": ""
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "2.7-dev"
- }
- },
- "autoload": {
- "psr-4": {
- "Symfony\\Component\\DomCrawler\\": ""
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Fabien Potencier",
- "email": "fabien@symfony.com"
- },
- {
- "name": "Symfony Community",
- "homepage": "https://symfony.com/contributors"
- }
- ],
- "description": "Symfony DomCrawler Component",
- "homepage": "https://symfony.com",
- "time": "2015-05-22 14:54:25"
- },
{
"name": "symfony/expression-language",
"version": "v2.7.0",
@@ -7593,19 +7463,8 @@
"stability-flags": {
"pingpong/modules": 20,
"cartalyst/sentry": 20,
- "asgardcms/core-module": 20,
- "asgardcms/dashboard-module": 20,
- "asgardcms/user-module": 20,
- "asgardcms/setting-module": 20,
- "asgardcms/media-module": 20,
- "asgardcms/page-module": 20,
- "asgardcms/menu-module": 20,
- "asgardcms/workshop-module": 20,
- "asgardcms/flatly-theme": 20,
- "asgardcms/adminlte-theme": 20,
"kzykhys/git": 20,
"predis/predis": 20,
- "asgardcms/blog-module": 20,
"barryvdh/laravel-ide-helper": 20,
"behat/behat": 20,
"behat/mink": 20,
diff --git a/public/modules/Media/js/init-dropzone.js b/public/modules/Media/js/init-dropzone.js
index a215984..cf5e8a5 100644
--- a/public/modules/Media/js/init-dropzone.js
+++ b/public/modules/Media/js/init-dropzone.js
@@ -17,7 +17,7 @@ $( document ).ready(function() {
}
});
myDropzone.on("error", function(file, errorMessage) {
- var html = '' + errorMessage.error + '
';
+ var html = '' + errorMessage.file[0] + '
';
$('.col-md-12').first().prepend(html);
setTimeout(function() {
myDropzone.removeFile(file);
diff --git a/public/themes/adminlte/js/vendor/ckeditor/config.js b/public/themes/adminlte/js/vendor/ckeditor/config.js
index cd1e749..c5a9413 100644
--- a/public/themes/adminlte/js/vendor/ckeditor/config.js
+++ b/public/themes/adminlte/js/vendor/ckeditor/config.js
@@ -36,6 +36,5 @@ CKEDITOR.editorConfig = function( config ) {
// Make dialogs simpler.
config.removeDialogTabs = 'image:advanced;link:advanced';
- config.filebrowserBrowseUrl = '/backend/media/media-grid/ckIndex',
- config.filebrowserUploadUrl = '/backend/files/upload'
+ config.filebrowserBrowseUrl = '/backend/media/media-grid/ckIndex'
};