From 56c361bb9e75b27d5cf1053e3742d6e780ba5820 Mon Sep 17 00:00:00 2001 From: Qiang Xue Date: Mon, 23 Dec 2013 14:55:41 -0500 Subject: [PATCH] Fixed changelog. --- extensions/yii/bootstrap/CHANGELOG.md | 2 +- framework/CHANGELOG.md | 1 + framework/yii/db/ActiveQuery.php | 5 ----- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/extensions/yii/bootstrap/CHANGELOG.md b/extensions/yii/bootstrap/CHANGELOG.md index 3cd4aff..d6fbee3 100644 --- a/extensions/yii/bootstrap/CHANGELOG.md +++ b/extensions/yii/bootstrap/CHANGELOG.md @@ -6,8 +6,8 @@ Yii Framework 2 bootstrap extension Change Log - Enh #1474: Added option to make NavBar 100% width (cebe) - Enh #1553: Only add navbar-default class to NavBar when no other class is specified (cebe) +- Enh #1601: Added support for tagName and encodeLabel parameters in ButtonDropdown (omnilight) - Bug #1459: Update Collapse to use bootstrap 3 classes (tonydspaniard) -- Enh: Added support for tagName and encodeLabel parameters in ButtonDropdown (omnilight) 2.0.0 alpha, December 1, 2013 ----------------------------- diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md index 41d8f75..dd9d168 100644 --- a/framework/CHANGELOG.md +++ b/framework/CHANGELOG.md @@ -26,6 +26,7 @@ Yii Framework 2 Change Log - Enh #1552: It is now possible to use multiple bootstrap NavBar in a single page (Alex-Code) - Enh #1572: Added `yii\web\Controller::createAbsoluteUrl()` (samdark) - Enh #1579: throw exception when the given AR relation name does not match in a case sensitive manner (qiangxue) +- Enh #1601: Added support for tagName and encodeLabel parameters in ButtonDropdown (omnilight) - Enh: Added `favicon.ico` and `robots.txt` to defauly application templates (samdark) - Enh: Added `Widget::autoIdPrefix` to support prefixing automatically generated widget IDs (qiangxue) - Enh: Support for file aliases in console command 'message' (omnilight) diff --git a/framework/yii/db/ActiveQuery.php b/framework/yii/db/ActiveQuery.php index e0e14cf..e93e9be 100644 --- a/framework/yii/db/ActiveQuery.php +++ b/framework/yii/db/ActiveQuery.php @@ -143,9 +143,4 @@ class ActiveQuery extends Query implements ActiveQueryInterface } return $db->createCommand($sql, $params); } - - public function joinWith($name) - { - - } }