php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-11-20 08:27:21 +08:00
Code Issues Packages Projects Releases Wiki Activity
7,892 Commits 10 Branches 79 Tags
06be8f7a8abec1bde2c39f01265f9fd6bb8eb57c
Commit Graph

7892 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexander Makarov
5c3e4fa4ba Adjusted unit tests, added description to docs 2014-03-19 23:07:56 +04:00
Alexander Makarov
39b0c454e1 Default values init moved to a method that should be called manually 2014-03-19 23:04:48 +04:00
Qiang Xue
0782a94541 Merge pull request #2818 from RusAlex/319_strict_comparison_theme 
better to use strict comparison as much as possible
 2014-03-19 11:53:51 -04:00
Alexander Pletnev
a73abd9300 better to use strict comparison as much as possible 2014-03-19 19:51:51 +04:00
David Renty
75b66de11a New french messages 2014-03-19 16:51:47 +01:00
Alexander Makarov
3ab3f996b7 Merge branch 'nav-active' of github.com:Alex-Code/yii2 into Alex-Code-nav-active 
Conflicts:
	extensions/bootstrap/CHANGELOG.md
	extensions/bootstrap/Nav.php
 2014-03-19 18:23:57 +04:00
Alexander Makarov
32365e8180 Fixes #2805 2014-03-19 18:15:04 +04:00
Alexander Makarov
b66427f8c7 Fixes #2726: ActiveRecord now fills default values on creating new instance of the model if defaults are available from DB schema 2014-03-19 18:06:20 +04:00
Qiang Xue
772f56f00f Merge pull request #2813 from lucianobaraglia/master 
Updated spanish translation
 2014-03-19 09:50:53 -04:00
Luciano Baraglia
f8e0e52d39 Removed app translation file 2014-03-19 10:50:01 -03:00
Qiang Xue
bf1e66e196 Merge pull request #2814 from djfly/patch-3 
Update yii.php
 2014-03-19 09:49:52 -04:00
ff
c38185b16d Update yii.php 2014-03-19 21:47:18 +08:00
Luciano Baraglia
218f2caca0 Typo fix 2014-03-19 10:41:31 -03:00
Luciano Baraglia
1f7d7eb761 Updated Spanish translation 2014-03-19 10:39:27 -03:00
Qiang Xue
4374616302 throw exception when UrlManager is not properly configured in console mode. 2014-03-19 09:36:13 -04:00
Qiang Xue
62fae9c15a Merge pull request #2811 from dmeroff/theme_enhancements 
Made Theme::basePath optional fixes #2810
 2014-03-19 09:28:35 -04:00
Dmitry Erofeev
0fa8f8cc01 fixed Theme::getPath() 2014-03-19 16:53:35 +04:00
Dmitry Erofeev
ac0a56e9d0 reverted deletion of Theme::getPath() 2014-03-19 16:29:59 +04:00
Dmitry Erofeev
b3053f4346 Made Theme::basePath optional fixes #2810 2014-03-19 15:43:37 +04:00
David Renty
7ea52fb262 Implemented conditional validators (see #2406) 2014-03-19 11:43:31 +01:00
Alexander Makarov
30d84ffbe3 Merge pull request #2714 from drenty/master 
Added asElapsedTime function to Formatter
 2014-03-19 13:07:56 +03:00
David Renty
ed70735b22 Changelog and doc 2014-03-19 10:48:20 +01:00
David Renty
31da139173 Merge branch 'master' of https://github.com/yiisoft/yii2 2014-03-19 10:42:30 +01:00
Alexander Makarov
5ae9b82ef6 Merge pull request #2804 from Ryadnov/patch-1 
fix User::getReturnUrl() after #2501
 2014-03-19 11:33:30 +03:00
Ряднов Андрей
aa4e6ec039 fix User::getReturnUrl() after #2501 2014-03-19 11:20:40 +03:00
Qiang Xue
1773ae5334 Merge pull request #2802 from Skyh13/yii2-docs-2340 
Update usage example in comments of db\DataReader
 2014-03-18 18:19:14 -04:00
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