Mirrors/yii
2
0
Fork 0
mirror of https://github.com/yiisoft/yii.git synced 2026-03-07 16:46:51 +01:00
Code Issues Packages Projects Releases Wiki Activity
3,524 Commits 3 Branches 54 Tags
22265fc13d6a8aecd07c350ec9d5efc4bdb7bb48
Commit Graph

2560 Commits

Author SHA1 Message Date
Qiang Xue
22265fc13d Merge pull request #741 from jamesmoey/fix-591 
Fix for issue #591 CActiveRecord::getRelated doesn't call afterFind() wi...
 2012-08-06 13:35:38 -07:00
Carsten Brandt
5c9af8579a fixed grammar in CDefaultValueValidator doc 2012-08-06 22:43:40 +03:00
Alexander Makarov
a98128eee3 Merge pull request #1154 from samdark/1109-CJavaScript-encode-bc 
#1109: Fixed "js:" encoding BC-break in CHtml::ajax() and related methods introduced in 1.1.11, added tests
 2012-08-06 11:58:55 -07: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
Alexander Makarov
f5baaff3db Merge pull request #1152 from samdark/1101-docs-CAssetManager-publish 
[ci skip] #1101 better docs for CAssetManager::publish
 2012-08-06 11:38:52 -07:00
Alexander Makarov
4b47e1ab2d #1101 better docs for CAssetManager::publish 2012-08-06 21:14:20 +04:00
Alexander Makarov
af2b19cf44 #1073 better docs for CDefaultValueValidator 2012-08-06 21:02:14 +04:00
Alexander Makarov
b8fab37277 Merge pull request #1147 from gregmolnar/issue_1143 
[ci skip] removed font duplication from gii css
 2012-08-06 07:37:02 -07:00
mdomba (mdwork)
84c0dc934d Merge remote-tracking branch 'origin/master' 2012-08-06 15:43:23 +02:00
mdomba (mdwork)
302919cfae CCaptcha - set "dummy" as comment and added a description 2012-08-06 15:43:04 +02:00
Greg Molnar
f71703f60f removed font duplication from gii css 2012-08-06 14:34:26 +02:00
Qiang Xue
17bcfe76c1 Merge pull request #1145 from rawtaz/phpdoc 
Fix misspelled return type in PHPdoc for CMssqlCommandBuilder::checkCriteria()
 2012-08-06 05:17:15 -07:00
mdomba (mdwork)
2db7d2a2b2 Reverting PR #1141 (Issue #1140) 2012-08-06 14:13:15 +02:00
Leo R. Lundgren
226774ddf8 Fix misspelled return type in PHPdoc for CMssqlCommandBuilder::checkCriteria(). 2012-08-06 14:12:34 +02:00
Alexander Makarov
3798fa300d Merge remote-tracking branch 'upstream/master' into CFileValidator-allowEmpty-null 
Conflicts:
	CHANGELOG
 2012-08-06 13:08:49 +04:00
mdomba (mdwork)
35bb8ce275 Fixes 1140 removed unnecessary dummy registerScript in CCaptcha 2012-08-06 10:28:35 +02:00
Leo R. Lundgren
b4f888484c Fix invalid HTML in PHPdoc for CMssqlCommandBuilder::applyLimit(). 2012-08-04 02:45:14 +02:00
tom--
8e8b61e369 two comment blocks should have been docblocks [ci skip] 2012-08-03 14:58:14 -04:00
Carsten Brandt
fad0944e33 updated doc comments in CJavaScriptExpression 
missing comments + wrong comments
 2012-08-03 17:58:44 +03:00
Leo R. Lundgren
7a194496a5 Fix a bunch of @param and @return phpdoc errors in various files. 2012-08-03 16:17:58 +02:00
mdomba (mdwork)
162dd768cc Fixes #1088 use proper id in CActiveForm when it's supplied in htmloptions 2012-08-03 14:47:56 +02:00
Carsten Brandt
c9bcab1af2 removed unused CModelEvent::$criteria 
as a result of discussion in 7d4a0c717d
 2012-08-03 15:12:11 +03:00
resurtm
6671773738 Better docblock for the CWebService::$generatorConfig. 2012-08-03 18:00:29 +06:00
resurtm
647d4f3f83 Yii::createComponent() is much better than direct object creation. 2012-08-03 17:36:41 +06:00
resurtm
baf9c1277d Merge branch 'master' of git://github.com/yiisoft/yii into 243-web-service-generator-class 2012-08-03 17:26:55 +06:00
Qiang Xue
46b6ef23e3 Merge pull request #1112 from resurtm/190-soap-eol 
Fixes #190. WSDL return tag was not generated by CWsdlGenerator when Macintosh line endings were used inside service describing docblock
 2012-08-03 04:22:41 -07: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
3984ea4423 Fixes bug 1066. 2012-08-03 15:35:21 +06:00
mdomba (mdwork)
7d867f3850 doc fix 2012-08-03 09:52:43 +02:00
resurtm
b419711ece Fixes #190. WSDL return tag was not generated by CWsdlGenerator when Macintosh line endings were used inside service describing docblock. 2012-08-03 13:20:15 +06:00
mdomba (mdwork)
ead2377d1a doc fix 2012-08-03 08:36:33 +02:00
resurtm
f458b78bea Forgot about the main part. CWebService::generateWsdl() now respects CWebService::$generatorClass value. 2012-08-03 12:30:11 +06:00
resurtm
9b96271ade Fixed version for 243 fix in the CWebService class. 2012-08-03 12:28:34 +06:00
resurtm
08a4e8ded8 Fixes #243. WebService is now able to deal with the customized WSDL generator classes. 2012-08-03 12:25:38 +06:00
CeBe
c077c0b29f fixed return doc comment type in CBaseUserIdentity 
fixes #1108
 2012-08-03 00:55:52 +02:00
Alexander Makarov
1d33c35ea0 updated CFileValidator to be unsafe 2012-08-03 00:06:21 +04:00
Alexander Makarov
1bb2ea9ca5 Merge remote-tracking branch 'upstream/master' into CFileValidator-allowEmpty-null 2012-08-03 00:03:39 +04:00
Carsten Brandt
7d4a0c717d Merge pull request #1103 from cebe/cleanup-model-event 
fixed doc comment on ModelEvent

[ci skip]
 2012-08-02 12:07:17 -07:00
resurtm
e22a3ce91b document.title is better than overwhelmed $('head title').text(). 2012-08-02 18:47:44 +06:00
Carsten Brandt
a50d332baf added version to deprecated annotation 2012-08-02 14:41:30 +02:00
resurtm
c442ff1c81 Fixes #1094. 2012-08-02 18:37:19 +06:00
Alexander Makarov
f8c68d5968 Merge remote-tracking branch 'upstream/master' into CFileValidator-allowEmpty-null 
Conflicts:
	CHANGELOG
 2012-08-02 15:14:55 +04:00
Alexander Makarov
0cbacb1684 changed setting null to unset 2012-08-02 15:12:18 +04:00
Carsten Brandt
e85a464d95 fixed doc comment on ModelEvent 
ModelEvent::$criteria is not used anymore since yii 1.1.7 so its
comment should not confuse people.
 2012-08-02 12:52:56 +02:00
Qiang Xue
656ba80607 Merge pull request #1091 from suralc/1087-part1-revert-changes 
Revert CCookieCollection::add().
 2012-08-01 16:16:14 -07:00
Alexander Makarov
a95e792d68 Merge pull request #1098 from creocoder/1077-postfix 
#1077 post fix
 2012-08-01 14:58:32 -07:00
Alexander Kochetov
fe3628bf37 #1077 post fix 2012-08-02 01:37:19 +04:00
Alexander Makarov
4fe00c919e Fixes #1076: CJavaScript::encode() was not compatible with PHP 5.1 2012-08-01 23:57:36 +04:00
Suralc
40f813763a Revert CCookieCollection::add(). 2012-08-01 18:21:29 +02:00
Qiang Xue
7c62369aa7 Merge pull request #1090 from hyzhakus/patch-1 
Update framework/zii/widgets/CListView.php
 2012-08-01 08:01:15 -07:00