php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-11-17 06:48:59 +08:00
Code Issues Packages Projects Releases Wiki Activity
2,687 Commits 10 Branches 79 Tags
c2457f95e91d238c9494d25047bbcc6d65f29eab
Commit Graph

2687 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Luciano Baraglia
c2457f95e9 GII sub-modules support - see #871 2013-10-16 18:16:03 -03:00
Luciano Baraglia
bce3afcca2 Module::getModule and Module::hasModule support for sub-modules - see #983 2013-10-16 18:14:18 -03:00
Carsten Brandt
e574f10c8c fixed broken test after whitespace changes in view 2013-10-16 20:28:07 +02:00
Qiang Xue
b476847b70 Merge branch 'master' of github.com:yiisoft/yii2 
Conflicts:
	framework/yii/base/View.php
 2013-10-16 12:09:12 -04:00
Qiang Xue
3e159c9969 Removed the extra EOLs. 2013-10-16 12:07:09 -04:00
Alexander Makarov
ab7af0a64a Merge pull request #989 from egorpromo/add-new-line-before-generated-code-from-assetbundle 
I have add new line in methods that render code in the head and for body
 2013-10-16 08:55:19 -07:00
egorpromo
af966d529a I add new line in methods that render code in the head and for body 2013-10-16 22:09:03 +07:00
Qiang Xue
afcfb113d7 Merge pull request #981 from lucianobaraglia/master 
GII button styles
 2013-10-15 20:09:13 -07:00
Luciano Baraglia
4308e61000 GII update button style 2013-10-16 00:06:35 -03:00
Luciano Baraglia
ffd5235684 GII create object button style [skip ci] 2013-10-16 00:01:44 -03:00
Qiang Xue
2b2c22eee4 Fixes #980: Changed the default way of generating action URLs for ActionColumn. 2013-10-15 20:31:43 -04:00
Alexander Makarov
21342c6dce Merge pull request #976 from iJackUA/patch-1 
View. Default empty array value for $params
 2013-10-15 00:06:02 -07:00
iJackUA
253becaef5 View default value for $params 
To prevent Warning "Trying to get property of non-object" in case when nothing set to params, but you try to get some key (check is there something)

ArrayHelper::getValue($this->view->params, 'abc');
 2013-10-15 09:56:16 +03:00
Carsten Brandt
28d9ee7c31 adjusted cubrid version in schema quote 2013-10-15 05:47:55 +02:00
Carsten Brandt
a622254509 removed cubrid env from tavis.yml 2013-10-15 05:18:05 +02:00
Carsten Brandt
c1b6521d31 simplified cubrid db install on travis 2013-10-15 05:12:50 +02:00
Carsten Brandt
a1e5fa356e fixed cubrid schema test for pdo type 2013-10-15 04:53:33 +02:00
Carsten Brandt
f974e1a59f fixed validator test break 2013-10-15 04:43:52 +02:00
Carsten Brandt
598d01287b added cubrid specific pdo type casting 
cubrid pdo does not support PARAM_BOOL so we cast the value to integer
and store 0 and 1 instead

fixes #964
 2013-10-15 03:37:46 +02:00
Alexander Makarov
32865c7ddc Updated FileValidator tests 2013-10-15 01:48:05 +04:00
Alexander Makarov
8c1c3c59d9 Better AR connection init in tests 2013-10-15 01:39:19 +04:00
Alexander Makarov
5cf9992251 Removed @codeCoverageIgnore 2013-10-15 01:32:23 +04:00
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