Commit Graph

7547 Commits

Author SHA1 Message Date
Alexander Makarov
f03c689b02 typo fix 2013-10-17 15:37:56 +04:00
Alexander Makarov
38ccc9e793 Fixes #930: Added i18n docs about configuring message source 2013-10-17 15:10:11 +04:00
Carsten Brandt
eacfe0d004 Merge pull request #993 from lucianobaraglia/master
More on GII buttons [skip ci]
2013-10-17 04:08:22 -07:00
Carsten Brandt
f273e0542c Merge branch 'master' of github.com:yiisoft/yii2
* 'master' of github.com:yiisoft/yii2: (27 commits)
  Fixed typos
  fixes #995
  Fixed option merging in Console::prompt()
  changed default button style
  typo fix.
  Refactored getModule and hasModule.
  Added intl check to tests, better error reporting, credited Aura.Intl for the most complex test pattern
  Better MessageFormatter tests
  GII sub-modules support - see #871
  Module::getModule and Module::hasModule support for sub-modules - see #983
  removed needFix method
  Removed intl version check since it's very inconsistent and it seems bundled versions are always the same ones for the same PHP versions
  Fixes PHP 5.5 weird placeholder replacememt in case no arguments are provided at all (https://bugs.php.net/bug.php?id=65920).
  changed plural format for BaseListView
  applied new style of Yii::t params to all occurences
  fixed I18N handling of special param values and broken message tags
  adjusted I18N to be consistent with intl message formatting
  improved unit tests for ICU message formatter
  fixed regex for multiline patterns
  intl message parser now handles too many or too less args
  ...
2013-10-17 12:56:39 +02:00
Carsten Brandt
0ddd52c09a commented private property
fixes #997
2013-10-17 12:56:14 +02:00
Alexander Makarov
2205586858 Fixed typos 2013-10-17 12:51:58 +04:00
Alexander Makarov
6f9785a293 fixes #995 2013-10-17 12:30:41 +04:00
Luciano Baraglia
3e451455d9 More on GII buttons 2013-10-17 01:42:27 -03:00
Carsten Brandt
f716bdd70d Fixed option merging in Console::prompt()
defaults overided settings
2013-10-17 04:19:42 +02:00
Qiang Xue
6eb9785dd8 changed default button style 2013-10-16 20:34:31 -04:00
Qiang Xue
f6f02102ca typo fix. 2013-10-16 20:28:18 -04:00
Qiang Xue
8293e4d9d7 Refactored getModule and hasModule. 2013-10-16 20:27:18 -04:00
Qiang Xue
71222c1f1f Merge pull request #992 from lucianobaraglia/master
GII sub-modules support [skip ci]
2013-10-16 17:12:43 -07:00
Alexander Makarov
3667e031d5 Merge pull request #917 from yiisoft/i18n-icu
[Work in progress] I18n icu
2013-10-16 15:20:41 -07:00
Alexander Makarov
6b65ef5882 Added intl check to tests, better error reporting, credited Aura.Intl for the most complex test pattern 2013-10-17 02:15:46 +04:00
Alexander Makarov
71e2dcc6d5 Better MessageFormatter tests 2013-10-17 01:53:32 +04:00
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
Alexander Makarov
bf7a084224 removed needFix method 2013-10-17 01:04:42 +04:00
Alexander Makarov
da8f17955f Removed intl version check since it's very inconsistent and it seems bundled versions are always the same ones for the same PHP versions 2013-10-17 00:41:40 +04:00
Alexander Makarov
cdb9fbf679 Fixes PHP 5.5 weird placeholder replacememt in case no arguments are provided at all (https://bugs.php.net/bug.php?id=65920). 2013-10-17 00:36:57 +04:00
Carsten Brandt
677893eb79 changed plural format for BaseListView 2013-10-16 22:13:28 +02:00
Carsten Brandt
61fe888780 Merge branch 'master' into i18n-icu
* master: (103 commits)
  fixed broken test after whitespace changes in view
  Removed the extra EOLs.
  I add new line in methods that render code in the head and for body
  GII update button style
  GII create object button style [skip ci]
  Fixes #980: Changed the default way of generating action URLs for ActionColumn.
  View default value for $params
  adjusted cubrid version in schema quote
  removed cubrid env from tavis.yml
  simplified cubrid db install on travis
  fixed cubrid schema test for pdo type
  fixed validator test break
  added cubrid specific pdo type casting
  Updated FileValidator tests
  Better AR connection init in tests
  Removed @codeCoverageIgnore
  no xss for attribute error messages that contain {value}
  Clientvalidation {value} was not what has been validated
  moved getPdoType() to Schema.
  optimized datepick js code.
  ...
2013-10-16 22:04:17 +02:00
Carsten Brandt
6507e2e316 applied new style of Yii::t params to all occurences 2013-10-16 22:03:26 +02:00
Carsten Brandt
5d6bad5faa fixed I18N handling of special param values and broken message tags 2013-10-16 20:59:54 +02: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
Carsten Brandt
bbcee326be adjusted I18N to be consistent with intl message formatting 2013-10-16 15:59:39 +02:00
Carsten Brandt
2eb5abbfcb improved unit tests for ICU message formatter 2013-10-16 05:54:10 +02:00
Carsten Brandt
150b9366fc fixed regex for multiline patterns 2013-10-16 05:24:02 +02: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
Carsten Brandt
fa9a975dbb intl message parser now handles too many or too less args 2013-10-16 04:41:03 +02:00
Carsten Brandt
b8099cbf28 a parser that is able to deal with the right number of args 2013-10-16 04:14:58 +02: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