Commit Graph

10 Commits

Author SHA1 Message Date
SonicGD
b5f8a4dc22 Reformat code te be PSR-2 compatible 2014-03-16 10:46:21 +06:00
Johnny Theill
6a193f3846 Merge branch 'master' of https://github.com/yiisoft/yii2 into travis-advanced-app 2014-03-08 22:21:35 +01:00
Johnny Theill
af8f1e254e Added advanced app tests to travis 2014-03-08 07:09:04 +01:00
Johnny Theill
95e01899c7 Changed assertions 2014-03-07 21:26:01 +01:00
Johnny Theill
70463d538c fix tests 2014-03-07 00:13:28 +01:00
Alexander Makarov
386979d6a3 Revert "Used ternary operator instead of "or" for constant definition"
This reverts commit 2bb6f13505.
2014-03-06 01:56:51 +04:00
Alexander Makarov
2bb6f13505 Used ternary operator instead of "or" for constant definition 2014-03-04 22:17:11 +04:00
Qiang Xue
7797e89d0d Merge branch 'yii2_advanced_app_codeception' of github.com:Ragazzo/yii2 into Ragazzo-yii2_advanced_app_codeception
Conflicts:
	apps/advanced/README.md
2014-02-17 17:45:40 -05:00
Mark
bf35e19da8 newlines fixed, code-guy deleted 2014-02-16 19:42:30 +04:00
Mark
d2d27747bf added codeception to backend 2014-02-16 19:15:13 +04:00