php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-11-11 19:20:01 +08:00
Code Issues Packages Projects Releases Wiki Activity
6,280 Commits 10 Branches 79 Tags
f7b0c5c72fa052edd29e66897fc83fbc4d73eace
Commit Graph

510 Commits

Author SHA1 Message Date
Qiang Xue
76a7beb67f Fixed test break. 2014-03-16 08:19:27 -04:00
SonicGD
b5f8a4dc22 Reformat code te be PSR-2 compatible 2014-03-16 10:46:21 +06:00
Zhandos
9efcde3a12 Update _config.php 
fixed application config for unit test
 2014-03-09 23:44:46 +05:00
Carsten Brandt
236abe322b Merge pull request #2663 from Theill11/travis-advanced-app 
Added advanced app tests to travis
 2014-03-09 03:27:22 +01:00
Johnny Theill
f528cc9f1c Update README.md 2014-03-09 03:17:09 +01:00
Luciano Baraglia
269d1303a9 Code style fixes 2014-03-08 20:47:04 -03: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
Alexander Makarov
34db2d2082 Merge pull request #2652 from Theill11/fix-test-breaks 
Update advanced app tests
 2014-03-08 12:41:06 +03:00
Johnny Theill
af8f1e254e Added advanced app tests to travis 2014-03-08 07:09:04 +01:00
Carsten Brandt
a8ef7bab9e Merge branch 'code-style' 
* code-style:
  fix php5.4 array syntax
  many phpcs fixes
  fix phpDoc LuaScriptBuilder build @throws
  returned back formatting language files
  code style. WHILE
  code style. FOR
  code style. FOREACH
  code style. operator IF
  @param, @var, @property and @return must declare types as boolean, integer, string, array or null
  short echo tags
  short array syntax
 2014-03-07 21:56:40 +01:00
Carsten Brandt
1b7e1cd027 Merge pull request #2605 branch 'feature' of https://github.com/mongosoft/yii2 into code-style 
* 'feature' of https://github.com/mongosoft/yii2:
  returned back formatting language files
  code style. WHILE
  code style. FOR
  code style. FOREACH
  code style. operator IF
  @param, @var, @property and @return must declare types as boolean, integer, string, array or null
  short echo tags
  short array syntax

Conflicts:
	extensions/apidoc/commands/RenderController.php
	extensions/apidoc/models/BaseDoc.php
	extensions/apidoc/models/Context.php
	extensions/apidoc/templates/bootstrap/Renderer.php
	extensions/apidoc/templates/bootstrap/layouts/guide.php
	extensions/apidoc/templates/bootstrap/layouts/main.php
	extensions/apidoc/templates/bootstrap/views/index.php
	extensions/apidoc/templates/html/Renderer.php
	extensions/apidoc/templates/offline/views/index.php
	extensions/apidoc/templates/offline/views/offline.php
	extensions/apidoc/templates/online/views/index.php
	extensions/elasticsearch/Connection.php
	extensions/redis/ActiveQuery.php
	framework/base/ErrorException.php
	framework/helpers/BaseFileHelper.php
	tests/unit/framework/helpers/FileHelperTest.php
 2014-03-07 21:54:44 +01:00
Johnny Theill
a5e6e2d43b username should be unique 2014-03-07 21:50:04 +01:00
Johnny Theill
95e01899c7 Changed assertions 2014-03-07 21:26:01 +01:00
Qiang Xue
bbea1ab19c Fixes #2629: Module::controllerPath is now read only, and all controller classes must be namespaced under Module::controllerNamespace 2014-03-07 10:35:15 -05:00
Johnny Theill
70463d538c fix tests 2014-03-07 00:13:28 +01:00
Qiang Xue
e38c4225b2 Merge commit 'bdce87b242abbff800020deba0a5c2031fc2efe7' into feature-restapi 
Conflicts:
	framework/db/BaseActiveRecord.php
 2014-03-06 00:00:33 -05: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
AlexGx
9c4c8ffbcc apps code style fixes 2014-03-04 23:04:20 +02:00
Alexander Makarov
61b64d7513 Removed unused "use" statements 2014-03-04 22:40:04 +04:00
Alexander Makarov
2bb6f13505 Used ternary operator instead of "or" for constant definition 2014-03-04 22:17:11 +04:00
Alexander Makarov
d669209334 Fixed advanced application to use POST for logout 2014-03-03 23:01:40 +04:00
Alexander Makarov
a7a1bd8da0 Merge pull request #2578 from schmunk42/feature/update-composer-keywords 
replaced keyword "yii" with "yii2" in composer.json files (fixes #2557)
 2014-03-03 21:39:41 +03:00
Alexander Mohorev
c7e8d8b900 @param, @var, @property and @return must declare types as boolean, integer, string, array or null 2014-03-03 20:50:44 +03:00
Alexander Mohorev
6e7edfdf5b short array syntax 2014-03-03 20:21:55 +03:00
Qiang Xue
7a04dbaae1 Support for other auth types. 2014-03-03 10:18:39 -05:00
Qiang Xue
48a12559b2 rest api WIP 2014-03-01 23:14:16 -05:00
Alexander Makarov
8a2903de03 Added verb filter to advanced app logout 2014-02-28 21:13:30 +04:00
Tobias Munk
825a71c6df replaced keyword "yii" with "yii2" in composer.json files (fixes #2557) 2014-02-27 17:37:08 +01:00
Mark
9e483b6461 added server name, for creating url rules 2014-02-27 18:37:34 +04:00
maximal
a7fc9143bf Closing and opening braces in Yii2 coding standards. 2014-02-24 20:32:15 +04:00
maximal
5d14d788f5 Further coding standards fixes. 2014-02-24 20:17:38 +04:00
MaximAL
b560398bd7 Coding standards fixes. 2014-02-24 18:45:35 +03:00
Alexander Makarov
d8d44b6127 Merge pull request #2501 from yiisoft/unify-urls 
Fixes #2426: Changed URL creation method signatures to be consistent
 2014-02-21 23:53:15 +03:00
Alexander Makarov
168fb19fe7 Added status condition to PasswordResetRequestForm email validator 2014-02-21 01:43:39 +04:00
Alexander Makarov
a687e6f58c Validate login data only of there are no other errors 2014-02-21 00:57:29 +04:00
Alexander Makarov
43c17d99cc Fixes #2426: Changed URL creation method signatures to be consistent 2014-02-20 20:10:33 +04:00
Alexander Makarov
036a811ea4 Fixes #2458: Added missing validaton to advanced app forms, separated validation from email sending errors for contact form 2014-02-20 17:50:53 +04:00
Carsten Brandt
72145098a1 updated timestamp behavior in advanced app to renaming 2014-02-20 13:18:33 +01:00
Mark
f780bb6752 test typo fix 2014-02-18 18:50:08 +04:00
Mark
468f804293 added test-case to frontend unit tests 2014-02-18 18:31:14 +04:00
Mark
942462a5cf visibility fix 2014-02-18 18:30:29 +04:00
Mark
45bf5deea1 env. config fixed 2014-02-18 18:29:56 +04:00
Johnny Theill
67f6447ce5 Minor formatting bug in README.md 2014-02-18 01:43:51 +01:00
Johnny Theill
470930cc11 Update advanced/README.md directory structure 
Changed spaces to tabs
 2014-02-18 00:14:29 +01: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
Dilip
989daa0bd4 Update README.md 2014-02-17 21:21:53 +05:30
Mark
69fbbe91ee correct lists fixed 2014-02-16 19:55:43 +04:00
Mark
2806c01ec3 formatting improved 2014-02-16 19:54:20 +04:00
Mark
184cd7aee5 removed ordered list 2014-02-16 19:52:38 +04:00
Mark
9c2dd28385 improved dependencies, guide 2014-02-16 19:51:15 +04:00