Commit Graph

255 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
52657ec5fb Fixes: CActiveForm::telField() used to display time input, not tel. 2013-03-15 20:27:30 +06:00
Sergey Malyshev
4cbbaef2ed Issue #2205: CActiveForm the tag name for the error container tag is hardcoded 2013-03-14 19:41:14 +02:00
njasm
c2722a4f55 TABS Ident fix. 2013-03-09 12:32:27 +00:00
Tomislav Biscan
aa527343c8 CJavaScriptExpressoin changed to CJavaScriptExpression in comments 2013-02-21 13:10:08 +01: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
d55fd536eb 1948 tidy up version info 2013-02-12 10:37:26 +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
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
Maurizio Domba (mdwork)
ac084c590f send CHtml::errorCss to JS file 2013-01-10 14:03:35 +01:00
Carsten Brandt
3f65dce4e4 Fixed transparent background for ImageMagick in CCaptchaAction
thanks to @manuel-84
https://github.com/yiisoft/yii/pull/1464#issuecomment-12046268
2013-01-09 17:18:13 +01:00
Tonin De Rosso Bolzan
8ccac75190 Javascript elseif => else if 2013-01-08 09:21:25 -02:00
Alexander Makarov
ece7f7d277 Merge branch 'cwidget-issue-150' of git://github.com/antonCPU/yii into antonCPU-cwidget-issue-150 2013-01-08 01:08:17 +04:00
Alexander Makarov
6e5ba54082 Fixes #1847: Added COutputCache::varyByLanguage to generate separate cache for different laguages 2013-01-08 01:04:36 +04:00
antoncpu
ae608d46b6 Merge branch 'master' of git://github.com/yiisoft/yii into cwidget-issue-150 2013-01-02 20:00:32 +02:00
Vadym Abramchuk
37b7132ff8 Fixed code style 2012-12-12 14:41:13 +02:00
Vadym Abramchuk
6429cb471a Vary COutputCache by language 2012-12-12 13:50:52 +02:00
resurtm
c089442867 ImageMagick checking code now takes into account supported image files. 2012-12-09 20:11:36 +06:00
antoncpu
9439e8a889 fixed ignoring $checkTheme param. 2012-12-02 12:36:09 +02:00
Alexander Makarov
2b4ab6115f CCaptchaAction::validate check wasn't working properly in some cases 2012-12-01 14:31:32 +04: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
resurtm
5d3d8a2a03 Catch-ups and additional fixes made by @SonkoDmitry after code reviewing were applied. 2012-10-22 22:38:55 +06:00
resurtm
0b13d7dae2 Merge remote-tracking branch 'origin/master' into imagick-captcha
Conflicts:
	CHANGELOG
2012-10-22 22:23:36 +06:00
Alexander Kochetov
486723805e else if => elseif 2012-10-03 10:20:14 +04:00
Nagash
1b165448af Fixed 1492: jQuery.noConflict() issue 2012-09-30 20:35:37 +03:00
resurtm
2def085718 CCaptchaAction: ImageMagick is now prefered over GD2. 2012-09-25 19:33:37 +06:00
resurtm
88717bde88 Better color creation. 2012-09-24 20:40:27 +06:00
resurtm
2ffdc7415d Reverted mistakenly removed newline. 2012-09-24 20:29:03 +06:00
resurtm
b8e5fa4df5 CCaptcha, CCaptchaAction: ImageMagick support. 2012-09-24 20:25:26 +06:00
Alexander Makarov
d865a3bab8 Fixes #1057 Removed SVN ids 2012-09-09 22:23:45 +04:00
mdomba (mdwork)
c9c7c796b9 grammar fix 2012-08-10 12:28:49 +02:00
mdomba (mdwork)
e56620c888 fixed some syntax and proper doc 2012-08-10 10:30:38 +02:00
mdomba (mdlap)
3fd13f9f91 remove second parameter on calls 2012-08-08 01:40:19 +02:00
mdomba (mdlap)
5973d891e0 refactored CJavascriptExpression->_construct to get cleaner code 2012-08-07 18:35:06 +02:00
mdomba (mdwork)
c89f31f886 Unify CJavascriptExpression usage 2012-08-07 16:01:39 +02:00
mdomba (mdwork)
524475f60c change strncmp with strpos 2012-08-07 15:13:44 +02:00
mdomba (mdwork)
df54c650b3 check fix 2012-08-07 15:07:03 +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
mdomba (mdwork)
302919cfae CCaptcha - set "dummy" as comment and added a description 2012-08-06 15:43:04 +02:00
mdomba (mdwork)
2db7d2a2b2 Reverting PR #1141 (Issue #1140) 2012-08-06 14:13:15 +02:00
mdomba (mdwork)
35bb8ce275 Fixes 1140 removed unnecessary dummy registerScript in CCaptcha 2012-08-06 10:28:35 +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
Alexander Makarov
ec2ba0581f Merge pull request #1030 from samdark/551-safer-way-of-using-cjavascript-encode-bc
Enh #551: Added $safe parameter to CJavaScript::encode. If set to true, 'js:' will not be allowed
2012-07-27 15:12:44 -07:00
Alexander Makarov
ada1cedc7d added CJavaScriptExpression while keeping BC 2012-07-27 01:54:19 +04:00
mdomba (mdwork)
5f372b7e91 Fixes #510 replaced live() with on() 2012-07-26 14:53:31 +02:00