diff --git a/composer.json b/composer.json index 8d52e5295da..f155ee58fc8 100644 --- a/composer.json +++ b/composer.json @@ -68,7 +68,7 @@ "yiisoft/yii2-composer": "~2.0.4", "ezyang/htmlpurifier": "~4.6", "cebe/markdown": "~1.0.0 | ~1.1.0", - "bower-asset/jquery": "2.2.*@stable | 2.1.*@stable | 1.11.*@stable", + "bower-asset/jquery": "2.2.*@stable | 2.1.*@stable | 1.11.*@stable | 1.12.*@stable", "bower-asset/jquery.inputmask": "~3.2.2", "bower-asset/punycode": "1.3.*", "bower-asset/yii2-pjax": "~2.0.1" diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md index 95df5682c10..9993695c481 100644 --- a/framework/CHANGELOG.md +++ b/framework/CHANGELOG.md @@ -57,6 +57,7 @@ Yii Framework 2 Change Log - Enh #11212: Added headers to PO file in `yii\i18n\GettextPoFile::save()` (stevekr) - Bug #6347: `inverseOf()` not working for dynamic relational queries (laszlovl) - Bug #10613: Fixed PostgreSQL Schema to return correct column names for unique indexes that have mixed case column names (cebe) +- Chg #11364: Updated jQuery dependency to include versions `1.12.*` (cebe) 2.0.8 April 28, 2016 diff --git a/framework/composer.json b/framework/composer.json index e4ada6dc759..4ca2f0fda79 100644 --- a/framework/composer.json +++ b/framework/composer.json @@ -64,7 +64,7 @@ "yiisoft/yii2-composer": "~2.0.4", "ezyang/htmlpurifier": "~4.6", "cebe/markdown": "~1.0.0 | ~1.1.0", - "bower-asset/jquery": "2.2.*@stable | 2.1.*@stable | 1.11.*@stable", + "bower-asset/jquery": "2.2.*@stable | 2.1.*@stable | 1.11.*@stable | 1.12.*@stable", "bower-asset/jquery.inputmask": "~3.2.2", "bower-asset/punycode": "1.3.*", "bower-asset/yii2-pjax": "~2.0.1"