* '2159-fix-delete-with-join' of https://github.com/serebrov/yii:
Fixes#2159 - problem with command builder for delete with joins.
Conflicts:
CHANGELOG
* '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
* 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
when a query does not return results beforeFind() is called for all
eager relations even when main query did not return a result.
This is a behavior change, things are all consistent now.
afterFind() should of course never get called then.
* '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
