Commit Graph

3138 Commits

Author SHA1 Message Date
Qiang Xue
a43f8b2361 Fixes #2157: The '*' category pattern will match all categories that do not match any other patterns listed in I18N::translations 2014-01-26 12:44:27 -05:00
Carsten Brandt
1c8ace46d6 Merge PR #2136 branch 'detail-view-attributes' of https://github.com/creocoder/yii2
* 'detail-view-attributes' of https://github.com/creocoder/yii2:
  DetailView phpDoc
  CHANGELOG
  DetailView allow set label while attribute in string format
  DetailView correct regexp

Conflicts:
	framework/CHANGELOG.md
2014-01-26 17:21:20 +01:00
John Was
26564fb9b5 fixed code style for assignments inside if conditions 2014-01-26 17:00:43 +01:00
John Was
07ce08d970 updated helpers/BaseFileHelper::findFiles description and comments in messages/config.php 2014-01-26 15:28:55 +01:00
John Was
f90e594f4f remove _FLAG from PATTERN_FLAG constants 2014-01-26 15:03:24 +01:00
John Was
b2b10d1685 more unit tests for helpers/FileHelper::findFiles using new wildcard exceptions matching 2014-01-26 15:02:26 +01:00
Alexander Makarov
a2dca09e71 Modified phpdoc 2014-01-26 17:50:04 +04:00
Alexander Makarov
c8a7844324 Added changelog 2014-01-26 17:47:31 +04:00
Alexander Makarov
db7e4a4401 Added echo output in case there's return 2014-01-26 17:44:19 +04:00
Alexander Makarov
4023f4215a Allow writing widgets using return instead of echo in the run method to make it consistent with controller 2014-01-26 16:08:24 +04:00
Qiang Xue
698d66a2c1 fixed test break 2014-01-25 19:01:32 -05:00
Qiang Xue
1ebe46c64a Fixed test break. 2014-01-25 17:53:15 -05:00
Qiang Xue
26b556a6fb doc fix. 2014-01-25 16:55:21 -05:00
Qiang Xue
3df51e4c5f Merge pull request #2155 from dizews/timezone-in-base-formatter
add timeZone into base formatter
2014-01-25 13:54:02 -08:00
Vladimir Zbrailov
330ae053e6 remove timezone from i18n formatter 2014-01-26 01:42:36 +04:00
Qiang Xue
d8516b17ae doc fix 2014-01-25 16:32:40 -05:00
Qiang Xue
661fe24aab Merge pull request #2137 from Ana1oliy/issue-1659
issue #1659: released buildLimitOffset() for MSSQL
2014-01-25 13:27:42 -08:00
Vladimir Zbrailov
c8a9ed80c8 prevent changing public timezone 2014-01-26 00:51:17 +04:00
Vladimir Zbrailov
230f40c866 fix formatter 2014-01-26 00:32:21 +04:00
Vladimir Zbrailov
84bfc3fc88 add timeZone into base formatter 2014-01-25 23:51:35 +04:00
Alexander Makarov
ee8c0404bf minor code style and phpdoc fix 2014-01-25 14:07:07 +04:00
Alexander Makarov
c9eca1d596 Fixed refactoring 2014-01-25 13:35:27 +04:00
Aleksandr Zelenin
4f17c45f00 Fix typos in constant 2014-01-25 01:33:28 +04:00
Qiang Xue
f6dd6fa2e9 Renamed ActiveRecordInterface::createActiveRelation() to createRelation() 2014-01-24 14:46:53 -05:00
Qiang Xue
0dfc8b1f7c refactored BaseMailer about message file name generation. 2014-01-24 11:48:20 -05:00
Qiang Xue
370b05648a doc fix. 2014-01-24 10:26:05 -05:00
Qiang Xue
49c62e6846 typo 2014-01-24 09:29:19 -05:00
Qiang Xue
3dd3914a38 Fixes #2144: Html helper now supports rendering "data" attributes 2014-01-24 08:50:20 -05:00
peeradach001
f36ec8c9ca doc fix 2014-01-24 16:25:41 +07:00
Alexander Kochetov
4dcf22b94c DetailView phpDoc 2014-01-24 01:54:32 +04:00
Carsten Brandt
bc9b62c314 url of CSS and JS files registered in View can be url alias
fixes #2132, fixes #2133
2014-01-23 22:43:43 +01:00
Alexander Makarov
b5b18dafb9 Merge pull request #2134 from creocoder/gridview-typo
GridView typo fixed
2014-01-23 12:16:46 -08:00
Anatoliy Miller
9c97fe11cb issue #1659: released buildLimitOffset() for MSSQL 2014-01-24 04:10:55 +08:00
Alexander Kochetov
77d9f374f8 CHANGELOG 2014-01-24 00:07:26 +04:00
Alexander Kochetov
508908e9f7 DetailView allow set label while attribute in string format 2014-01-24 00:03:42 +04:00
Alexander Kochetov
cd8a948e1f GridView typo fixed 2014-01-23 23:59:02 +04:00
Alexander Kochetov
9d01d1fb07 DetailView correct regexp 2014-01-23 23:58:15 +04:00
Klimov Paul
1f4d94d5db AssetController default 'cssCompressor' command fixed. 2014-01-23 20:48:12 +02:00
Alexander Makarov
1e602adb6e - Fixed BaseFileHelper::localize docs.
- DbMessageSource now performs UNION ALL.
- Fixed message merging for php and po.
- Updated tests.
2014-01-23 20:34:46 +04:00
Alexander Makarov
f6c6fe2777 Merge branch 'master'
Conflicts:
	framework/CHANGELOG.md
2014-01-23 20:13:23 +04:00
Qiang Xue
c442bf63bf Merge pull request #2124 from iworker/master
Update QueryBuilder.php and Query.php
2014-01-23 07:57:41 -08:00
Ivan Pomortsev
71cc30505b Update CHANGELOG.md
Added one line about support of UNION ALL queries.
2014-01-23 18:41:19 +03:00
Ivan Pomortsev
a9286b899c Update QueryBuilder.php
Change <code>array_reduce</code> with anonimous function variant to easy string collection from pieces of unions.
2014-01-23 18:24:54 +03:00
Ivan Pomortsev
c9c59bdc26 Update Query.php
Using short array syntax.
2014-01-23 17:57:31 +03:00
Carsten Brandt
8735cdb54e doc link fixes 2014-01-23 15:28:12 +01:00
Ivan Pomortsev
7da3449d09 Update QueryBuilder.php
Change buildUnion method to be ready to accept parameters in <code>['all' => $all, 'query' => $query]</code> format for division to "UNION" and "UNION ALL" constructions.
2014-01-23 16:57:34 +03:00
Ivan Pomortsev
5f3d601b36 Update Query.php
Change passing parameters to array with two elements – 'all' which means if we use UNION or UNION ALL construction and 'query' which is our sql query that will be at right of construction.
2014-01-23 16:53:04 +03:00
Carsten Brandt
bf59a521cb subwidgets should be rendered in the same view 2014-01-23 13:06:18 +01:00
Carsten Brandt
8473dda39b fixed stringHelper dirname to return empty string
in case no dir is present
2014-01-23 12:04:24 +01:00
Carsten Brandt
9630c807a7 doc link fixes 2014-01-23 12:04:02 +01:00