Updating dependencies

parent 4a630f54
...@@ -22,11 +22,11 @@ ...@@ -22,11 +22,11 @@
"require": { "require": {
"php": ">=7.0.0", "php": ">=7.0.0",
"composer/installers": "~1.0", "composer/installers": "~1.0",
"nwidart/laravel-modules": "~2.0", "nwidart/laravel-modules": "~3.0",
"laravelcollective/html": "~5.5.0", "laravelcollective/html": "~5.6.0",
"laracasts/presenter": "~0.2", "laracasts/presenter": "~0.2",
"dimsav/laravel-translatable": "~8.0", "dimsav/laravel-translatable": "~9.0",
"mcamara/laravel-localization": "~1.1", "mcamara/laravel-localization": "~1.3",
"floatingpoint/stylist": "~0.5", "floatingpoint/stylist": "~0.5",
"maatwebsite/laravel-sidebar": "~2.1", "maatwebsite/laravel-sidebar": "~2.1",
"yajra/laravel-datatables-oracle": "~8.0", "yajra/laravel-datatables-oracle": "~8.0",
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
"php": ">=7.0.0", "php": ">=7.0.0",
"composer/installers": "~1.0", "composer/installers": "~1.0",
"nwidart/laravel-menus": "~2.0", "nwidart/laravel-menus": "~2.0",
"typicms/nestablecollection": "1.1" "typicms/nestablecollection": "1.1.10"
}, },
"require-dev": { "require-dev": {
"phpunit/phpunit": "~7.0", "phpunit/phpunit": "~7.0",
......
...@@ -36,7 +36,6 @@ ...@@ -36,7 +36,6 @@
}, },
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "1.0.x-dev",
"dev-master": "3.0.x-dev" "dev-master": "3.0.x-dev"
} }
}, },
......
...@@ -12,33 +12,33 @@ ...@@ -12,33 +12,33 @@
"type": "project", "type": "project",
"require": { "require": {
"php": ">=7.0.0", "php": ">=7.0.0",
"fideloper/proxy": "~3.3", "fideloper/proxy": "~4.0",
"laravel/framework": "5.5.*", "laravel/framework": "5.6.*",
"laravel/tinker": "~1.0", "laravel/tinker": "~1.0",
"nwidart/laravel-modules": "~2.0", "nwidart/laravel-modules": "~3.0",
"cartalyst/sentinel": "~2.0", "cartalyst/sentinel": "~2.0",
"idavoll/core-module": "~3.0", "idavoll/core-module": "3.0.x-dev",
"idavoll/dashboard-module": "~3.0", "idavoll/dashboard-module": "3.0.x-dev",
"idavoll/user-module": "~3.0", "idavoll/user-module": "3.0.x-dev",
"idavoll/setting-module": "~3.0", "idavoll/setting-module": "3.0.x-dev",
"idavoll/media-module": "~3.0", "idavoll/media-module": "3.0.x-dev",
"idavoll/page-module": "~3.0", "idavoll/page-module": "3.0.x-dev",
"idavoll/menu-module": "~3.0", "idavoll/menu-module": "3.0.x-dev",
"idavoll/workshop-module": "~3.0", "idavoll/workshop-module": "3.0.x-dev",
"idavoll/translation-module": "~3.0", "idavoll/translation-module": "3.0.x-dev",
"idavoll/tag-module": "~3.0", "idavoll/tag-module": "3.0.x-dev",
"idavoll/flatly-theme": "~3.0", "idavoll/flatly-theme": "3.0.x-dev",
"idavoll/adminlte-theme": "~3.0" "idavoll/adminlte-theme": "3.0.x-dev"
}, },
"require-dev": { "require-dev": {
"fzaninotto/faker": "~1.4", "fzaninotto/faker": "~1.4",
"mockery/mockery": "0.9.*", "mockery/mockery": "0.9.*",
"phpunit/phpunit": "~6.0", "phpunit/phpunit": "~7.0",
"filp/whoops": "~2.0", "filp/whoops": "~2.0",
"symfony/css-selector": "3.1.*", "symfony/css-selector": "3.1.*",
"symfony/dom-crawler": "3.1.*", "symfony/dom-crawler": "3.1.*",
"barryvdh/laravel-debugbar": "~3.0", "barryvdh/laravel-debugbar": "~3.1",
"orchestra/testbench": "^3.5", "orchestra/testbench": "3.6.*",
"league/flysystem-aws-s3-v3": "^1.0", "league/flysystem-aws-s3-v3": "^1.0",
"league/commonmark": "^0.15.4", "league/commonmark": "^0.15.4",
"predis/predis": "^1.1" "predis/predis": "^1.1"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment