Commit Graph

13 Commits

Author SHA1 Message Date
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
resurtm
81cd764447 Merge branch 'master' of git://github.com/yiisoft/yii into 556-mysql-column-comment 2012-08-25 10:02:11 +06:00
DaSourcerer
2f60a31574 Replaced assertEquals(false, ...) with assertFalse(...) 2012-08-13 18:47:44 +02:00
resurtm
f81378d2a2 Fixed failing unit tests. 2012-08-03 21:12:51 +06:00
resurtm
351ca14c28 Unit tests for CDbColumnSchema::$comment. 2012-08-03 20:56:28 +06:00
DaSourcerer
db8a633164 Keep mssql tests from being executed in travis 2012-07-16 23:20:03 +02:00
CeBe
928ec818ce fixed typo rollBack -> rollback
used case setting of methods implementation in CDbTransaction as
reference.
2012-07-16 04:59:40 +02:00
DaSourcerer
87d1b88ed2 Removed unused sqlite.sql 2012-07-11 22:18:22 +02:00
mdomba (mdlap)
846284f299 removed testCheckIntegrity() because of superadmin permission need 2012-07-05 19:36:59 +02:00
DaSourcerer
5100f24d32 added some unit tests mysql
testing mysql update commands with new CMysqlCommandBuilder
issue #124
2012-03-19 16:48:36 +01:00
alexander.makarow
2456d1a71c (Fixes issue 2950) proper DB init for CMysql2Test 2011-11-21 01:26:46 +00:00
alexander.makarow
486acc4f5c (Fixes issue 558) Added parametrized named scopes, added scopes to criteria, implemented scope criteria merging 2011-02-19 00:11:00 +00:00
alexander.makarow
1f757cbf53 improved unit tests 2011-02-18 15:25:38 +00:00