Mirrors/yii
2
0
Fork 0
mirror of https://github.com/yiisoft/yii.git synced 2026-03-04 07:14:06 +01:00
Code Issues Packages Projects Releases Wiki Activity
4,998 Commits 3 Branches 54 Tags
82d23f8c3b8a25f94de4322d56ada388b8bf2f7c
Commit Graph

1304 Commits

Author SHA1 Message Date
Rupert-RR
2ae1700233 Added unit test file for CHttpRequest for the methods 
parseAcceptHeader() and compareAcceptTypes().
Modified the regexp in parseAcceptHeader() to accept wildcards in the
path.
Modified the description of compareAcceptTypes() to better reflect the
comparison result (higher preference returns lower value, so that most
preferred is first in the array).
 2013-03-21 20:19:56 +04:00
Rupert-RR
ae6bc4a99a parseAcceptHeader() function description tidy up. 2013-03-21 14:56:03 +04:00
Rupert-RR
57befeead0 Typo corrections and code tidy up. 2013-03-21 14:47:23 +04:00
Rupert-RR
81939010d9 Merge branch 'master' of git://github.com/yiisoft/yii into 2131-add-accept-header-parsing 
Upstream merge.
 2013-03-21 10:26:08 +04:00
Rupert-RR
c255592623 Altered parseAcceptHeader() to use only one regexp. 
Thanks to Ka on StackExchange for this expression.
 2013-03-21 10:23:55 +04:00
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
00192d0e7c Merge branch 'master' of github.com:yiisoft/yii into fixes-2184 
Conflicts:
	CHANGELOG
 2013-03-20 22:37:11 +06:00
resurtm
35bdf64990 Fixes #2217: CHtml::radioButtonList() now supports $empty option. 2013-03-18 20:55:15 +06:00
Rupert-RR
1c0fb69add Typo corrections 2013-03-18 15:03:25 +04:00
Rupert-RR
67b285d25b Merge remote-tracking branch 'upstream/master' into 
2131-add-accept-header-parsing

Conflicts:
	CHANGELOG
 2013-03-18 14:50:00 +04:00
Rupert-RR
e3897e85e2 Separated out parse and compare functions. 
Reduced regular expression count to 2 from 3.
Modified MIME type array map structure.
 2013-03-18 14:45:39 +04:00
resurtm
52657ec5fb Fixes: CActiveForm::telField() used to display time input, not tel. 2013-03-15 20:27:30 +06:00
resurtm
24d98144d8 Fixes: CHtml::activeTelField() used to display time input, not tel. 2013-03-15 20:25:00 +06:00
resurtm
0bfbceed61 Remove unneeded space. 2013-03-15 15:51:16 +06:00
resurtm
4e658d7507 Fixes #2184: CDbHttpSession now supports MS SQL Server BLOB data type. 2013-03-15 15:49:37 +06:00
Rupert-RR
a5b8240347 Merge remote-tracking branch 'upstream/master' into 
2131-add-accept-header-parsing

Conflicts:
	CHANGELOG
 2013-03-15 00:02:17 +04: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
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
Alexander Makarov
0fde5cf9fc Merge pull request #2172 from klimov-paul/1724-Allow-script-html-options 
Issue #1724: allow script html options.
 2013-03-09 11:55:37 -08:00
resurtm
173d4c8d42 punycode.js updated from 1.1.1 (June 27, 2012) to 1.2.0 (October 10, 2012). 2013-03-09 22:33:55 +06:00
njasm
c2722a4f55 TABS Ident fix. 2013-03-09 12:32:27 +00:00
resurtm
fa4b384f67 CWebApplication::$controllerMap property: PHPDoc typo. 2013-03-08 23:03:11 +06:00
Paul Klimov
847a786555 Code intending at "CClientScript" has been fixed: spaces have been replaced by tabs. 2013-03-06 13:45:05 +02:00
Paul Klimov
acaac347a1 Merge branch 'master' of git://github.com/yiisoft/yii into 1724-Allow-script-html-options 2013-03-06 13:41:48 +02:00
Paul Klimov
a92dfe544b "CClientScript::renderScriptBatch()" has been refactored allowing to group scripts with the same HTML options. 2013-03-06 13:36:33 +02:00
Paul Klimov
10d356c28a E_NOTICE at "CClientScript::renderScriptBatch()" has been fixed. 2013-03-06 13:28:22 +02:00
Paul Klimov
4299c0d309 "CClientScript" has been updated allowing to register scripts with HTML options. 2013-03-06 13:25:31 +02:00
Paul Klimov
a046e44e95 "CClientScriptTest" has been updated allowing to register script files with html options. 2013-03-06 12:41:20 +02: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
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
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
Alexander Makarov
e37a9fe3e2 Refactored CHttpRequest::getDelete and CHttpRequest::getPut not to use _restParams directly 2013-03-06 02:08:13 +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
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
Artem
072bebb432 Update framework/web/CClientScript.php 
fixed error
 2013-02-26 11:12:23 +02:00
Tomislav Biscan
aa527343c8 CJavaScriptExpressoin changed to CJavaScriptExpression in comments 2013-02-21 13:10:08 +01:00
Rupert-RR
6a864f9890 Enh #2131: Added Accept header parsing to CHttpRequest to give an array 
of accepted types in order of preference
 2013-02-20 18:46:43 +04:00
Carsten Brandt
61dbc00c84 Merge pull request #2024 branch '2023-chttprequest-stripslashes' of https://github.com/etienneq/yii into etienneq-2023-chttprequest-stripslashes 
* '2023-chttprequest-stripslashes' of https://github.com/etienneq/yii:
  added Changelog
  fix: empty array were not handled
  using tabs for indentation
  CHttpRequest::stripSlashes() changed to modify array keys as well

Conflicts:
	CHANGELOG
 2013-02-13 04:20:16 +01: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