Qiang Xue 074c1f6c53 Merge branch 'master' into new-asset ...

Conflicts:
	apps/basic/composer.json
	composer.json

2014-09-16 20:03:53 -04:00

..

assets

Reformat code te be PSR-2 compatible

2014-03-16 10:46:21 +06:00

config

aliases.php renamed to bootstrap.php (introduced to specific applications too)

2014-09-12 11:29:48 +04:00

controllers

Fixes #3179: removed duplicate validation rules from User model in advanced app, removed User::create()

2014-04-30 02:16:28 +04:00

models

Fixes #4071: mail component renamed to mailer, yii\log\EmailTarget::$mail renamed to yii\log\EmailTarget::$mailer

2014-06-26 18:28:28 +04:00

runtime

Advanced application template

2013-05-24 21:47:27 +04:00

views

Fixes #3793: Changed inline autocomplete hints style to get more IDEs support

2014-06-20 17:40:00 +04:00

web

new asset WIP: renabled asset publishing

2014-09-02 14:51:44 -04:00

widgets

Fixes #3979: Alert widget in advanced app is now able to display multiple flash messages of the same type

2014-06-20 14:43:36 +04:00