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

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

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

..

yii.activeForm.js

Fixes #5049: ActiveForm::validationDelay should be applied to user types only

2014-09-16 14:40:00 -04:00

yii.captcha.js

Tab to spaces conversion.

2014-03-16 20:05:54 -04:00

yii.gridView.js

Tab to spaces conversion.

2014-03-16 20:05:54 -04:00

yii.js

Fixes #5050.

2014-09-16 14:15:32 -04:00

yii.validation.js

Fixes #3581: Added yii\validators\CompareValidator::type to support type conversion before comparing values

2014-09-16 11:41:54 -04:00