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

4998 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rupert-RR
82d23f8c3b Transferred data for unit tests from the test functions into data 
providers.
 2013-03-21 21:25:34 +04:00
Rupert-RR
be4ff11ee1 Undo accidental permissions change on bootstrap.php 2013-03-21 20:29:36 +04:00
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
783a2ea6f6 "CActiveRecordTest::testCountWithHavingRelational()" has been updated exposing issue #2201 2013-03-21 13:17:53 +02: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
ivokund
b6f4cdb888 Update CHANGELOG 2013-03-21 11:56:45 +02:00
ivokund
6e69cff0ef Update CHANGELOG 2013-03-21 11:09:43 +02: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
70190e3cf1 Merge pull request #2211 from resurtm/fixes-2184 
Fixes #2184: CDbHttpSession now supports MS SQL Server BLOB data type.
 2013-03-20 09:38:23 -07: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
Alexander Makarov
dc6aae584a Merge pull request #2228 from alanwillms/add-missing-brazilian-portuguese-translations-to-yii-definitive-guide 
Add some missing Brazilian Portuguese translations to Yii Definitive Guide
 2013-03-20 06:09:09 -07:00
Paul Klimov
180347abde Merge pull request #2227 from klimov-paul/2216-find-by-single-pk-by-array-with-mixed-keys 
Fix for #2216 Active Record find by pk using array with mixed keys
 2013-03-20 05:43:28 -07:00
Paul Klimov
d83d1c40ac Issue #2216 has been added to CHANGELOG 2013-03-20 13:25:46 +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
Paul Klimov
71388e1b69 Test method "CActiveRecordTest::testFindBySinglePkBySingleSizeArrayWithMixedKeys()" converted to "CActiveRecordTest::testFindBySinglePkByArrayWithMixedKeys()", checking both single and multy size pk arrays. 2013-03-20 13:20:05 +02:00
Paul Klimov
d8037f7b6d Test method "CActiveRecordTest::testFindBySinglePkBySingleSizeArrayWithMixedKeys()" has been added to expose issue #2216. 2013-03-20 13:09:10 +02:00
Maurizio Domba
dea272cd13 Merge pull request #2226 from marsuboss/patch-1 
CJuiButton.php doc update
[ci skip]
 2013-03-20 00:31:02 -07:00
marsuboss
6da64c2844 Update CJuiButton.php 
Fix.
 2013-03-20 08:05:52 +01:00
Alan Willms
d8d5ad6583 Add test.functional.txt Brazilian Portuguese translation to Yii Definitive Guide. 2013-03-19 13:36:22 -03:00
Alan Willms
09b44c861f Add test.unit.txt Brazilian Portuguese translation to Yii Definitive Guide. 2013-03-19 13:16:31 -03:00
Alan Willms
be07a411c9 Add test.fixture.txt Brazilian Portuguese translation to Yii Definitive Guide. 2013-03-19 12:41:45 -03:00
Alan Willms
d2108af695 Add test.overview.txt Brazilian Portuguese translation to Yii Definitive Guide. 2013-03-19 12:14:25 -03:00
Alan Willms
103e9944a3 Add upgrade.txt Brazilian Portuguese translation to Yii Definitive Guide. 2013-03-19 11:14:39 -03:00
Alan Willms
2ce52ab527 Correct one section title in Brazilian Portuguese table of contents of Yii Definitive Guide. 2013-03-19 11:11:31 -03:00
Alan Willms
d8f79e9d96 Add new translator name and change copyright period to 2008-2013 in Brazilian Portuguese index of Yii Definitive Guide. 2013-03-19 11:10:36 -03:00
Alan Willms
d6496b4259 Add extension.integration.txt Brazilian Portuguese translation to Yii Definitive Guide. 2013-03-19 11:08:56 -03:00
Alan Willms
4c2390f467 Add extension.create.txt Brazilian Portuguese translation to Yii Definitive Guide. 2013-03-19 11:08:25 -03: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
f84e8452bd Merge pull request #2218 from resurtm/fixes-2217 
Fixes #2217: CHtml::radioButtonList() now supports $empty option.
 2013-03-18 08:25:08 -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
9c0f85fc51 CHANGELOG adjustment for #2209 2013-03-15 23:23:39 +01: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
2f7a799062 Added #135 back in changelog, which got lost somehow.. 2013-03-15 00:28:14 +04:00
Rupert-RR
d4f53a8f3c Moved position of line to follow numerical order. 2013-03-15 00:24:25 +04:00