You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
Carsten Brandt
144e73b48a
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
|
12 years ago |
.. |
unit
|
Merge branch 'master' into redis
|
12 years ago |
web/app
|
Fixed iii include path.
|
12 years ago |