Mirrors/yii
2
0
Fork 0
mirror of https://github.com/yiisoft/yii.git synced 2026-03-06 16:16:53 +01:00
Code Issues Packages Projects Releases Wiki Activity
4,893 Commits 3 Branches 54 Tags
52da9b7fedbfdb62b00a46da2a70897668d1230b
Commit Graph

257 Commits

Author SHA1 Message Date
Paul Klimov
4a17cf0e4a "CActiveFinder::count()" has been updated allowing correct records count with having. 2013-03-04 15:45:59 +02:00
Paul Klimov
a2fead97a7 Test for count with having have been added to "CActiveRecordTest" test case. 2013-03-04 14:35:06 +02:00
resurtm
e77143105d CFormatter::formatNtext() method can replace newlines with <p></p> not just with <br /> as it was before. 2013-01-25 13:47:48 +06:00
antoncpu
09bbf001fd fixed init in case of disabled pagination 2013-01-02 22:03:35 +02:00
resurtm
3f3f520917 Added NULL check into CHtml::value(), $attribute. 2012-12-23 14:12:49 +06:00
resurtm
694dcb885c Second parameter of the CHtml::value() doesn't support functions created by "create_function" anymore. 2012-12-21 21:19:26 +06:00
resurtm
fd5672978e Fixes CHtml::value() bug. 2012-12-21 17:04:09 +06:00
resurtm
80ba017193 Additional unit test for dot syntax access. 2012-12-19 20:57:47 +06:00
resurtm
a6d98dc7ed #1861: PHP 5.2 testing issues and forgot about create_function. 2012-12-19 20:12:42 +06:00
resurtm
321e812e24 Fixes #1861. CHtml::value() didn't worked properly with array-typed $model parameter and integer-typed $attribute parameter. 2012-12-19 19:37:39 +06:00
Carsten Brandt
c5907fc413 Created unit test for CWebUser 
issue #1792
 2012-12-12 17:38:48 +01:00
Carsten Brandt
23e32a79c6 added test for #1191 
can not reproduce the issue
 2012-12-12 16:39:18 +01:00
Alexander Makarov
97ae6b6bbd Merge branch 'innsand-CFileHelper_recursive_copy_fix' 2012-12-01 15:38:30 +04:00
Alexander Makarov
4545516540 fixed formatting, added missing docs 2012-12-01 15:27:32 +04:00
Alexander Makarov
e6892c6920 fix for Windows tests 2012-12-01 15:16:21 +04:00
Alexander Makarov
b2f152cb69 backwards compatibility 2012-12-01 14:47:19 +04:00
Alexander Makarov
f088b758a2 Merge branch 'ctypevalidator' of git://github.com/antonCPU/yii into antonCPU-ctypevalidator 2012-12-01 14:34:01 +04:00
Carsten Brandt
1779443632 Merged pull request #1772 branch '162-behavior' 
* 162-behavior:
  doc comments
  refactored CBehavior
  CBehaviorTest structure
  added assertations about CBehavior::$enabled
  Fix issue #162, eventhandlers attached twice

Conflicts:
	CHANGELOG
 2012-11-30 17:14:10 +01:00
Carsten Brandt
370e347138 doc comments 2012-11-30 17:01:22 +01:00
Carsten Brandt
4b530e1f16 CBehaviorTest structure 2012-11-30 15:43:14 +01:00
Carsten Brandt
f0bb2a51a7 Fixed unit test, resetting language in tearDown 2012-11-30 15:16:54 +01:00
antoncpu
92c0aeaea5 fixed typo 2012-11-29 22:57:59 +02:00
antoncpu
bb61c72a51 refactored to avoid inappropriate arguments passed to trim() or CDateTimeParser::parse() 2012-11-29 22:46:55 +02:00
Carsten Brandt
93a9009d93 added assertations about CBehavior::$enabled 
issue #162
 2012-11-28 21:57:59 +01:00
Carsten Brandt
48cc7c5e44 Fix issue #162, eventhandlers attached twice 
when enabling a behavior after attach, eventhandlers got attached twice.
issue #162
 2012-11-28 21:52:14 +01:00
Alexander Makarov
9f45475479 Merge remote-tracking branch 'origin/master' 2012-11-29 00:05:09 +04:00
Alexander Makarov
f620bf7703 more tests for CTypeValidator 2012-11-29 00:04:53 +04:00
Carsten Brandt
a08a24f3b2 Merge pull request #1771 from cebe/1549-sizeformat 
Fixes issue #1549 corrected CFormatter::sizeFormat
 2012-11-28 11:55:47 -08:00
Alexander Makarov
fdce3eda30 Addition to #217: handling of objects and boolean values 2012-11-28 22:24:24 +04:00
Carsten Brandt
027c1422de Fixes issue #1549 corrected CFormatter::sizeFormat 
translations for sizeFormat changed to choice format.
improved number formatting
fixed translations
 2012-11-28 17:05:19 +01:00
Alexander Makarov
4fc04645d9 Fixes #217: Added CTypeValidator::validateValue() and CTypeValidator::$strict, better check for arrays 2012-11-28 02:50:59 +04:00
Carsten Brandt
6fc226b826 CCompareValidatorTest 
converted tabs to spaces and fixed test to expect consitent messages.
Same on server and client.
 2012-11-21 18:19:36 +01:00
Carsten Brandt
1cdaa63218 Merge pull request #546 branch 'phpnode-add-cdataprovideriterator' 
* phpnode-add-cdataprovideriterator:
  Refactoring of CDataProviderIterator
  #545 more tiny code style changes
  #545 reformat code according to Yii style
  #545 dont use getters or setters if we can avoid it
  #545 dont use getters or setters if we can avoid it
  #545 make protected members private
  #545 update changelog
  #545 fix whitespace
  Update changelog for #545
  Add CDataProviderIterator to allow iterating over large data sets
 2012-11-14 20:06:05 +01:00
Carsten Brandt
7150d84ac1 Refactoring of CDataProviderIterator 2012-11-14 20:04:37 +01:00
Maurizio Domba (mdlap)
57227293e8 Fixing tests for PR #1502 (issue #1492) 2012-11-14 19:18:04 +01:00
Carsten Brandt
93e0d8f24c Merge branch 'add-cdataprovideriterator' of https://github.com/phpnode/yii into phpnode-add-cdataprovideriterator 
* 'add-cdataprovideriterator' of https://github.com/phpnode/yii:
  #545 more tiny code style changes
  #545 reformat code according to Yii style
  #545 dont use getters or setters if we can avoid it
  #545 dont use getters or setters if we can avoid it
  #545 make protected members private
  #545 update changelog
  #545 fix whitespace
  Update changelog for #545
  Add CDataProviderIterator to allow iterating over large data sets

Conflicts:
	CHANGELOG
 2012-11-14 19:11:13 +01:00
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
 2012-11-14 14:06:05 +01:00
Carsten Brandt
70374843e7 added test for #1381 and changelog line 2012-11-14 14:03:01 +01:00
resurtm
705d9ed2ce Fixed #1652: added CSqliteSchema::renamteTable() 2012-11-04 14:56:19 +06:00
resurtm
5a3e699ff9 Fixed #1622 and #1646. 2012-11-02 23:33:37 +06:00
Alexander Makarov
b52d531720 Merge branch 'master' of git://github.com/lubosdz/yii into lubosdz-master 2012-10-29 21:38:02 +04:00
lubosdz
9bb07e6448 Merge branch 'master' of https://github.com/lubosdz/yii 
Added more assertions into unit test.
 2012-10-24 13:34:24 +02:00
lubosdz
45d286d01f Merge branch 'master' of https://github.com/lubosdz/yii 2012-10-23 17:41:12 +02:00
Alexander Makarov
8bad9a5905 Proper fix for CDbCommand::setFetchMode wasn't accepting additional arguments needed for PDO::FETCH_CLASS 2012-10-21 00:00:18 +04:00
Alexander Makarov
425284b67f Fixed the bug that CDbCommand::setFetchMode wasn't accepting additional arguments needed for PDO::FETCH_CLASS (reverse-merged from commit d0154ef613) 2012-10-20 23:26:04 +04:00
Alexander Makarov
d0154ef613 Fixed the bug that CDbCommand::setFetchMode wasn't accepting additional arguments needed for PDO::FETCH_CLASS 2012-10-20 22:55:29 +04:00
Konstantin G Romanov
2888b0954a Merge remote-tracking branch 'upstream/master' into CFileHelper_recursive_copy_fix 
Conflicts:
	tests/framework/utils/CFileHelperTest.php
 2012-10-19 17:05:05 +04:00
Alexander Makarov
48013630e7 Merge pull request #1586 from innsand/CMeMCacheTest-testExpire2_expire_increased 
5 sec expire somehow is not enought. Causing false negative test.
 2012-10-19 06:02:14 -07:00
Konstantin G Romanov
75908a5170 * 5 sec expire somehow is not enought causing false negative test. 2012-10-19 16:33:33 +04:00
Konstantin G Romanov
b892a0bab6 + CFileHelperTest 
* newDirMode correctly setted on recursive creation of dst dir.
 2012-10-12 14:03:52 +04:00