Commit Graph

4893 Commits

Author SHA1 Message Date
Alexander Makarov
52da9b7fed Merge pull request #2178 from ArnauAregall/aaregall-catalan-translation
Catalan Translation
2013-03-08 15:26:33 -08:00
Maurizio Domba
5f52743b1e Merge pull request #2182 from resurtm/CWebApplication-controllerMap-typo
CWebApplication::$controllerMap property: PHPDoc typo.
[ci skip]
2013-03-08 09:07:23 -08:00
resurtm
fa4b384f67 CWebApplication::$controllerMap property: PHPDoc typo. 2013-03-08 23:03:11 +06:00
ArnauAregall
de69f137f0 Added Catalan Translation. 2013-03-08 16:38:18 +01:00
Maurizio Domba (mdwork)
6827b8e1e0 doc fix 2013-03-07 13:30:26 +01:00
Alexander Makarov
fa787ce919 Merge pull request #2170 from yiiframework-com-ua/uk_docs
Fixing typos, PHPDocs
2013-03-06 16:05:59 -08:00
borales
aa1a7c9fc0 Replacing spaces with tabs, removing dots
[ci skip]
2013-03-06 21:07:47 +02:00
borales
6d19a150d4 Replacing spaces with tabs, removing dots
[ci skip]
2013-03-06 20:59:38 +02:00
borales
78df92fb92 Replacing spaces with tabs
[ci skip]
2013-03-06 08:56:25 +02:00
borales
41b1dbb887 Replacing spaces with tabs
[ci skip]
2013-03-06 08:54:59 +02:00
borales
06ae20821e Replacing spaces with tabs
[ci skip]
2013-03-06 08:52:32 +02:00
borales
2f68a75235 Replacing spaces with tabs
[ci skip]
2013-03-06 08:48:59 +02:00
Alexander Makarov
242b8d7312 Revert "added changelog line for #1866"
This reverts commit c269a68a6a.
2013-03-06 04:00:04 +04:00
Alexander Makarov
1b8c6d4d17 Revert "Merge branch 'master' of git://github.com/horechek/yii into horechek-master"
This reverts commit c6670657b7, reversing
changes made to 903c0a991f.
2013-03-06 03:59:36 +04:00
borales
07975cad64 Fixing spaces
[ci skip]
2013-03-06 01:06:46 +02:00
Alexander Makarov
6edf25f97d Fixes #2069: Upgraded jQuery BBQ Plugin to 1.4pre to fix jQuery compatibility problems 2013-03-06 02:52:33 +04:00
borales
a7af2c5371 Fixing some typos, PHPDocs
[ci skip]
2013-03-06 00:24:35 +02:00
Alexander Makarov
356c00247e Fixes #2048: AR now uses alias from CActiveRecord::getTableAlias instead of always using default "t" 2013-03-06 02:21:24 +04:00
Alexander Makarov
f0613e5fce Merge branch 'patch-1' of git://github.com/s-larionov/yii into s-larionov-patch-1 2013-03-06 02:11:07 +04:00
Alexander Makarov
e37a9fe3e2 Refactored CHttpRequest::getDelete and CHttpRequest::getPut not to use _restParams directly 2013-03-06 02:08:13 +04:00
Alexander Makarov
bfe991e4cf added changelog line for #1997 2013-03-06 01:48:28 +04:00
Alexander Makarov
bf9ce39247 Merge branch 'gettextMessageSourceCachingFix' of git://github.com/odevyatkov/yii into odevyatkov-gettextMessageSourceCachingFix 2013-03-06 01:44:22 +04:00
Alexander Makarov
c269a68a6a added changelog line for #1866 2013-03-06 01:41:01 +04:00
Alexander Makarov
c6670657b7 Merge branch 'master' of git://github.com/horechek/yii into horechek-master 2013-03-06 01:33:33 +04:00
Alexander Makarov
903c0a991f Merge pull request #2146 from armab/patch-1
Update framework/validators/CEmailValidator.php
2013-03-05 13:14:49 -08:00
Alexander Makarov
cbd4d03f05 Merge remote-tracking branch 'refs/remotes/origin/master' 2013-03-06 00:58:53 +04:00
Alexander Makarov
0eec0592ca updated UPGRADE 2013-03-06 00:58:19 +04:00
Alexander Makarov
12790190a3 Merge pull request #2167 from klimov-paul/135-ActiveRecord-count-respect-group-and-having
Issue #135: CActiveRecord::count() respects group and having
2013-03-05 12:56:47 -08:00
Maurizio Domba (mdwork)
4abff222b8 shortened comments for easier reading 2013-03-05 10:12:22 +01:00
Maurizio Domba
777e1a540f Merge pull request #2152 from acorncom/filevalidator-mimetype-check
Added in Fileinfo PECL extension check for CFileValidator
[ci skip]
2013-03-05 00:51:23 -08:00
Alexander Makarov
7b9e0bca74 Merge pull request #2168 from acorncom/http-session-doc-fix
Fixed inaccurate information about default location for session savePath
2013-03-04 16:22:58 -08:00
David Baker
c26e3198dc Fixed inaccurate information about default location for session savePath
Session's save path is set to session.save_path by default.  On
some distros, that is set to /tmp, but it isn't always. Updated the
docs to reflect that.
2013-03-04 13:23:48 -07:00
Paul Klimov
ff226c8a1c Issue #135 has been added to CHANGELOG. 2013-03-04 15:49:27 +02:00
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
Maurizio Domba
b2267647c1 Merge pull request #2162 from yiiframework-com-ua/uk_docs
[UK][Guide] Fixing typo
[ci skip]
2013-03-03 00:30:40 -08:00
borales
602b08ebca [UK][Guide] Fixing typo [ci skip] 2013-03-03 09:58:00 +02:00
Alexander Makarov
7c351bc8ea Merge pull request #2161 from resurtm/CListIterator-typo-fix
PHPDoc typo fix.
2013-03-02 14:56:36 -08:00
resurtm
3b4ae0690e PHPDoc typo fix. 2013-03-03 00:48:06 +06:00
Alexander Makarov
dc0f51a505 Merge pull request #2155 from nsanden/typo-fix-cdbfixturemanager
fixed typo in cdbfixturemanager doc
2013-02-28 12:51:07 -08:00
nsanden
4332904b84 fixed type in cdbfixturemanager doc 2013-02-28 09:35:42 -08:00
acorncom
d34d1760b3 Updated description 2013-02-27 11:41:29 -07:00
David Baker
9debbbba8f Added in Fileinfo PECL extension check 2013-02-26 17:11:42 -07:00
Artem
072bebb432 Update framework/web/CClientScript.php
fixed error
2013-02-26 11:12:23 +02:00
armab
306e3bf9c9 CHANGELOG line for #2146 [armab] 2013-02-24 14:15:47 +02:00
armab
7b54a509c8 Update framework/validators/CEmailValidator.php
If fsockopen error "Connection refused" (error code: 61) is reached, yii hangs with uncatched 500 error code.

Output html code:
<h1>PHP Error [2]</h1>
<p>fsockopen() [<a href='function.fsockopen'>function.fsockopen</a>]: unable to connect to mail.somedomain.com:25 (Connection refused)</p>
2013-02-23 00:35:53 +02:00
Alexander Makarov
19e9f34cef Merge pull request #2144 from softark/docs-ja
docs/blog/ja/prototype.scaffold.txt updated
2013-02-22 04:51:30 -08:00
softark
dd61c62474 docs/blog/ja/prototype.scaffold.txt updated 2013-02-22 21:49:20 +09:00
Alexander Makarov
2370a9ef06 Merge pull request #2138 from B-Scan/small-typo-fix-cactiveform
CJavaScriptExpressoin changed to CJavaScriptExpression in comments
2013-02-21 04:36:43 -08:00
Tomislav Biscan
aa527343c8 CJavaScriptExpressoin changed to CJavaScriptExpression in comments 2013-02-21 13:10:08 +01:00