Commit 35c4a619 by Alexander Makarov

Merge branch 'master' into codeception-test-adjustments

parents 3913d64d c0e91e25
...@@ -8,7 +8,7 @@ like the following: ...@@ -8,7 +8,7 @@ like the following:
```php ```php
<?php <?php
use yii\bootstrap\DatePicker; use yii\jui\DatePicker;
?> ?>
<?= DatePicker::widget(['name' => 'date']) ?> <?= DatePicker::widget(['name' => 'date']) ?>
``` ```
...@@ -28,7 +28,7 @@ widget which is configured to use Russian language and keep the input in the `fr ...@@ -28,7 +28,7 @@ widget which is configured to use Russian language and keep the input in the `fr
```php ```php
<?php <?php
use yii\bootstrap\DatePicker; use yii\jui\DatePicker;
?> ?>
<?= DatePicker::widget([ <?= DatePicker::widget([
'model' => $model, 'model' => $model,
......
{
"name": "yii2-debug",
"version": "2.0.0",
"homepage": "http://www.yiiframework.com/",
"authors": [
"Qiang Xue <qiang.xue@gmail.com>"
],
"description": "The debugger extension for the Yii framework",
"keywords": [
"yii2",
"debug",
"debugger"
],
"license": "BSD-3-Clause",
"main": [
"assets/toolbar.js"
],
"ignore": [
"**/.*",
"**/*",
"!assets/"
],
"dependencies": {
"yii2": ">=2.0.0",
"bootstrap": ">=3.0.0"
}
}
...@@ -22,6 +22,8 @@ ...@@ -22,6 +22,8 @@
"yiisoft/yii2-bootstrap": "*" "yiisoft/yii2-bootstrap": "*"
}, },
"autoload": { "autoload": {
"psr-4": { "yii\\debug\\": "" } "psr-4": {
"yii\\debug\\": ""
}
} }
} }
{
"name": "yii2-gii",
"version": "2.0.0",
"homepage": "http://www.yiiframework.com/",
"authors": [
"Qiang Xue <qiang.xue@gmail.com>"
],
"description": "The Gii extension for the Yii framework",
"keywords": [
"yii2",
"gii",
"code generator"
],
"license": "BSD-3-Clause",
"main": [
"assets/gii.js"
],
"ignore": [
"**/.*",
"**/*",
"!assets/"
],
"dependencies": {
"yii2": ">=2.0.0",
"bootstrap": ">=3.0.0",
"typeahead.js": ">=0.10.0"
}
}
...@@ -23,6 +23,8 @@ ...@@ -23,6 +23,8 @@
"phpspec/php-diff": ">=1.0.2" "phpspec/php-diff": ">=1.0.2"
}, },
"autoload": { "autoload": {
"psr-4": { "yii\\gii\\": "" } "psr-4": {
"yii\\gii\\": ""
}
} }
} }
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