php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-11-20 16:38:22 +08:00
Code Issues Packages Projects Releases Wiki Activity
5,352 Commits 10 Branches 79 Tags
fa353294bb59b793f8c3d2eaa54c70536ef7024c
Commit Graph

5352 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Qiang Xue
2310fe6ee4 Merge pull request #2111 from dizews/get-headers 
Added ability to get incoming headers
 2014-01-22 08:13:47 -08:00
Qiang Xue
af53c0f818 doc update. 2014-01-22 11:09:59 -05:00
Qiang Xue
e6e1a7bac0 Fixes #1958: beforeSubmit in yii.activeform is now executed after validation and before form submission 2014-01-22 11:04:56 -05:00
Qiang Xue
51c0231269 Merge pull request #1958 from 6pblcb/yiiActiveForm-beforeSubmit 
Transfer beforeSubmit function after global validation all fields forms
 2014-01-22 08:03:10 -08:00
Vladimir Zbrailov
4dabe605e3 added use http_get_request_headers and use getHeaders method in Gii module 2014-01-22 18:54:10 +04:00
Alexander Kochetov
e1459d4037 Yet one optimization 2014-01-22 18:39:53 +04:00
Qiang Xue
942370f8d2 Merge branch 'master' of git://github.com/yiisoft/yii2 2014-01-22 09:29:17 -05:00
Qiang Xue
b6575aa0d5 Fixes #1782 2014-01-22 09:28:59 -05:00
Carsten Brandt
954b0b5faf more path fixes for apidoc command 2014-01-22 15:28:20 +01:00
Qiang Xue
2a7b2e66cc Merge branch 'master' of git://github.com/yiisoft/yii2 2014-01-22 09:28:11 -05:00
Qiang Xue
9bde3ab613 Merge branch 'tests_improved_verify' of github.com:Ragazzo/yii2 into Ragazzo-tests_improved_verify 
Conflicts:
	apps/basic/tests/README.md
	apps/basic/tests/unit/models/LoginFormTest.php
 2014-01-22 09:27:11 -05:00
Carsten Brandt
b2eb8bcedf Merge pull request #2110 from pmoust/greek 
Greek core translation
 2014-01-22 06:24:26 -08:00
Alexander Makarov
3bf072a78f Fixed typo 2014-01-22 18:22:05 +04:00
Panagiotis Moustafellos
4730d11a7e fixed weird # in greek translation 2014-01-22 16:19:30 +02:00