Mirrors/yii
2
0
Fork 0
mirror of https://github.com/yiisoft/yii.git synced 2026-03-09 09:36:56 +01:00
Code Issues Packages Projects Releases Wiki Activity
4,962 Commits 3 Branches 54 Tags
d8d5ad658300035527bd2bd2ff471e0cdb53ffbb
Commit Graph

3339 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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