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

133 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
Suralc
48e10dc00d Removed class imports. 2012-08-15 22:01:55 +02:00
Suralc
767c4a92f0 Whitespace fix. 2012-08-15 13:42:40 +02:00
Suralc
dd56a770d9 Restore original cookies after test. 2012-08-15 13:33:09 +02:00
Suralc
2ddbca8d2b Added tests for CHttpCookie and CCookieCollection. 
Also modified bootstrap.php to work with phpUnits @runInSeperateProcess annotation.
 2012-08-14 14:22:06 +02: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
mdomba (mdwork)
876c5f581e CTimestampBehavior test - alow 2 seconds difference in assertEqual() 2012-08-09 10:01:35 +02:00
Alexander Makarov
52b0ffc4ef additional test 2012-08-08 01:50:23 +04:00
Alexander Makarov
d140b9217c CJavaScript::encode tests for various widgets 2012-08-08 01:37:12 +04:00
Alexander Makarov
14a33f0153 #1109: Fixed "js:" encoding BC-break in CHtml::ajax() and related methods introduced in 1.1.11, added tests 2012-08-06 22:57:45 +04: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
Maurizio Domba
d92c20f8d7 Merge pull request #1115 from resurtm/1066-memcache 
Fixes #1066: CMemCache: expiration time higher than 60*60*24*30 (31536000) seconds led the value to expire right away after saving
 2012-08-03 03:42:23 -07:00
resurtm
9c2d4f0bca Removed changelog line and fixed other similar mistakes in other places of the CTimestampBehaviorTest. 2012-08-03 16:34:08 +06:00
resurtm
7c8d125d16 Fixes #1085. 2012-08-03 16:14:12 +06:00
resurtm
3984ea4423 Fixes bug 1066. 2012-08-03 15:35:21 +06:00
Alexander Kochetov
33cabc62c8 #1070 fix 2012-07-30 21:52:28 +04:00
Qiang Xue
91495a3d1a renamed CValidator::$on to be CValidator::$except. 2012-07-28 23:52:22 -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
Alexander Makarov
6705e15f70 Merge pull request #1013 from resurtm/fix-943 
Fixes #943: CDateTimeParser is now able to parse short textual representation of month, e.g. Jan, Jun, Aug.
 2012-07-24 02:57:29 -07:00
resurtm
79825072c7 Merge branch 'master' of git://github.com/yiisoft/yii into ts-behavior-tests 2012-07-24 10:06:50 +06:00
resurtm
1c2488d47a Added a little bit of randomness into CDateTimeParser tests. 2012-07-24 00:11:20 +06:00
resurtm
3ba959b4c2 CDateTimeParser is now able to parse short textual representation of month, e.g. Jan, Jun, Aug. 2012-07-23 23:52:08 +06:00
DaSourcerer
798a1b9177 Resetting table names to defaults ... 2012-07-16 23:38:01 +02:00
DaSourcerer
c4b9df117d Use the actual schema-pgsql.sql for CDbAuthManagerTest 2012-07-16 23:31:59 +02: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
resurtm
3b88d98213 Merge branch 'master' of git://github.com/yiisoft/yii into ts-behavior-tests 2012-07-14 11:07:47 +06:00
Qiang Xue
782cd9056e Merge pull request #941 from rusmaxim/sort-array-data-provider 
Sorting CArrayDataProvider with dot delimiter like SQL query
 2012-07-13 06:52:13 -07:00
DaSourcerer
87d1b88ed2 Removed unused sqlite.sql 2012-07-11 22:18:22 +02:00
Rusinov Maxim
b419391241 Reformat using CamelCase and added regexp for fieldsArray 2012-07-08 20:16:02 +06:00
Rusinov Maxim
f9691820a5 Reformat using indent instead spaces 2012-07-08 20:09:09 +06:00
Rusinov Maxim
a9e507de88 Added tests for CArrayDataProvider 
Sorting by dot delimiter like SQL query
 2012-07-08 19:26:32 +06:00
resurtm
9a159cb4d7 Class name: CFileValidatorTestCase → CFileValidatorTest. 2012-07-08 16:30:14 +06:00
resurtm
205cf9d3c3 Fix #938, solution #2. 2012-07-08 16:20:43 +06:00
resurtm
2ed6173616 Merge branch 'master' of git://github.com/yiisoft/yii into ts-behavior-tests 2012-07-06 17:13:43 +06: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
resurtm
150ca71f50 Additional test for CMemCacheTest. 2012-07-04 23:59:08 +06:00
resurtm
b53241460e CMemCache::setValue() and CMemCache::addValue() change: expiration time for Memcache::set() and Memcached::set() now passed as seconds amount. Was UNIX timestamp. This is a documented feature of the memcache PHP extension, but now CMemCacheTest passes without fails. 2012-07-04 23:46:05 +06:00
resurtm
1ce80037ac CMemCacheTest fix. 2012-07-04 23:09:48 +06:00
resurtm
a26eecf1b0 CMemCacheTest fix. 2012-07-04 23:08:46 +06:00
resurtm
02ccba9e49 Possible fix of CHtml's tests failings. 2012-07-04 22:23:08 +06:00
unknown
ab6b65bb15 Merge branch 'master' of git://github.com/yiisoft/yii into more-chtml-tests 2012-07-03 22:05:31 +06:00
mdomba (mdlap)
1a859a57b8 Fixes validator fail in pull request #877 for issue #114 2012-07-01 15:58:44 +02:00