Merge branch 'master' into redis
* master: (179 commits)
Fixes #312. Additional docs on IDN in EmailValidator and UrlValidator.
bug fix.
Added composer extension.
Added psr-0.
Fixed breaking test.
Fixed iii include path.
reorganized the main repo to satisfy PSR-0.
Fixed bootstrap asset registration issue.
Widget::$transition removed, bundles depency fixed
'yii/bootstrap/popover' bundle depency optimization
Bundle names fixes, base widget fixes, other widgets fixes
Fixed join query for AR.
Responsive bundle depency fix
Bundle names and depency fixes
YiiBase move all after class definition
YiiBase
Reloaded
Additional bootstrap packages
New approach
minor refactoring.
...
Conflicts:
tests/unit/framework/caching/ApcCacheTest.php
tests/unit/framework/caching/CacheTest.php
Showing
apps/bootstrap/LICENSE.md
0 → 100644
apps/bootstrap/README.md
0 → 100644
apps/bootstrap/commands/HelloController.php
0 → 100644
apps/bootstrap/composer.json
0 → 100644
apps/bootstrap/config/console.php
0 → 100644
apps/bootstrap/config/params.php
0 → 100644
apps/bootstrap/js/bootstrap.js
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
apps/bootstrap/js/bootstrap.min.js
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
apps/bootstrap/requirements.php
0 → 100644
apps/bootstrap/www/assets/.gitignore
0 → 100644
composer.lock
deleted
100644 → 0
extensions/composer/composer.json
0 → 100644
File moved
framework/LICENSE.md
0 → 100644
framework/README.md
0 → 100644
framework/UPGRADE.md
0 → 100644
... | ... | @@ -63,17 +63,18 @@ |
"irc": "irc://irc.freenode.net/yii", | ||
"source": "https://github.com/yiisoft/yii2" | ||
}, | ||
"config": { | ||
"vendor-dir": "yii/vendor" | ||
}, | ||
"bin": [ | ||
"yii/yiic" | ||
], | ||
"require": { | ||
"php": ">=5.3.0", | ||
"michelf/php-markdown": "1.3", | ||
"twig/twig": "1.12.*", | ||
"smarty/smarty": "3.1.*", | ||
"ezyang/htmlpurifier": "v4.5.0" | ||
"php": ">=5.3.11", | ||
"ext-mbstring": "*", | ||
"lib-pcre": "*" | ||
}, | ||
"autoload": { | ||
"psr-0": { "yii\\": "/" } | ||
}, | ||
"suggest": { | ||
"michelf/php-markdown": "Required for Markdown helper.", | ||
"twig/twig": "Required for TwigViewRenderer.", | ||
"smarty/smarty": "Required for SmartyViewRenderer.", | ||
"ezyang/htmlpurifier": "Required for Purifier helper." | ||
} | ||
} |
framework/yii/.gitignore
0 → 100644
File moved
framework/yii/assets/jquery.js
0 → 100644
This source diff could not be displayed because it is too large.
You can
view the blob
instead.
This diff is collapsed.
Click to expand it.
framework/yii/assets/punycode/punycode.js
0 → 100644
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
framework/yii/behaviors/AutoTimestamp.php
0 → 100644
framework/yii/bootstrap/Alert.php
0 → 100644
framework/yii/bootstrap/Modal.php
0 → 100644
framework/yii/bootstrap/TypeAhead.php
0 → 100644
framework/yii/bootstrap/Widget.php
0 → 100644
This diff is collapsed.
Click to expand it.
framework/yii/bootstrap/assets.php
0 → 100644
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This source diff could not be displayed because it is too large.
You can
view the blob
instead.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
File moved
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
framework/yii/console/runtime/.gitignore
0 → 100644
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
framework/yii/logging/DebugTarget.php
0 → 100644
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
framework/yii/rbac/Assignment.php
0 → 100644
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
framework/yii/requirements/requirements.php
0 → 100644
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
framework/yii/requirements/views/web/css.php
0 → 100644
This source diff could not be displayed because it is too large.
You can
view the blob
instead.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
File moved
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
framework/yii/widgets/Captcha.php
0 → 100644
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
framework/yii/widgets/ListPager.php
0 → 100644
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
yii/yiic.php
→
framework/yii/yii
100644 → 100755
This diff is collapsed.
Click to expand it.
framework/yii/yii.bat
0 → 100644
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
tests/unit/framework/web/ResponseTest.php
0 → 100644
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
upgrade.md
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
yii/.htaccess
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
yii/base/Dictionary.php
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
yii/base/DictionaryIterator.php
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
yii/base/Vector.php
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
yii/base/VectorIterator.php
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
yii/logging/WebTarget.php
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
yii/rbac/Assignment.php
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
yii/widgets/Captcha.php
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
yii/widgets/ListPager.php
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
Please
register
or
sign in
to comment