Commit Graph

274 Commits

Author SHA1 Message Date
resurtm
64a6aa85f8 Merge branch 'master' of github.com:yiisoft/yii into 1980-better
Conflicts:
	CHANGELOG
2013-03-20 23:24:00 +06:00
resurtm
de416ba3a3 Enhancements to the #1980. 2013-03-20 23:21:59 +06:00
resurtm
35bdf64990 Fixes #2217: CHtml::radioButtonList() now supports $empty option. 2013-03-18 20:55:15 +06:00
resurtm
24d98144d8 Fixes: CHtml::activeTelField() used to display time input, not tel. 2013-03-15 20:25:00 +06:00
resurtm
e67f7c1612 Changes introduced in #2186 reverted. 2013-03-11 18:55:38 +06:00
Alexander Makarov
1e3a178d76 Merge pull request #2186 from resurtm/fixes-1955
Fixes #1955: Some validators used to cause warnings or errors in case non-scalar array typed values being checked.
2013-03-10 05:42:20 -07:00
resurtm
692390f2f5 CHtml::activeInputField() and CHtml::activeTextField() is not intended to display array values. 2013-03-10 16:09:49 +06:00
njasm
c2722a4f55 TABS Ident fix. 2013-03-09 12:32:27 +00:00
Paul Klimov
1210dcbe42 "CHtml::script()" and "CHtml::scriptFile()" have been updated allowing to compose HTML options. 2013-03-06 11:32:13 +02:00
Charles Pick
ba7b7c4dc6 1948 fix tiny whitespace issue 2013-02-12 14:50:55 +00:00
Charles Pick
e29f76747e Merge branch 'master' of github.com:yiisoft/yii into 1948-fix-html5-input-types 2013-02-12 14:33:55 +00:00
Charles Pick
c3df18844c 1948 minor tweaks 2013-02-12 14:31:29 +00:00
Charles Pick
d55fd536eb 1948 tidy up version info 2013-02-12 10:37:26 +00:00
Charles Pick
bda3ed4bd2 1948 tidy up version info 2013-02-12 10:36:01 +00:00
Charles Pick
afc69d47be 1948 tidy up whitespace 2013-02-12 10:35:32 +00:00
Charles Pick
d912cd0f63 1948 tidy up whitespace 2013-02-12 10:34:37 +00:00
Charles Pick
f4959b2e86 tidy up html5 input types 2013-02-12 10:29:39 +00:00
Anders Persson
144de3f745 optimized by replacing a function reference with direct syntax 2013-02-02 23:37:41 +01:00
tom tomsen
0680f4c994 addtional -> additional
fixed a typo
2013-01-21 16:03:20 +01:00
Abdul Malik Ikhsan
6247adaf26 change copyright symbol 2013-01-15 18:38:02 +07:00
Abdul Malik Ikhsan
46c8ef0d9a update copyright year
from 2011 to 2013
2013-01-15 17:28:17 +07:00
njasm
84bb237d50 Added missing activeSearchField() method to CHtml. And searchField() to CActiveForm. For creation of HTML input field of type search, that fixes #1743 2013-01-14 19:03:43 +00:00
resurtm
3f3f520917 Added NULL check into CHtml::value(), $attribute. 2012-12-23 14:12:49 +06:00
resurtm
694dcb885c Second parameter of the CHtml::value() doesn't support functions created by "create_function" anymore. 2012-12-21 21:19:26 +06:00
resurtm
fd5672978e Fixes CHtml::value() bug. 2012-12-21 17:04:09 +06:00
resurtm
fd9fb10904 Reverted PHPDoc typenames and added extra space for better readability. 2012-12-19 20:41:33 +06:00
resurtm
a6d98dc7ed #1861: PHP 5.2 testing issues and forgot about create_function. 2012-12-19 20:12:42 +06:00
resurtm
321e812e24 Fixes #1861. CHtml::value() didn't worked properly with array-typed $model parameter and integer-typed $attribute parameter. 2012-12-19 19:37:39 +06:00
Carsten Brandt
2eea4a2247 Fixed whitespace issues in doc comments of CJSON 2012-11-30 15:17:58 +01:00
Carsten Brandt
22cc1ffd0e baseID in CHtml::checkBoxList and radioButtonList
is now customizeable via htmlOptions
fix #144
2012-11-28 22:44:55 +01:00
Maurizio Domba (mdlap)
1fb5f1fe07 Fixes issue #1723 activeDropDown unselectValue should be optional to keep BC 2012-11-27 23:19:55 +01:00
Mark van den Broek
7d18b6547f Update framework/web/helpers/CJSON.php
Placed bracket on the next line to keep code style consistency.
2012-11-19 15:59:27 +01:00
Mark van den Broek
4a7e3aafbb Bugfix: issue #1726
Undefined variable: json




yii-1.1.12.b600af/framework/web/helpers/CJSON.php(332)




324     public static function decode($str, $useArray=true)
325     {
326         if(function_exists('json_decode'))
327             $json = json_decode($str,$useArray);
328 
329         // based on investigation, native fails sometimes returning null.
330         // see: http://gggeek.altervista.org/sw/article_20070425.html
331         // As of PHP 5.3.6 it still fails on some valid JSON strings
332         if(!is_null($json))
333             return $json;
2012-11-19 14:45:40 +01:00
Maurizio Domba
e804dd8b91 Merge pull request #1502 from l-nagash/master
Fixed #1492 jQuery.noConflict() issue
[ci skip]
2012-11-14 06:58:44 -08:00
Maurizio Domba (mdwork)
2eeb765c93 Fixes #1676 - proper grouping when no group field is specified 2012-11-09 11:04:21 +01:00
Maurizio Domba (mdwork)
9a058dc3d2 Reverted PR #1467 (Issue #1465, fixes related issue #1661) 2012-11-08 14:26:32 +01:00
Maurizio Domba (mdwork)
35da2c384f Reverted PR #1662 2012-11-08 14:23:02 +01:00
Evgeny Blinov
93113e30e0 Better naming 2012-11-07 19:22:32 +04:00
Evgeny Blinov
65b9673ef5 Coding style fix 2012-11-06 12:15:07 +04:00
Evgeny Blinov
0c96543e40 Fixing bug #1661
CHtml::beginForm() generate incorrect input-set when using together with CUrlManager::GET_FORMAT path
2012-11-06 12:11:21 +04:00
Alexander Kochetov
e3fdc786e8 $unselectOptions => $hiddenOptions 2012-10-19 16:02:13 +04:00
Alexander Kochetov
7d87c0d373 Refactoring more++ 2012-10-19 15:48:23 +04:00
Alexander Kochetov
8085a8e802 Refactoring more 2012-10-19 15:06:39 +04:00
Alexander Kochetov
8815f980de Refactoring 2012-10-19 12:44:17 +04:00
Alexander Kochetov
b94776c199 Hidden field name fix 2012-10-19 10:56:51 +04:00
Alexander Kochetov
ac0aa1f19a Methods comments 2012-10-18 19:39:44 +04:00
Alexander Kochetov
6c42393d9e CHtml::dropDownList() $name fix 2012-10-18 19:33:36 +04:00
Alexander Kochetov
ed0a963c23 CHtml::activeDropDownList() 2012-10-18 19:29:48 +04:00
Alexander Kochetov
4e3dbc35cc CHtml::dropDownList() 2012-10-18 19:20:45 +04:00
Alexander Makarov
15b602891e Merge branch 'cjavascript-encode-bug' of git://github.com/resurtm/yii into resurtm-cjavascript-encode-bug
Conflicts:
	CHANGELOG
2012-10-10 20:51:43 +04:00