Mirrors/yii
2
0
Fork 0
mirror of https://github.com/yiisoft/yii.git synced 2026-03-15 12:36:54 +01:00
Code Issues Packages Projects Releases Wiki Activity
5,792 Commits 3 Branches 54 Tags
34057b1df19da154ba6139d6501acb79fcdc76df
Commit Graph

405 Commits

Author SHA1 Message Date
Carsten Brandt
9a934901c0 Merge branch 'fix-cache-dir-permissions' of https://github.com/ujovlado/yii into ujovlado-fix-cache-dir-permissions 
* 'fix-cache-dir-permissions' of https://github.com/ujovlado/yii:
  added CHANGELOG line
  added tests for CFileCache cacheFileMode and cachePathMode
  changed formatting
  added options to set mode (used by mkdir and chmod)  for cache directory and files
  cache dir creation with correct file mod

Conflicts:
	CHANGELOG
 2013-09-04 15:12:36 +02:00
Carsten Brandt
480b08f50f fixed test break for php < 5.3.0 2013-09-04 15:07:46 +02:00
Carsten Brandt
f5e592f22d better fix for #2378 2013-09-04 15:05:17 +02:00
Carsten Brandt
10b4b0f063 Merge branch '2738-ActiveRecord.tableName' of https://github.com/velosipedist/yii into velosipedist-2738-ActiveRecord.tableName 
* '2738-ActiveRecord.tableName' of https://github.com/velosipedist/yii:
  removed occasional FormInput file
  fix #2378 CActiveRecord::tableName() in namespaced model
  Ability to substitute model attribute name, to use custom data getter. It is not dangerous to use any custom fields and getters, because it will work for read-only.
 2013-09-04 14:54:35 +02:00
Carsten Brandt
4f1bc7bf6d Merge pull request #2827 from klimov-paul/enh-file-helper-create-directory 
Enhancement: CFileHelper::createDirectory
 2013-08-30 08:05:52 -07:00
Alexander Makarov
4b183f1e59 Merge pull request #2826 from klimov-paul/2821-file-validator 
Fix #2821 file validator
 2013-08-29 04:13:58 -07:00
Paul Klimov
cba9c4d81e Merge branch 'master' of github.com:yiisoft/yii into 2770-client-script-render-script-batch 2013-08-29 13:25:38 +03:00
Paul Klimov
4e398ece03 Private method 'CFileHelper::mkdir()' has been converted into public 'CFileHelper::createDirectory()'. 2013-08-29 13:13:57 +03:00
Paul Klimov
363fb4de81 Unit test CActiveRecordTest has been adjusted. 2013-08-29 12:09:23 +03:00
Paul Klimov
11c774b0bb Merge branch '268-cdbcriteria-count' of https://github.com/nineinchnick/yii into nineinchnick-268-cdbcriteria-count 2013-08-29 11:56:38 +03:00
Paul Klimov
31e7ab1c04 CFileValidator has been fixed. 2013-08-29 11:41:25 +03:00
Paul Klimov
db6e6bc58c Unit test 'CFileValidatorTest' has been updated to expose issue #2821 2013-08-29 11:28:46 +03:00
Pavel Voronin
046301a771 CFileHelperTest.testFindFiles_relativePaths was added 2013-08-27 12:29:23 +04:00
Pavel Voronin
b1882e8d02 CFileHelperTest.testFindFiles_absolutePaths was added 2013-08-27 12:29:06 +04:00
Zander Baldwin
737cb4a081 Update Framework Unit Tests 
Update the frameworks unit tests to check incoming data types for the column names of CDbSchema::createIndex() and CDbSchema::addForeignKey().
 2013-08-26 16:31:20 +01:00
John Was
bb07a7abdd detect properly if criteria->select starts with a count() expression in CActiveFinder->count() method 2013-08-21 21:45:08 +02:00
Alexander Makarov
e24f043150 Merge pull request #2773 from nineinchnick/182-csort-asc-desc-arrays 
allow arrays in asc/desc properties of virtual attributes
 2013-08-16 13:27:10 -07:00
Vladimír Kriška
3eaa17ad71 added tests for CFileCache cacheFileMode and cachePathMode 2013-08-16 11:31:27 +02:00
Klimov Paul
6cae70cb94 Merge branch 'master' of github.com:yiisoft/yii into 2770-client-script-render-script-batch 2013-08-15 10:14:04 +03:00
Carsten Brandt
132b4fd612 added unit test to verify behavior for #2756 2013-08-14 23:49:48 +02:00
John Was
769417c255 updated CHANGELOG and added test 2013-08-14 23:31:05 +02:00
Klimov Paul
540a1d27a0 CClientScript::renderScriptBatch() has been fixed to group scripts with different HTML options correctly. 2013-08-14 20:28:55 +03:00
Klimov Paul
7111b38399 CClientScriptTest has been advanced to expose issue #2770 2013-08-14 20:27:29 +03:00
Carsten Brandt
4c1da89e4f CRedisCache UnitTest to verify #2750 2013-08-11 22:58:27 +02:00
velosipedist
8dd39e27a1 fix #2378 CActiveRecord::tableName() in namespaced model 2013-08-07 20:20:42 +04:00
resurtm
7d8be70144 Fixes #2662, reverts #1622: 
1. More edgecase unit tests for CLocale.
2. Fix #2662.
3. Revert #1622.
 2013-07-30 19:35:45 +06:00
tom--
15096e9976 Convert spaces to tabs. 2013-07-08 07:49:10 -04:00
tom--
e2398faa9c Chg #2053 Corrections for more coherent CSecurityManager::generateRandomBytes() see PR 2604 discussion, unit tests. 2013-07-07 16:37:27 -04:00
creocoder
05a7f34b4c 2607 rollback 2013-07-06 20:51:59 +04:00
Alexander Makarov
deb90faff8 fixed tests 2013-07-06 02:35:26 +04:00
creocoder
75c7b6b9f0 Tests, code style fixes and changelog gramar corrections 2013-07-05 13:04:12 +04:00
resurtm
5f99be770d Additions to #2602: 
1. Proper Net_IDNA2 usage. Net_IDNA2::decode() and Net_IDNA2::encode()
accepts only domains, not full URLs. Before this fix framework used
to pass full URLs which is wrong usage.

2. If CEmailValidator or CUrlValidator is being used under PHP 5.3.0+,
native `idn` PHP extension will be used (`idn_to_utf8` and `idn_to_ascii`
functions in particular). Otherwise Net_IDNA2 will be used (for PHP
< 5.3.0).
 2013-07-04 19:32:09 +06:00
Klimov Paul
63a3e57cc4 PR #2569 has been reverted. 2013-06-26 00:07:48 +03:00
Paul Klimov
ccc0a45022 Test case "CActiveRecordTest::testCustomAttributes()" has been added. 2013-06-25 11:23:43 +03:00
Alexander Makarov
03fb457d9c fixed test 2013-06-12 14:41:56 +04:00
Alexander Makarov
e0a45a0ffa more tests 2013-06-12 14:33:16 +04:00
Alexander Makarov
6546a641f4 added tests 2013-06-12 13:32:37 +04:00
Alexander Makarov
245d7fa1f7 fixed class name 2013-06-12 13:31:59 +04:00
resurtm
6e632c74b4 Fixes #1990. Wrong week number returned by CDateFormatter::formatWeekInMonth(). 2013-06-08 01:38:44 +06:00
Alexander Kochetov
cd30acdecc Unit tests 2013-06-04 04:58:19 +04:00
Carsten Brandt
f8de04a066 Added unit test for #2530 2013-06-03 08:14:03 +02:00
Carsten Brandt
da290bad73 Merge PR #2514 branch '2508-chtml-active-label-tabular' of https://github.com/klimov-paul/yii 
* '2508-chtml-active-label-tabular' of https://github.com/klimov-paul/yii:
  Issue #2508 has been added to CHANGELOG.
  "CHtml::activeLabel()" has been fixed to resolve attribute label for tabular input in case custom "for" has been specified.

Conflicts:
	CHANGELOG
 2013-06-01 21:55:52 +02:00
resurtm
7b72148d43 Fixes #1725: CFileHelper::removeDirectory() has been added. 2013-05-30 20:01:25 +06:00
Paul Klimov
e9e929aa09 "CHtml::activeLabel()" has been fixed to resolve attribute label for tabular input in case custom "for" has been specified. 2013-05-29 12:40:46 +03:00
resurtm
0bb122f92d Merge pull request #2444 from resurtm/fixes-2435-CFileCache-enhancements 
Fixes #2435: CFileCache entry expiration time could now be embedded into the cache file.
 2013-05-28 09:45:05 -07:00
resurtm
c1161ad73e Merge branch 'master' of github.com:yiisoft/yii into fixes-2336 
Conflicts:
	CHANGELOG
	tests/framework/db/ar/CActiveRecord2Test.php
 2013-05-28 21:06:37 +06:00
resurtm
d749ecff97 Fix unit test. 2013-05-28 20:31:26 +06:00
resurtm
3fa125ce3c Merge branch 'master' of github.com:yiisoft/yii into fixes-2435-CFileCache-enhancements 
Conflicts:
	CHANGELOG
 2013-05-28 19:44:29 +06:00
Alexander Makarov
072a1745ab Merge branch 'master' of github.com:lubosdz/yii into lubosdz-master 
Conflicts:
	CHANGELOG
 2013-05-27 21:32:41 +04:00
Alexander Makarov
92fff54053 Merge branch 'master' of github.com:yiisoft/yii 
Conflicts:
	CHANGELOG
 2013-05-27 13:22:02 +04:00