Mirrors/yii
2
0
Fork 0
mirror of https://github.com/yiisoft/yii.git synced 2026-03-11 18:46:59 +01:00
Code Issues Packages Projects Releases Wiki Activity
3,677 Commits 3 Branches 54 Tags
47313eb77bdd2f620f34a1fb3cce62ddc80098df
Commit Graph

42 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
642de21873 Replaced assertEquals(null, ...) with assertNull(...) 2012-08-13 18:52:34 +02:00
DaSourcerer
2f60a31574 Replaced assertEquals(false, ...) with assertFalse(...) 2012-08-13 18:47:44 +02:00
DaSourcerer
2798c74c69 Replaced assertEquals(true, ...) with assertTrue(...) 2012-08-13 18:42:40 +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
Alexander Kochetov
33cabc62c8 #1070 fix 2012-07-30 21:52:28 +04:00
Suralc
d25601d56a Solution for #1045 2012-07-28 14:27:01 +02:00
Suralc
4e75498e59 Added test for bug #1045. 2012-07-28 14:12:59 +02:00
Alexander Kochetov
fca49df5b6 Fix the beforeFind() behavior of the framework 2012-07-27 17:50:34 +04: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
resurtm
463a145d6f Fixed PgSQL tests failing. 2012-07-06 10:44:01 +06:00
mdomba (mdlap)
846284f299 removed testCheckIntegrity() because of superadmin permission need 2012-07-05 19:36:59 +02:00
Carsten Brandt
c985553d23 removed todo annotation 2012-05-29 21:40:56 +02:00
Carsten Brandt
b3e2dc78b1 fixed #749: CActiveRecord::refresh() in afterSave 
CActiveRecord::refresh() did not work in afterSave() for new records.
refresh() will now always populate model with new data, when db entry exists
 2012-05-29 21:36:41 +02:00
DaSourcerer
34bce2647e Address issue #547: s/TYPE=INNODB/ENGINE=InnoDB/ 2012-03-23 15:02:38 +01: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 Makarov
f094f2c1a1 Fixes issue #206: Added ability to pass CDbCriteria object as AR relation parameter 2012-03-10 15:42:35 +04:00
alexander.makarow
2456d1a71c (Fixes issue 2950) proper DB init for CMysql2Test 2011-11-21 01:26:46 +00:00
alexander.makarow
a5c831a72d fixed missing AUTOINCREMENT in sqlite.sql that is used in sequence tests 2011-11-21 01:11:08 +00:00
alexander.makarow
2ee191932a (Fixes issue 2949) 2011-11-21 00:44:19 +00:00
alexander.makarow
5bcb07f752 (Fixes issue 2647) Fixed inconvenient way of defining through relation. 
(Fixes issue 2646)
(Fixes issue 2706) Added ability to join on a specific keys.
 2011-10-13 17:41:55 +00:00
alexander.makarow
76a61a8c14 (Fixes issue 2637) Related table alias set dynamically in relational query is now available in the scopes of reated model 2011-07-12 21:05:22 +00:00
alexander.makarow
1680724f1f (Fixes issue 2029) Added scope support to Model::relations() 2011-07-06 21:49:58 +00:00
alexander.makarow
f7505c00f9 (Fixes issue 2319) Added support to call behavior scope through criteria 'with'=>array('scopes'=>'behaviorScope') 2011-04-17 10:38:14 +00:00
qiang.xue
7a397f1909 * Added CActiveRecord::saveCounters(). 2011-04-08 22:09:56 +00:00
alexander.makarow
b1599035de (Fixes issue 2274) merging of "with" fails if there is joinType 2011-03-31 21:22:23 +00:00
qiang.xue
dc99b7cdeb (Fixes issue 1868) 2011-03-14 00:28:38 +00:00
alexander.makarow
b32b8753b3 2011-03-05 15:45:50 +00:00
alexander.makarow
2698e0fe11 Additional tests for AR through 2011-03-05 08:06:08 +00:00
alexander.makarow
78bf76d3ae (Fixes issue 1117) Added support for "through" in Active Record relations allowing to handle association table data 2011-02-28 17:19:09 +00:00
alexander.makarow
286d95aac3 Added ability to perform Relational JOIN without getting related models 2011-02-25 22:54:03 +00:00
alexander.makarow
7f04955dd0 additional tests for issue 1755 2011-02-21 00:29:52 +00:00
alexander.makarow
69edc13582 corrected HAS_MANY through test 2011-02-20 04:19:27 +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
0f82a6fb52 2011-02-18 21:31:21 +00:00
alexander.makarow
cc02af46c3 (Fixes issue 2122) Fixed typo in relation in CActiveRecordHasManyThroughModels 2011-02-18 21:20:22 +00:00
alexander.makarow
04b6dd9331 (Fixes issue 1221) fixed CActiveRecordHasManyThroughTest 2011-02-18 21:16:18 +00:00
alexander.makarow
1f757cbf53 improved unit tests 2011-02-18 15:25:38 +00:00