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

3361 Commits

Author SHA1 Message Date
Rupert-RR
f088486bde Merge branch 'master' of git://github.com/yiisoft/yii into 2131-add-accept-header-parsing 
Merge from upstream.
 2013-03-21 20:21:47 +04:00
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
Paul Klimov
b8eaab4eaf Merged #2230: Fix using "having" with bound params in CActiveRecord::count() 2013-03-21 13:15:14 +02: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
ivokund
16e7bac6af Update CActiveFinder.php 
Adds the missing "params" array from the query object.
 2013-03-20 17:00:48 +02:00
Paul Klimov
ed7927ff8d "CDbCommandBuilder::createInCondition()" has been updated allowing to pass array of values with mixed keys for the single type column. 2013-03-20 13:22:54 +02:00
marsuboss
6da64c2844 Update CJuiButton.php 
Fix.
 2013-03-20 08:05:52 +01:00
resurtm
6ff26bd684 Merge pull request #2214 from resurtm/2121-MSSQL-CDbFixtureManager 
Fixes #2121: CMssqlSchema::resetSequence() incorrectly resets sequence.
 2013-03-18 08:28:37 -07: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
28a3c79185 Fixes #2121: CMssqlSchema::resetSequence() incorrectly resets sequence. 2013-03-17 11:00:19 +06:00
CeBe
097a3a2ce1 Enh #2135: Yii::t() messages in subfolders 
Manual merge of PR #2209 of @firsyura
 2013-03-15 23:20:08 +01:00
resurtm
c7cdc812a3 Fixes #2087: CLocale: getLocaleDisplayName() was only returning the language display name, not the full locale display name. 2013-03-15 22:28:25 +06: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
resurtm
0b47c5ffac Merge pull request #2208 from malyshev/master 
Issue #2205: CActiveForm the tag name for the error container tag is hardcoded
 2013-03-14 11:50:39 -07:00
resurtm
e7221397ab Fixes #1895: erroneous language attributes in french views. 2013-03-14 23:58:17 +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
resurtm
f40e8c0f2c fa_ir messages updated (PR #2104). 2013-03-14 22:31:02 +06:00
CeBe
d3d94b9188 reverted changes of pull request #2163 
changes are not compatible with PHP <5.3
 2013-03-12 19:57:16 +01:00
CeBe
307a190a83 some adjustments to pull request #2159 2013-03-12 17:11:50 +01:00
CeBe
c70936afd2 Merge pull request #2160 branch '2159-fix-delete-with-join' of https://github.com/serebrov/yii into serebrov-2159-fix-delete-with-join 
* '2159-fix-delete-with-join' of https://github.com/serebrov/yii:
  Fixes #2159 - problem with command builder for delete with joins.

Conflicts:
	CHANGELOG
 2013-03-12 16:53:54 +01:00
Carsten Brandt
3d3134a1e2 Merge pull request #2163 from odevyatkov/addParentException 
add previous exception to base yii exception classes as param
 2013-03-12 08:24:35 -07:00
CeBe
5b69201fa0 Fixed error in plural rules handling 
Add a rule that is always true if locale has no plural rules defined
fixes #2123
 2013-03-12 16:11:33 +01: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
f635a4c8a4 Error messages related to array value case changed. 2013-03-10 18:20:54 +06:00
Alexander Makarov
98364a0424 Merge pull request #2189 from NabiKAZ/master 
bug in translating fa_ir
 2013-03-10 04:41:13 -07:00
NabiKAZ
60bcf5ba56 Update yii.php 
bug in translating
 2013-03-10 15:01:25 +03:30
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
resurtm
ed635aa9e2 Some validators used to cause warnings or errors in case non-scalar array typed values being checked. 2013-03-09 22:12:18 +06:00
njasm
c2722a4f55 TABS Ident fix. 2013-03-09 12:32:27 +00:00
Alexander Makarov
4a75ecfc45 Upgraded HTMLPurifier to v4.5.0 2013-03-09 03:50:30 +04:00
Alexander Makarov
e63fd6293e Merge pull request #2183 from resurtm/Net_IDNA2 
Vendors: phlymail's Net_IDNA was replaced by PEAR Net_IDNA2.
 2013-03-08 15:38:30 -08:00
Alexander Makarov
52da9b7fed Merge pull request #2178 from ArnauAregall/aaregall-catalan-translation 
Catalan Translation
 2013-03-08 15:26:33 -08:00
resurtm
10d7999ba4 Vendors: phlymail's Net_IDNA was replaced by PEAR Net_IDNA2. 2013-03-08 23:46:34 +06:00
resurtm
fa4b384f67 CWebApplication::$controllerMap property: PHPDoc typo. 2013-03-08 23:03:11 +06:00