Commit Graph

7316 Commits

Author SHA1 Message Date
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
Carsten Brandt
aacbdd83f7 Merge pull request #2138 from dilip-vishwa/patch-1
Updated doc about using jar files from other location
2014-01-23 13:30:44 -08:00
Qiang Xue
c43aa301fd Merge pull request #2135 from thiagotalma/master
Ensure that the table prefix is used when generating the class name.
2014-01-23 13:04:24 -08:00
Dilip
a3a544a344 Updated doc about using jar files from other location
Updated doc about using jar files such as compiler.jar and yuicompressor.jar from other location then the default specified.
2014-01-24 02:13:40 +05:30
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
Thiago Talma
d92a23536c Ensure that the table prefix is used when generating the class name. 2014-01-23 18:03:30 -02: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
Klimov Paul
9e9c52e91a Merge branch 'master' of github.com:yiisoft/yii2 2014-01-23 20:45:06 +02:00
Alexander Makarov
ce335616a0 Merge pull request #2119 from yiisoft/i18n-language-fallback
Fixes #2079
2014-01-23 08:49:24 -08: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
9d986daf4f Update QueryBuilderTest.php
Comment test because it proceed an errors when tries to run at mssql and other DBMS.
2014-01-23 18:35:55 +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
Qiang Xue
0eb9ff1ecf Update test-fixture.md 2014-01-23 10:00:48 -05: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
Carsten Brandt
33b53fa55d added apidoc template based on twitter bootstrap
issue #1797
2014-01-23 15:27:35 +01:00
Ivan Pomortsev
dd79325a0a Update QueryBuilderTest.php
Add test for UNION/UNION ALL function.
It could be useful to use "phpunit --group=db --filter testBuildUnion" command for run it.
2014-01-23 17:03:32 +03: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
Carsten Brandt
79a14e7a4e created apidoc generator online template for yiiframework.com 2014-01-23 12:03:31 +01:00
Carsten Brandt
35cd2bff25 apidoc command: fixed vendor path 2014-01-23 10:40:10 +01:00
Ivan Pomortsev
8109708b37 Update Query.php
Forget one ";" :D
2014-01-23 09:08:59 +03:00
Ivan Pomortsev
5d3fd930d8 Update QueryBuilder.php
Delete some spaces from result string.
2014-01-23 09:05:41 +03:00
Ivan Pomortsev
01c89ea3da Update Query.php
Change union method to accept also <code>$all</code> variable. TRUE means that we must results <code>UNION ALL</code> construction, FALSE – that <code>UNION</code>.
2014-01-23 08:51:15 +03:00
Ivan Pomortsev
1ea895e22b Update QueryBuilder.php
Fixed some errors – syntax with ";" after closure function and also moved building of unions queries into this function.
2014-01-23 08:45:29 +03:00
Ivan Pomortsev
12cbaf90b5 Update QueryBuilder.php
Change using of implode to convert array of queries to union to array_reduce. Result of this changing is that code feel difference between two selects that connects with UNION and two selects that connects with UNION ALL.
2014-01-23 07:47:48 +03:00
Qiang Xue
f39b1e4bb8 changelog fix. 2014-01-22 22:39:37 -05:00
Qiang Xue
757a2ef99b Merge pull request #2106 from danschmidt5189/2103-rename-accessdeniedhttpexception
#2103 improves http exception consistency and adds new subclasses
2014-01-22 19:37:04 -08:00
Daniel Schmidt
041f6aac6c Removed temp class 2014-01-22 19:33:39 -08:00
Daniel Schmidt
d03b2add89 Condenses changelog notes to 1 line (#2103) 2014-01-22 19:32:56 -08:00
Daniel Schmidt
087943cd14 Removes Map file uploaded accidentally 2014-01-22 19:26:47 -08:00
Daniel Schmidt
40090577c5 Merge branch 'master' of git://github.com/yiisoft/yii2 into 2103-rename-accessdeniedhttpexception 2014-01-22 19:23:51 -08:00
Daniel Schmidt
7fef8cf0cf Adds docblock comments and HTTP spec links for the new HTTP Exception classes (#2103) 2014-01-22 19:23:39 -08:00
Alexander Makarov
8bdc437bc2 Fixes #2079:
- i18n now falls back to `en` from `en-US` if message translation isn't found
- View now falls back to `en` from `en-US` if file not found
- Default `sourceLanguage` and `language` are now `en`
2014-01-23 04:51:17 +04:00
Qiang Xue
a5968a6ac6 Added beforeRun() and afterRun() to yii\base\Action 2014-01-22 16:36:00 -05:00
Qiang Xue
c74db68ce7 Fixes #1974. 2014-01-22 12:55:35 -05:00
Alexander Makarov
56ab34767c Merge pull request #2114 from thiagotalma/master
Adjustment the translation into Portuguese of Brazil.
2014-01-22 09:14:22 -08:00
Thiago Talma
8dd2720fa9 Adjustment the translation into Portuguese of Brazil. 2014-01-22 15:09:35 -02:00