octicon-mirror(24/)
php/yii2
octicon-rss(16/)
1
0
octicon-repo-forked(16/)Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-11-10 02:13:17 +08:00
octicon-code(16/) Code octicon-issue-opened(16/) Issues octicon-package(16/) Packages octicon-project(16/) Projects octicon-tag(16/) Releases octicon-book(16/) Wiki octicon-pulse(16/) Activity

Merge branch 'master' into codeception-test-adjustments

Browse Source
This commit is contained in:
octicon-git-branch(16/)
octicon-tag(16/)
Alexander Makarov
2014-08-16 19:21:13 +04:00
gitea-unlock(16/)
parent 3913d64d90 c0e91e2505
commit 35c4a61908
octicon-diff(16/tw-mr-1) 5 changed files with 112 additions and 53 deletions
gitea-whitespace(16/)
gitea-join(16/)
octicon-kebab-horizontal(16/)
Download Patch File Download Diff File Expand all files Collapse all files

4
docs/guide/structure-widgets.md
View File

@@ -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
```php ```php
<?php <?php
use yii\bootstrap\DatePicker; use yii\jui\DatePicker;
?> ?>
<?= DatePicker::widget([ <?= DatePicker::widget([
'model' => $model, 'model' => $model,

27
extensions/debug/bower.json Normal file
View File

@@ -0,0 +1,27 @@
{
"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"
}
}

52
extensions/debug/composer.json
View File

@@ -1,27 +1,29 @@
{ {
"name": "yiisoft/yii2-debug", "name": "yiisoft/yii2-debug",
"description": "The debugger extension for the Yii framework", "description": "The debugger extension for the Yii framework",
"keywords": ["yii2", "debug", "debugger"], "keywords": ["yii2", "debug", "debugger"],
"type": "yii2-extension", "type": "yii2-extension",
"license": "BSD-3-Clause", "license": "BSD-3-Clause",
"support": { "support": {
"issues": "https://github.com/yiisoft/yii2/issues?labels=ext%3Adebug", "issues": "https://github.com/yiisoft/yii2/issues?labels=ext%3Adebug",
"forum": "http://www.yiiframework.com/forum/", "forum": "http://www.yiiframework.com/forum/",
"wiki": "http://www.yiiframework.com/wiki/", "wiki": "http://www.yiiframework.com/wiki/",
"irc": "irc://irc.freenode.net/yii", "irc": "irc://irc.freenode.net/yii",
"source": "https://github.com/yiisoft/yii2" "source": "https://github.com/yiisoft/yii2"
}, },
"authors": [ "authors": [
{ {
"name": "Qiang Xue", "name": "Qiang Xue",
"email": "qiang.xue@gmail.com" "email": "qiang.xue@gmail.com"
} }
], ],
"require": { "require": {
"yiisoft/yii2": "*", "yiisoft/yii2": "*",
"yiisoft/yii2-bootstrap": "*" "yiisoft/yii2-bootstrap": "*"
}, },
"autoload": { "autoload": {
"psr-4": { "yii\\debug\\": "" } "psr-4": {
} "yii\\debug\\": ""
}
}
} }

28
extensions/gii/bower.json Normal file
View File

@@ -0,0 +1,28 @@
{
"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"
}
}

54
extensions/gii/composer.json
View File

@@ -1,28 +1,30 @@
{ {
"name": "yiisoft/yii2-gii", "name": "yiisoft/yii2-gii",
"description": "The Gii extension for the Yii framework", "description": "The Gii extension for the Yii framework",
"keywords": ["yii2", "gii", "code generator"], "keywords": ["yii2", "gii", "code generator"],
"type": "yii2-extension", "type": "yii2-extension",
"license": "BSD-3-Clause", "license": "BSD-3-Clause",
"support": { "support": {
"issues": "https://github.com/yiisoft/yii2/issues?labels=ext%3Agii", "issues": "https://github.com/yiisoft/yii2/issues?labels=ext%3Agii",
"forum": "http://www.yiiframework.com/forum/", "forum": "http://www.yiiframework.com/forum/",
"wiki": "http://www.yiiframework.com/wiki/", "wiki": "http://www.yiiframework.com/wiki/",
"irc": "irc://irc.freenode.net/yii", "irc": "irc://irc.freenode.net/yii",
"source": "https://github.com/yiisoft/yii2" "source": "https://github.com/yiisoft/yii2"
}, },
"authors": [ "authors": [
{ {
"name": "Qiang Xue", "name": "Qiang Xue",
"email": "qiang.xue@gmail.com" "email": "qiang.xue@gmail.com"
} }
], ],
"require": { "require": {
"yiisoft/yii2": "*", "yiisoft/yii2": "*",
"yiisoft/yii2-bootstrap": "*", "yiisoft/yii2-bootstrap": "*",
"phpspec/php-diff": ">=1.0.2" "phpspec/php-diff": ">=1.0.2"
}, },
"autoload": { "autoload": {
"psr-4": { "yii\\gii\\": "" } "psr-4": {
} "yii\\gii\\": ""
}
}
} }