chenx221/yii2-netdisk
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Merge branch 'master' into new-asset

Browse Source 
Conflicts:
	apps/basic/composer.json
	composer.json
This commit is contained in:
Qiang Xue 2014-09-16 20:03:53 -04:00
commit 1b58a71ef9
3 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
composer.json
View File

@ -25,26 +25,27 @@
"yiisoft/yii2-gii": "*", "yiisoft/yii2-gii": "*",
"yiisoft/yii2-faker": "*" "yiisoft/yii2-faker": "*"
}, },
"scripts": {
"post-create-project-cmd": [
"yii\\composer\\Installer::setPermission",
"yii\\composer\\Installer::generateCookieValidationKey"
]
},
"config": { "config": {
"process-timeout": 1800 "process-timeout": 1800
}, },
"scripts": {
"post-create-project-cmd": [
"yii\\composer\\Installer::postCreateProject"
]
},
"extra": { "extra": {
"writable": [ "yii\\composer\\Installer::postCreateProject": {
"runtime", "setPermission": [
"web/assets" {
], "runtime": "0777",
"executable": [ "web/assets": "0777",
"yii" "yii": "0755"
], }
"config": [ ],
"config/web.php" "generateCookieValidationKey": [
], "config/web.php"
]
},
"asset-installer-paths": { "asset-installer-paths": {
"npm-asset-library": "vendor/npm", "npm-asset-library": "vendor/npm",
"bower-asset-library": "vendor/bower" "bower-asset-library": "vendor/bower"

5
config/console.php
View File

@ -8,8 +8,11 @@ $db = require(__DIR__ . '/db.php');
return [ return [
'id' => 'basic-console', 'id' => 'basic-console',
'basePath' => dirname(__DIR__), 'basePath' => dirname(__DIR__),
'bootstrap' => ['log'], 'bootstrap' => ['log', 'gii'],
'controllerNamespace' => 'app\commands', 'controllerNamespace' => 'app\commands',
'modules' => [
'gii' => 'yii\gii\Module',
],
'components' => [ 'components' => [
'cache' => [ 'cache' => [
'class' => 'yii\caching\FileCache', 'class' => 'yii\caching\FileCache',

6
config/web.php
View File

@ -9,7 +9,7 @@ $config = [
'components' => [ 'components' => [
'request' => [ 'request' => [
// !!! insert a secret key in the following (if it is empty) - this is required by cookie validation // !!! insert a secret key in the following (if it is empty) - this is required by cookie validation
'cookieValidationKey' => 'thisIsAKey', 'cookieValidationKey' => '',
], ],
'cache' => [ 'cache' => [
'class' => 'yii\caching\FileCache', 'class' => 'yii\caching\FileCache',
@ -38,10 +38,6 @@ $config = [
], ],
], ],
'db' => require(__DIR__ . '/db.php'), 'db' => require(__DIR__ . '/db.php'),
'urlManager' => [
'enablePrettyUrl' => true,
'showScriptName' => false,
],
], ],
'params' => $params, 'params' => $params,
]; ];