* master: (789 commits)
'summaryTagName' and 'emptyCssClass' options added to CBaseListView
Missing entries added to CHANGELOG
'cli' mode detection at 'CConsoleApplication' fixed
Eager loading note added to 'Relational Query Options' docs
Fix CSysLogRoute.php file comment
Fixes#3324: add syslog support
CDbConnection ODBC related fixes before merging
Add ODBC to the requirements checker
Fix#132: CDbConnection now supports ODBC
Better fix for <script async="false"
Fixed#3258Fixed#3283
Remove async from list of Special Attributes so that it is possible to use async=false per issue: #3314
typo fix in guide
COciSchema: read column comments from another schema
Update yii.php
Add changes #3298 to CHANGELOG
Added check for the existence of a link href attribute pager
Added check for the existence of a link href attribute pager
Update yii.php
...
* 'revert-2048' of https://github.com/cebe/yii:
added changelog line for #2884
added unit test for #2884
fixed wrong dependency in unit test
reverted #2048 as it breaks logic in createFindCommand()
Conflicts:
CHANGELOG
* '2738-ActiveRecord.tableName' of https://github.com/velosipedist/yii:
removed occasional FormInput file
fix#2378 CActiveRecord::tableName() in namespaced model
Ability to substitute model attribute name, to use custom data getter. It is not dangerous to use any custom fields and getters, because it will work for read-only.
* '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
replaces pull request #1842
CMysqlColumnSchema: support for MySQL BIT(M) data type proper default
values.
For example, MySQL (MariaDB) return default value as "b'1'" string, not
as "1", so, this case should be considered especially. See also
http://dev.mysql.com/doc/refman/5.0/en/bit-type.html
* 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
