Commit Graph

2632 Commits

Author SHA1 Message Date
mdomba (mdwork)
df54c650b3 check fix 2012-08-07 15:07:03 +02:00
mdomba (mdwork)
9e1d07691c TAB to spaces in doc 2012-08-07 15:01:27 +02:00
mdomba (mdwork)
ef9875c7ae fix docs 2012-08-07 14:59:34 +02:00
mdomba (mdwork)
a9bde02ffa spaces to TAB 2012-08-07 14:55:11 +02:00
mdomba (mdwork)
4c4a6f4060 refactored JS checking, where checking for object inside if_string 2012-08-07 14:53:15 +02:00
mdomba (mdwork)
e6d4ad9b9b missing 2012-08-07 14:46:50 +02:00
Alexander Makarov
b2730f460a another typo fix 2012-08-07 16:07:45 +04:00
Alexander Makarov
c0f459dd83 typo fix 2012-08-07 16:07:09 +04:00
Alexander Makarov
473e396952 extra check for CJavaScriptExpression constructor 2012-08-07 16:03:42 +04:00
mdomba (mdwork)
aea60b88b2 Merge branch 'master' of git://github.com/yiisoft/yii into 1120-CGridView-duplicate-requests 2012-08-07 10:48:50 +02:00
ginus
6ab895a574 Update framework/zii/widgets/jui/CJuiSortable.php
line 27 change according to JUI Sortable
2012-08-07 08:13:40 +08:00
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
mdomba (mdwork)
6477e427cd Fixes #1120 prevent duplicate processing if both events are fired 2012-08-06 15:30:11 +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
resurtm
79e4373155 Added comment retrieving from Oracle. (Tested with Oracle 11g XE.) 2012-08-04 12:16:54 +06: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
resurtm
5ebb590047 Removed extra spare space. [ci skip] 2012-08-03 20:33:09 +06:00
resurtm
9199e92f79 Enh #556: Added CDbColumnSchema::$comment which stores comment for the table column, comment retrieving is working for MySQL and PgSQL. 2012-08-03 20:31:55 +06: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)
2664a85c88 Merge branch 'master' of git://github.com/yiisoft/yii into 1099-gii-model-generator-connections 2012-08-03 14:54:00 +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
mdomba (mdwork)
ffb2e8ee2a fixed spaces 2012-08-03 14:28:54 +02:00
mdomba (mdwork)
418a9ce716 #1099 better check for connection string 2012-08-03 14:14:32 +02:00
Carsten Brandt
c9bcab1af2 removed unused CModelEvent::$criteria
as a result of discussion in 7d4a0c717d
2012-08-03 15:12:11 +03:00
mdomba (mdwork)
9b81336814 Fixes #1099 - proper detection of CDbConnection class 2012-08-03 14:07:22 +02: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