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
7,316 Commits 10 Branches 79 Tags
949fe449ccf3b33d45cf7b1611b8045ba835e3e6
Commit Graph

7316 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Grant Furgiuele
44116c7c8b Merge branch 'yii2-docs-2340' of https://github.com/Skyh13/yii2 into yii2-docs-2340 2014-03-18 15:25:13 -05:00
Grant Furgiuele
ed2885c31d Changed comment again to actually be correct. This is also consistent with the draft of the definitive guide. 2014-03-18 15:23:59 -05:00
Grant Furgiuele
bc91853e3f Modified example in DataReader usage comment to reference a DB Command function which accepts a SQL string argument. 2014-03-18 15:23:58 -05:00
Grant Furgiuele
cf42b74f7c Changed comment again to actually be correct. This is also consistent with the draft of the definitive guide. 2014-03-18 15:21:43 -05:00
Qiang Xue
8e11ad0360 refactored code to use Instance::ensure() 2014-03-18 12:31:27 -04:00
David Renty
dde5a00ce3 Merge branch 'master' of https://github.com/yiisoft/yii2 
Conflicts:
	framework/base/Formatter.php
	tests/unit/framework/base/FormatterTest.php
 2014-03-18 17:31:11 +01:00
Qiang Xue
72c99663ff Refactored container. 2014-03-18 11:49:52 -04:00
Qiang Xue
43fb937a20 Added unit tests. 2014-03-18 10:45:25 -04:00
Carsten Brandt
b4fd5b5c46 updated german translations 2014-03-18 15:12:19 +01:00
Carsten Brandt
74bbc0eff1 typo fix 2014-03-18 13:37:19 +01:00
Alexander Makarov
28943a1d66 Added note about configuring nginx for HTTPS 2014-03-18 16:29:55 +04:00
Paul Klimov
3b9e6fc2bd Merge pull request #2791 from qiansen1386/patch-4 
typo fix in contoller.md
 2014-03-18 10:03:09 +02:00
东方孤思子（Paris·QianSen）
ba27e94f58 Update controller.md 2014-03-18 14:36:53 +08:00
Qiang Xue
530d7baabe fixed test break. 2014-03-18 00:23:12 -04:00
Qiang Xue
a3274c5ffc Fixed test break. 2014-03-18 00:13:02 -04:00
Qiang Xue
8c2e39235f Turn module and application into DI containers. 2014-03-17 23:57:01 -04:00
Qiang Xue
66abd5b8ab Added DI container implementation. 2014-03-17 23:22:45 -04:00
Qiang Xue
a3d6d8baee Merge pull request #2786 from schmunk42/feature/renamed-gii-templates 
fixes #2776 renamed default template folder
 2014-03-17 20:55:17 -04:00
Tobias Munk
21d02e1483 fixes #2776 renamed default template folder 2014-03-17 23:49:18 +01:00
Qiang Xue
c0f089c215 Merge pull request #2784 from schmunk42/feature/composer-docs 
updated composer docs
 2014-03-17 15:40:02 -04:00
Tobias Munk
302b7a7d8c Merge commit '1ccad3d97db122b71b84f222807e547b86687a12' into feature/composer-docs 2014-03-17 17:56:38 +01:00
Tobias Munk
36b41bad81 updated composer documentation 2014-03-17 17:56:27 +01:00
Alexander Makarov
1ccad3d97d Merge pull request #2783 from docsolver/patch-2 
Mistake in error message
 2014-03-17 19:36:47 +03:00
Vincent
41cc91771d Mistake in error message 
{max} was used instead of {min} in the error message for the min validator...
 2014-03-17 17:30:54 +01:00
Qiang Xue
d2c84606a9 Fixes #2775: Added yii\base\Application::bootstrap to support running bootstrap classes when starting an application 2014-03-17 11:57:44 -04:00
Qiang Xue
6b8107da85 Merge pull request #2780 from janisto/messages_fi 
Finnish translation
 2014-03-17 10:52:30 -04:00
Jani Mikkonen
3e1dd25800 Alter image validation messages. 2014-03-17 16:26:50 +02:00
Jani Mikkonen
ad10897ab4 Fix MIME types 2014-03-17 16:22:22 +02:00
Jani Mikkonen
0b71faa577 Merge branch 'master' of git://github.com/yiisoft/yii2 into messages_fi 2014-03-17 16:20:54 +02:00
Alexander Makarov
b649efe617 Merge pull request #2779 from janisto/patch-1 
small typo fix
 2014-03-17 17:15:48 +03:00
Jani Mikkonen
0361efbb31 small typo fix 2014-03-17 16:12:45 +02:00
Jani Mikkonen
8af8b77fa2 Finnish translation 2014-03-17 16:10:18 +02:00
Jani Mikkonen
67ca9c6cdb Add finnish translation to config 2014-03-17 16:10:05 +02:00
Qiang Xue
401ced69a8 doc fix. 2014-03-17 10:07:56 -04:00
Qiang Xue
b9287abf81 minor fixes. 2014-03-17 09:47:34 -04:00
Carsten Brandt
c3ce904af5 fixed detailview attributes 
fixes #2765
 2014-03-17 12:27:01 +01:00
David Renty
91e4ad5978 PSR-2 compliance 2014-03-17 12:02:26 +01:00
Alexander Makarov
9bc18fe5eb Adjusted code style guide 2014-03-17 13:45:47 +04:00
Paul Klimov
39f5df3173 Merge pull request #2774 from plusodinminus/patch-1 
small typo fix
 2014-03-17 10:27:14 +02:00
Алексей
0c59beb2ca small typo fix 
change usual code style to php code style
 2014-03-17 10:43:23 +03:00
Qiang Xue
c6a946ec79 Fixes #497: Removed \yii\log\Target::logUser and added \yii\log\Target::prefix to support customizing message prefix 2014-03-16 21:04:40 -04:00
Qiang Xue
f61734d412 Added $checkSession parameter to User::getIsGuest() and getId(). 2014-03-16 20:43:01 -04:00
Qiang Xue
7960ccdf50 Tab to spaces conversion. 2014-03-16 20:05:54 -04:00
Qiang Xue
8cb144c539 Merge pull request #2760 from AlexGx/fix-gridview-url 
fix GridView filterUrl bug
 2014-03-16 19:54:37 -04:00
AlexGx
234c2c0ebe changelog 2014-03-17 01:51:24 +02:00
AlexGx
a7046f27d0 fix 2014-03-17 01:45:39 +02:00
AlexGx
29f174cc73 Merge branch 'master' of git://github.com/yiisoft/yii2 into fix-gridview-url 2014-03-17 01:44:00 +02:00
Qiang Xue
9e33dedc4e Added return value for User::logout(). 2014-03-16 19:16:39 -04:00
AlexGx
23a669a394 upd for psr2 2014-03-17 00:21:45 +02:00
Qiang Xue
3e23f7add4 Merge pull request #2771 from lucianobaraglia/gii-psr2 
GII generated files changes according to PSR2
 2014-03-16 16:56:47 -04:00