yii/tests/framework/db at 85efd7bb0aaa3b9fc22a47d58331c79ceaa649bc - yii

mirror of https://github.com/yiisoft/yii.git synced 2026-03-09 17:46:55 +01:00

Files

Carsten Brandt 174a0694ff Merge branch 'master' of https://github.com/yiisoft/yii into 1381-stat-relation-select

* '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