Commit Graph

7547 Commits

Author SHA1 Message Date
Alexander Makarov
d75ad87e06 Merge branch 'add-tests' of github.com:suralc/yii2 into suralc-add-tests
Conflicts:
	framework/yii/validators/RegularExpressionValidator.php
2013-10-15 01:31:59 +04:00
Carsten Brandt
8e4067ec5e no xss for attribute error messages that contain {value} 2013-10-14 20:33:42 +02:00
Carsten Brandt
266f4f9843 Clientvalidation {value} was not what has been validated
also fixed some inconsistency between client and server validation.
2013-10-14 20:23:34 +02:00
Qiang Xue
8899aaeb5b moved getPdoType() to Schema. 2013-10-14 08:28:56 -04:00
Qiang Xue
8b52824362 optimized datepick js code. 2013-10-13 17:27:53 -04:00
Carsten Brandt
6544db48dc consistent summary display for ListView and GridView
Total 0 items. when list is empty.
and showing x out of x for n>0 and paging on.
2013-10-13 21:43:51 +02:00
Qiang Xue
f2e245feb4 Merge pull request #972 from cebe/grid-filter-only-active
Filter only active attributes in gridview
2013-10-13 11:56:04 -07:00
Carsten Brandt
5ad8fe5f45 Filter only active attributes in gridview
When we do not want an attribute to be searched we do not define it in
the filter model, or mark it inctive in the scenario when we use the
original model.
GridView should not try to access the attribute then and automatically
not display the filter field.
2013-10-13 19:56:12 +02:00
Carsten Brandt
4050a4b211 Merge branch 'master' of github.com:yiisoft/yii2
* 'master' of github.com:yiisoft/yii2:
  fixes issue with debugmodule initializing view component too early
2013-10-13 19:50:59 +02:00
Carsten Brandt
1600889f4e added isAttributeActive to Model
consistent api for safe and required
2013-10-13 19:50:14 +02:00
Qiang Xue
9820dcef5a Merge pull request #970 from cebe/929-fixes-debug-module-preload-view-conflict
fixes issue with debugmodule initializing view component too early
2013-10-13 09:53:17 -07:00
Carsten Brandt
cba8ec7310 fixes issue with debugmodule initializing view component too early
fixes #929
2013-10-13 15:41:14 +02:00
Carsten Brandt
a1e6c16e39 Merge branch 'master' of github.com:yiisoft/yii2
* 'master' of github.com:yiisoft/yii2:
  Fixes #968: clientOptions should not be ignored when enabling internationalization.
  minor doc fix.
2013-10-13 15:20:16 +02:00
Carsten Brandt
3a981e26da improved errorhandler output
when error occurs while handling errors output was not readable in web
context
2013-10-13 15:19:20 +02:00
Qiang Xue
bc743a32b7 Fixes #968: clientOptions should not be ignored when enabling internationalization. 2013-10-12 20:52:41 -04:00
Qiang Xue
2ae5c23d48 minor doc fix. 2013-10-11 20:41:59 -04:00
Carsten Brandt
ee89134ffe make db\Command::getPdoType() protected
fixes #964
2013-10-11 14:51:07 +02:00
Carsten Brandt
300c866be2 adjusted composer.json for smarty and twig
not need to suggest packages in core. They are required by extension
composer.json anyway.
2013-10-11 14:02:15 +02:00
Carsten Brandt
6ba6fbe947 mention response component in controller.md 2013-10-11 12:51:27 +02:00
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
Carsten Brandt
d442f05631 elasticsearch find by simple condition 2013-10-07 17:57:39 +02: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