Fixed merge
Showing
| ... | @@ -63,13 +63,17 @@ | ... | @@ -63,13 +63,17 @@ |
| "irc": "irc://irc.freenode.net/yii", | "irc": "irc://irc.freenode.net/yii", | ||
| "source": "https://github.com/yiisoft/yii2" | "source": "https://github.com/yiisoft/yii2" | ||
| }, | }, | ||
| "config": { | |||
| "vendor-dir": "yii/vendor" | |||
| }, | |||
| "bin": [ | "bin": [ | ||
| "framework/yiic" | "yii/yiic" | ||
| ], | ], | ||
| "require": { | "require": { | ||
| "php": ">=5.3.0", | "php": ">=5.3.0", | ||
| "michelf/php-markdown": "1.3", | "michelf/php-markdown": "1.3", | ||
| "twig/twig": "1.12.*", | "twig/twig": "1.12.*", | ||
| "smarty/smarty": "3.1.*" | "smarty/smarty": "3.1.*", | ||
| "ezyang/htmlpurifier": "v4.5.0" | |||
| } | } | ||
| } | } |
composer.lock
0 → 100644
62.8 KB
File added
tests/unit/data/i18n/test.mo
0 → 100644
File added
tests/unit/data/i18n/test.po
0 → 100644
This diff is collapsed.
yii/assets/yii.captcha.js
0 → 100644
yii/assets/yii.debug.js
0 → 100644
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
This diff is collapsed.
File moved
File moved
File moved
This diff is collapsed.
File moved
This diff is collapsed.
File moved
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
File moved
File moved
This diff is collapsed.
yii/debug/Module.php
0 → 100644
This diff is collapsed.
yii/debug/Toolbar.php
0 → 100644
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
yii/helpers/Markdown.php
0 → 100644
This diff is collapsed.
yii/helpers/Purifier.php
0 → 100644
This diff is collapsed.
File moved
This diff is collapsed.
This diff is collapsed.
File moved
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
File moved
This diff is collapsed.
File moved
File moved
yii/i18n/GettextFile.php
0 → 100644
This diff is collapsed.
This diff is collapsed.
yii/i18n/GettextMoFile.php
0 → 100644
This diff is collapsed.
yii/i18n/GettextPoFile.php
0 → 100644
This diff is collapsed.
This diff is collapsed.
File moved
This diff is collapsed.
This diff is collapsed.
yii/rbac/Assignment.php
0 → 100644
This diff is collapsed.
yii/rbac/DbManager.php
0 → 100644
This diff is collapsed.
yii/rbac/Item.php
0 → 100644
This diff is collapsed.
yii/rbac/Manager.php
0 → 100644
This diff is collapsed.
yii/rbac/PhpManager.php
0 → 100644
This diff is collapsed.
yii/rbac/schema-mssql.sql
0 → 100644
This diff is collapsed.
yii/rbac/schema-mysql.sql
0 → 100644
This diff is collapsed.
yii/rbac/schema-oci.sql
0 → 100644
This diff is collapsed.
yii/rbac/schema-pgsql.sql
0 → 100644
This diff is collapsed.
yii/rbac/schema-sqlite.sql
0 → 100644
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
File moved
This diff is collapsed.
File moved
File moved
File moved
File moved
File moved
This diff is collapsed.
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
yii/web/CaptchaAction.php
0 → 100644
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
yii/web/SpicyRice.md
0 → 100644
This diff is collapsed.
yii/web/SpicyRice.ttf
0 → 100644
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
yii/widgets/Captcha.php
0 → 100644
This diff is collapsed.
File moved
This diff is collapsed.
yii/widgets/LinkPager.php
0 → 100644
This diff is collapsed.
yii/widgets/ListPager.php
0 → 100644
This diff is collapsed.
This diff is collapsed.
File moved
This diff is collapsed.