* '1849-additions' of https://github.com/resurtm/yii:
Additions to #1849.
removed unnecessary spaces
replaced spaces to tabs
fix changelog
fix changelog
#1515 Use index support in relations
The message in line 1520 is different from the ones in lines 542 and 1034, only differ in punctuation and case. Changed 1520 to match 542 and 1034. Message from 1520 should disappear in next "build message" command run.
* '662-lazy-load-through-relation' of https://github.com/klimov-paul/yii:
Issue #662 has been added to CHANGELOG.
"CActiveFinder::applyLazyCondition()" has been updated to use last relation in the join chain, while composing where condition.
Test case for issue #662 has been improved.
Test case "CActiveRecordTest::testHasOneThroughLazy()" has been added to expose issue #662
Conflicts:
tests/framework/db/ar/CActiveRecordTest.php
* '139-has-many-through-with-condition' of https://github.com/klimov-paul/yii:
Test relation condition for "CActiveRecordTest::testLazyLoadThroughRelationWithCondition()" has been adjusted to be type aware.
"CJoinElement::applyLazyCondition()" and "CActiveRecordTest" have been updated to match PHP 5.2.
Issue #139 has been added to CHANGELOG.
"CJoinElement::applyLazyCondition()" has been updated allowing to respect relation condition and params.
Test case "CActiveRecordTest::testLazyLoadThroughRelationWithCondition()" has been improved to cover relation params as well.
Test case "CActiveRecordTest::testLazyLoadThroughRelationWithCondition()" has been created to expose issue #139
Conflicts:
tests/framework/db/ar/CActiveRecordTest.php
* 'master' of https://github.com/yiisoft/yii: (144 commits)
Fixes#1567 Added filterSelector to CGridView
Renamed the CONTRIBUTING file to CONTRIBUTING.md so that GitHub effectively uses the Markdown syntax already present in the file when presenting it.
Fixes#1694 - doc fix
Added issue number
fixed whitespace issues introduced with #851
Updated CHANGELOG
Fixes#1584 same fix for CListView as already done for CGridView
Fixes#1344 same fix for CListView as already done in CGridView
Fixes#1104 same fix for CListView as already done for CGridView
Fixes#1676 - proper grouping when no group field is specified
Added addPrimaryKey and dropPrimaryKey commands to CDbMigration class in response to enh req #848
[messages/ja] yii.php updated
csfix - thx @resurtm
typo in changelog
Reverted PR #1467 (Issue #1465, fixes related issue #1661)
Reverted PR #1662
Better naming
small update to documentation of filterAjaxOnly()
Coding style fix
Fixing bug #1661
...
Conflicts:
CHANGELOG
select is different in stat relation context and can not be an array as
it specifies the statistical value to select.
So we have to ignore select that might have been defined by
defaultScope, scope or beforeFind criteria modification.
* master: (180 commits)
Updated changelog with last-modified date change.
Changed the CHttpCacheFilter to use RFC 1123 complaint dates when returning the last-modified header.
tabs...
gii: better default validation "length" rule for fixed-point / floating-point field type (MYSQL)
fixes#1319
updated comment in CHttpSession
Update framework/YiiBase.php
Update docs/guide/database.arr.txt
New unit test for enhanced $gCProbability s/getters in CHttpSession #486. Fixed those methods to process corner cases properly. Initial $gCProbability is now double(1.0), was > 1.0 before.
Bug #112: MSSQL: database abstraction layer now uses native transaction support of the SQLSRV driver.
Forgot about spaces in comments creating procedure call. [ci skip]
Better comments testing method name.
Forgot about local MSSQL database settings.
MSSQL unit testing SQL file reformatted and decorated. MSSQL testing class improved. Added unit tests for column comments retrieving.
Removed old message.
Update docs/guide/topics.i18n.txt
Update docs/guide/topics.i18n.txt
Requirements checker: russian (ru_RU) messages.
Minor fixes and refinements to the MSSQL unit tests.
better fix for issues #124
...
Conflicts:
UPGRADE
