Carsten Brandt d77234b1e7 Merge branch 'master' of https://github.com/yiisoft/yii into issue-124 ...

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

2012-08-28 21:21:27 +02:00

..

base

Replaced assertEquals(null, ...) with assertNull(...)

2012-08-13 18:52:34 +02:00

caching

Fixes bug 1066.

2012-08-03 15:35:21 +06:00

collections

Replaced assertEquals(null, ...) with assertNull(...)

2012-08-13 18:52:34 +02:00

db

Merge branch 'master' of https://github.com/yiisoft/yii into issue-124

2012-08-28 21:21:27 +02:00

i18n

fixed side effect of YiiTTest

2011-11-21 01:38:20 +00:00

utils

Added a little bit of randomness into CDateTimeParser tests.

2012-07-24 00:11:20 +06:00

validators

renamed CValidator::$on to be CValidator::$except.

2012-07-28 23:52:22 -04:00

web

Removed class imports.

2012-08-15 22:01:55 +02:00

zii

CTimestampBehavior test - alow 2 seconds difference in assertEqual()

2012-08-09 10:01:35 +02:00