Commit Graph

2619 Commits

Author SHA1 Message Date
Carsten Brandt
5aaa87c32e Merge branch 'master' of github.com:yiisoft/yii2
* 'master' of github.com:yiisoft/yii2:
  added comment
  better error message
  more asset bundle tests and docs
  fix issue #700
  doc fix
  added unit test for asset bundles
2013-10-11 11:59:55 +02:00
Carsten Brandt
982b7fe4ae better validation of module in gii module generator
fixes #963
2013-10-11 11:59:23 +02:00
Qiang Xue
ed85c16ff2 Merge pull request #962 from cebe/700-fix-js-asset-position-conflict
fix js asset position conflict
2013-10-10 17:44:28 -07:00
Carsten Brandt
7817514e86 fixed default status code for Response::redirect()
fixes #961
2013-10-11 02:42:32 +02:00
Carsten Brandt
72b4f4f717 added comment 2013-10-11 02:20:51 +02:00
Carsten Brandt
80cf9c8be9 better error message 2013-10-11 02:19:32 +02:00
Carsten Brandt
a922c41ee6 more asset bundle tests and docs 2013-10-11 02:14:59 +02:00
Carsten Brandt
abc1e0c2bb fix issue #700
adjust depended asset position or throw exception on conflict
2013-10-11 01:54:05 +02:00
Carsten Brandt
a6784f4ae9 doc fix 2013-10-11 01:14:40 +02:00
Carsten Brandt
0c113faf62 added unit test for asset bundles 2013-10-11 01:13:32 +02:00
Qiang Xue
8bff031fc2 Fixed the issue that dots in URL rules would match any character. 2013-10-10 11:23:20 -04:00
Alexander Makarov
817516adc5 Added missing return 2013-10-10 14:14:30 +04:00
Alexander Makarov
c7d7a3ce36 Fixed missing error page when AccessControl is used with default deny rule 2013-10-10 13:53:12 +04:00
Alexander Makarov
6488fe47ec Better phpdoc for chained method calls 2013-10-10 13:34:16 +04:00
Qiang Xue
fceb2d6e21 Fixes #957: Json::encode() doesn't handle empty object correctly. 2013-10-09 20:33:06 -04:00
Qiang Xue
aede3c9f47 Removed duplicated indexBy declaration. 2013-10-09 08:14:57 -04:00
Qiang Xue
35cf49732e Fixed the namespace. 2013-10-08 20:43:08 -04:00
Qiang Xue
b301f18113 Added installation commands to Installer. 2013-10-08 20:34:47 -04:00
Qiang Xue
9ef953a85c Yii extension composer installer WIP. 2013-10-07 23:39:41 -04:00
Alexander Makarov
1005b1ad45 Added link to the guide to readme 2013-10-08 01:51:19 +03:00
Qiang Xue
0904c3454e Fixed composer autoload declaration. 2013-10-06 12:14:30 -04:00
Qiang Xue
cf9104f7fd make grid view filtering work. 2013-10-05 21:56:06 -04:00
Carsten Brandt
057050f8a3 Merge pull request #943 from arisk/patch-2
Fixed typo
2013-10-05 08:25:29 -07:00
Larry Ullman
951b944b2a Edited password section 2013-10-05 08:44:36 -04:00
Aris Karageorgos
cbbb2cab76 Fixed typo 2013-10-05 19:42:50 +07:00
Larry Ullman
863a5cc015 Initial edits 2013-10-05 08:36:58 -04:00
Qiang Xue
293cb9d86f Fixed search form. 2013-10-04 20:35:58 -04:00
Alexander Makarov
65b8cc2126 Merge pull request #939 from egorpromo/simple-correction-of-unintelligible-description-of-cactchAll-property
Just simple correction of unintelligible description
2013-10-04 07:29:29 -07:00
egorpromo
536075c040 Just simple correction of unintelligible description 2013-10-04 21:17:13 +07:00
Alexander Makarov
6809773c77 Merge pull request #935 from aarondfrancis/master
Fix Issue #934
2013-10-03 15:44:21 -07:00
Aaron Francis
c5a34c534b Fix Issue #934
Fixes issue #934. Command is created for the selected database, not the default database.
2013-10-03 16:33:28 -05:00
Qiang Xue
38c0b197f9 Fixes #916: generation of class name from table name has problem. 2013-10-03 11:01:52 -04:00
Qiang Xue
8c9dadf362 Fixed DB validation handling for model generator. 2013-10-02 21:22:25 -04:00
Alexander Makarov
618f981112 Renamed i18n to be all lowecase when accessed as a property 2013-10-03 01:41:38 +04:00
Qiang Xue
bcc0cbeba8 Added doc about BaseDataProvider::getPagination(). 2013-10-02 08:29:52 -04:00
Carsten Brandt
3f88320595 second try to fix random memcache failure on travis
issue #877
2013-10-02 12:27:04 +02:00
Qiang Xue
c1f977cd45 Simplified the default file map for PhpMessageSource. 2013-10-01 22:57:08 -04:00
Qiang Xue
09a9191086 Fixes #927: doc typo. 2013-10-01 21:56:08 -04:00
Qiang Xue
d798cc791b Set totalCount. 2013-10-01 21:40:35 -04:00
Qiang Xue
fe58cbd56a doc update. 2013-10-01 21:35:56 -04:00
Qiang Xue
0035f23781 refactored data providers. 2013-10-01 21:35:35 -04:00
Carsten Brandt
2c30ddfcb0 added web\Controller::goBack() as shortcut
goBack() will redirect user to his returnUrl
fixes #925
2013-10-01 20:01:14 +02:00
Qiang Xue
d03d681583 Fixes #928: client validation should be applied to active attributes only. 2013-09-30 10:14:08 -04:00
Carsten Brandt
b4b9ad483a Added version information to redis 2013-09-30 14:42:05 +02:00
Carsten Brandt
8d4d0ee0bc Update RedisCache.php
added version information
2013-09-30 12:53:04 +02:00
Qiang Xue
d56bf3f00a Merge pull request #921 from ekerazha/master
Fix phpdoc.
2013-09-29 10:06:04 -07:00
ekerazha
64a33e7849 Fix phpdoc. 2013-09-29 18:18:59 +02:00
Qiang Xue
c4f4e52a5a fixed test break. 2013-09-29 12:16:20 -04:00
Qiang Xue
9e9b3548db refactor Exception::toArrayRecursive(). 2013-09-29 12:06:00 -04:00
Qiang Xue
a4a159633c Merge pull request #920 from bixuehujin/fixed-exception-toarray
Incorrect array representation when has previous exception
2013-09-29 09:04:17 -07:00