* 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
...
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
* 'cubrid-database-support' of https://github.com/kadishmal/yii:
Ref: converted spaces to tabs.
Ref: converted spaces to tabs according to Yii coding conventions.
CUBRID Database 9.0 Support.
* 'master' of https://github.com/yiisoft/yii: (651 commits)
Updated guide Gii Model Generator page screenshot.
adjusted CHANGELOG
Requirements checking slightly improved.
Enhanced CHANGELOG description
Requirements checker: added support of the Oracle database (pdo_oci extension)
MSSQL driver types refinements.
Requirements checker: added support of the MSSQL (pdo_dblib and pdo_sqlsrv extensions).
Language fixes.
Preparations for merging fixes of the #556 into 1.1.13 codebase.
[docs][blog] 'yiic' to 'Gii'
ajaxUpdate is never false in jquery.yiilistview.js
Added /docs/guide/fr/caching.overview.twt
Added /docs/guide/fr/basics.controller.txt
Added /docs/guide/fr/basics.mvc.txt
Update framework/web/filters/CHttpCacheFilter.php
Update docs/guide/fr/toc.txt
[NL] Dutch messages translation updated
added history.js license
prepare for next release.
prepare for 1.1.12 release.
...
Conflicts:
CHANGELOG