Skip to content

Commit

Permalink
Update to stable asgardcms and laravel 5.1
Browse files Browse the repository at this point in the history
  • Loading branch information
nWidart committed Jun 10, 2015
1 parent 7213ba9 commit 6b8e159
Show file tree
Hide file tree
Showing 6 changed files with 423 additions and 563 deletions.
2 changes: 1 addition & 1 deletion bootstrap/autoload.php
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
|
*/

$compiledPath = __DIR__.'/../vendor/compiled.php';
$compiledPath = __DIR__.'/cache/compiled.php';

if (file_exists($compiledPath))
{
Expand Down
2 changes: 2 additions & 0 deletions bootstrap/cache/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
*
!.gitignore
26 changes: 13 additions & 13 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand Down
Loading

0 comments on commit 6b8e159

Please sign in to comment.