Commit Graph

254 Commits

Author SHA1 Message Date
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
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
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
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 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
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
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
a687e6f58c Validate login data only of there are no other errors 2014-02-21 00:57:29 +04:00
Alexander Makarov
b83435ea5b Merge pull request #2446 from Theill11/update-apps
Minor updates to apps
2014-02-16 13:42:13 +03:00
Johnny Theill
f42af951e1 Fix newlines and missing parameter description 2014-02-16 03:14:28 +01:00
Alexander Makarov
20dad5e551 Fixes #2295: basic app description now doesn't insist it is for websites containing mainly informational pages since it was misleading 2014-02-15 20:57:11 +04:00
Johnny Theill
63272f4166 Update doc-blocks and small fixes according to coding standards 2014-02-15 17:53:57 +01:00
Qiang Xue
22bfd43124 Merge pull request #2383 from Ragazzo/add_yii_command_to_tests
added yii console command to tests
2014-02-15 11:32:07 -05:00
Johnny Theill
ca12241811 Fixed minor consistency bugs in apps
* Added 'return' to goHome() calls in actions
* Changed $_POST to Yii::$app->request->post()
2014-02-15 16:32:24 +01:00
Mark
96f2f6e52e visibility changed 2014-02-14 18:08:07 +04:00
Mark
c943fc28e2 forcing user component to logout 2014-02-14 18:05:56 +04:00
Qiang Xue
9db3790bb2 Fixed test break. 2014-02-13 21:18:43 -05:00
Qiang Xue
270669aa22 fixed test break. 2014-02-13 20:00:12 -05:00
Qiang Xue
78e4da8c1f Fixed test break. 2014-02-13 19:37:49 -05:00
Qiang Xue
4e6aa21198 The directory holding email templates is renamed from mails to mail 2014-02-12 15:01:01 -05:00
Qiang Xue
e10939a464 adjusted wording. 2014-02-10 15:39:38 -05:00
Mark
ea7e611064 fixed message 2014-02-11 00:21:12 +04:00
Mark
50a5286959 view improved 2014-02-11 00:13:21 +04:00
Mark
2d1c695feb improved config 2014-02-10 17:11:08 +04:00
Mark
c6a3c4bc0d added yii console command to tests 2014-02-09 19:04:26 +04:00
Alexander Makarov
7c1ee323fa Edited description 2014-02-08 14:21:28 +03:00
Alexander Makarov
5e41473d59 Fixed suggest descriptions 2014-02-07 23:20:37 +04:00
Alexander Makarov
a3b71def38 Reordered items 2014-02-07 18:58:17 +03:00
Alexander Makarov
874f9c1a21 Reverted numbered list 2014-02-07 19:44:28 +04:00
Alexander Makarov
756c268cb3 Fixed list in tests readme 2014-02-07 19:40:25 +04:00
Alexander Makarov
0631e117ba Updated readme in apps/basic/tests 2014-02-07 19:36:20 +04:00
Alexander Makarov
77dae9af92 Fixes #2341, fixes #2317: moved codeception dependecies to "suggest" section, fixed codeception version on stable branch 2014-02-07 19:11:09 +04:00
Qiang Xue
2fbd34c0de CS fix. 2014-02-06 20:39:55 -05:00
Mark
9e770acd7e tests improved 2014-02-07 05:36:46 +04:00
Mark
cf1fe7d27d code fix 2014-02-07 05:34:33 +04:00
Mark
bf5bb3730e tests improved 2014-02-07 05:22:11 +04:00
Mark
f352aa47cc docs added 2014-02-07 04:24:58 +04:00
Alexander Makarov
2f005eb699 Revert "Locked Codeception versions since master is under heavy refactoring"
This reverts commit 7145b9e9a7.
2014-02-01 02:16:21 +04:00
Alexander Makarov
7145b9e9a7 Locked Codeception versions since master is under heavy refactoring 2014-02-01 00:56:38 +04:00
Qiang Xue
2046563849 Revert "Fixes #1856: The default CSS class for hint generated by ActiveField is changed to help-block"
This reverts commit 7ae4695d0c.
2014-01-29 20:33:24 -05:00
Qiang Xue
7ae4695d0c Fixes #1856: The default CSS class for hint generated by ActiveField is changed to help-block 2014-01-29 18:39:07 -05:00
Aleksandr Zelenin
4f17c45f00 Fix typos in constant 2014-01-25 01:33:28 +04:00
Qiang Xue
af53c0f818 doc update. 2014-01-22 11:09:59 -05:00