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
|
9f90ac17e0
|
Merge pull request #1151 from samdark/1073-docs-CDefaultValueValidator-update
[ci skip] #1073 better docs for CDefaultValueValidator
|
2012-08-06 11:37:55 -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 |
|
Alexander Makarov
|
ca26e21658
|
Merge pull request #1149 from softark/docs-ja
[ci skip] [docs][guide][ja] improved translations (database, caching, extension)
|
2012-08-06 06:16:17 -07:00 |
|
softark
|
2860a1a379
|
Merge branch 'docs-ja' of github.com:softark/yii into docs-ja
|
2012-08-06 21:58:59 +09:00 |
|
softark
|
ac1c2dea65
|
[docs][guide][ja] improved translations (database, caching, and extension)
|
2012-08-06 21:57:39 +09:00 |
|
softark
|
96ab442ee2
|
[docs][guide][ja] improved translations (database, caching, and extension)
|
2012-08-06 21:46:34 +09: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
|
b06fcad349
|
Merge pull request #1083 from samdark/CFileValidator-allowEmpty-null
#1083: CFileValidator is now unsafe by default. This will prevent setting attribute when no file was uploaded
|
2012-08-06 02:12:00 -07:00 |
|
Alexander Makarov
|
ee340bda74
|
updated changelog line
|
2012-08-06 13:09:35 +04:00 |
|
Alexander Makarov
|
3798fa300d
|
Merge remote-tracking branch 'upstream/master' into CFileValidator-allowEmpty-null
Conflicts:
CHANGELOG
|
2012-08-06 13:08:49 +04:00 |
|
Maurizio Domba
|
23f79020eb
|
Merge pull request #1141 from mdomba/1140-captcha
Fixes 1140 removed unnecessary dummy registerScript in CCaptcha
[ci skip]
|
2012-08-06 01:32:26 -07:00 |
|
mdomba (mdwork)
|
35bb8ce275
|
Fixes 1140 removed unnecessary dummy registerScript in CCaptcha
|
2012-08-06 10:28:35 +02:00 |
|
Qiang Xue
|
0b6967a6ec
|
Merge pull request #1139 from softark/docs-ja
[docs][guide][ja] , [docs][blog][ja] fixed the links to section hashes, improved translations
|
2012-08-05 17:32:05 -07:00 |
|
Nobuo Kihara
|
05091b9805
|
Merge branch 'docs-ja' of github.com:softark/yii into docs-ja
Conflicts:
docs/guide/ja/form.action.txt
docs/guide/ja/form.builder.txt
docs/guide/ja/form.model.txt
|
2012-08-06 08:54:55 +09:00 |
|
Nobuo Kihara
|
5a34ffbfc0
|
[docs][blog][ja], [docs][guide][ja] improved translations
|
2012-08-06 08:50:04 +09:00 |
|
Nobuo Kihara
|
3069827be2
|
[docs][blog][ja], [docs][guide][ja] revising now
|
2012-08-06 00:44:14 +09:00 |
|
Nobuo Kihara
|
3970561b28
|
Merge branch 'master' of github.com:yiisoft/yii
|
2012-08-05 17:31:02 +09:00 |
|
Qiang Xue
|
0049fef985
|
Merge pull request #1132 from softark/docs-ja
[docs][guide][ja] improved translations
|
2012-08-04 14:41:18 -07:00 |
|
softark
|
7f71110240
|
[docs][guide][ja] improved translations (toc, upgrade, changes, quickstart and basics)
|
2012-08-05 02:34:43 +09:00 |
|
softark
|
5c96736737
|
[docs][blog][ja] minor improvements
|
2012-08-05 02:34:43 +09:00 |
|
Maurizio Domba
|
335d6a9401
|
Merge pull request #1127 from rawtaz/phpdoc-fix
Fix invalid HTML in PHPdoc for CMssqlCommandBuilder::applyLimit().
[ci skip]
|
2012-08-04 06:06:05 -07:00 |
|
Leo R. Lundgren
|
b4f888484c
|
Fix invalid HTML in PHPdoc for CMssqlCommandBuilder::applyLimit().
|
2012-08-04 02:45:14 +02:00 |
|
Qiang Xue
|
9b7c51dcdf
|
Merge pull request #1125 from tom--/master
docblocks for CDateTimeParser::parseInteger and parseAmPm were comments
|
2012-08-03 12:17:43 -07:00 |
|
tom--
|
8e8b61e369
|
two comment blocks should have been docblocks [ci skip]
|
2012-08-03 14:58:14 -04:00 |
|
Carsten Brandt
|
a7e5a51981
|
fixed typos in CHANGELOG
|
2012-08-03 18:36:15 +03:00 |
|
Carsten Brandt
|
fad0944e33
|
updated doc comments in CJavaScriptExpression
missing comments + wrong comments
|
2012-08-03 17:58:44 +03:00 |
|
Carsten Brandt
|
09c6f05985
|
Merge pull request #1124 from rawtaz/phpdoc-fix
Fix a bunch of @param and @return phpdoc errors in various files.
[ci skip]
|
2012-08-03 07:54:47 -07: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 |
|
Maurizio Domba
|
15e4a40783
|
Merge pull request #1119 from mdomba/1088-proper-CActiveForm-id
Fixes #1088 use proper id in CActiveForm when it's supplied in htmloptions
[ci skip]
|
2012-08-03 05:49:12 -07: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 |
|
Qiang Xue
|
bca3464a2b
|
Merge pull request #1111 from resurtm/243-web-service-generator-class
Fixes #243. WebService is now able to deal with the customized WSDL generator classes.
|
2012-08-03 05:08:23 -07: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 |
|
Maurizio Domba
|
d70691b415
|
Merge pull request #1116 from resurtm/1085-timestamp-behavior-test
Fixes #1085: CTimestampBehavior tests sometimes failed due to mistake of time measurement
|
2012-08-03 03:38:49 -07:00 |
|