4 Commits

Author	SHA1	Message	Date
Carsten Brandt	133e5c6e35	Merge branch 'master' into redis ... * master: (806 commits) avoid confusing docs about autoload return value doc fix. Fixed doc. Fixed autoloader behavior according to leading \ Fix in RequestPanel changed to trace from info. Removed yii\debug\Module::enabled. minor enhancement of debugger. Refactored the basic app. Added ErrorAction. Use `hasAttribute()` instead to avoid code duplication refactored NavBar and basic app navbar. test break fix. test break fix. Fixed test breaks. #735: removed hiddenInput to avoid confusion. ResizableAsset typo fix! Update radio and checkbox due to e3801fbf6b css fix. Fixed the basic app template. ... Conflicts: .travis.yml tests/unit/data/config.php	2013-08-12 00:45:37 +02:00
Qiang Xue	03e07f4340	cleaned up "use" statements.	2013-06-14 22:42:55 -04:00
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	2013-05-22 12:49:31 +02:00
Qiang Xue	f72105166c	reorganized the main repo to satisfy PSR-0.	2013-05-21 21:19:05 -04:00