Commit Graph

602 Commits

Author SHA1 Message Date
Carsten Brandt
0055e1ab31 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
4742d4e0b3 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
4fa285a4db Merge commit 'bdce87b242abbff800020deba0a5c2031fc2efe7' into feature-restapi
Conflicts:
	framework/db/BaseActiveRecord.php
2014-03-06 00:00:33 -05:00
Alexander Makarov
d8763496cc Revert "Used ternary operator instead of "or" for constant definition"
This reverts commit 2bb6f13505e212d68841a7e6609806fb30d04002.
2014-03-06 01:56:51 +04:00
Alexander Makarov
13bef84dfb Removed unused "use" statements 2014-03-04 22:40:04 +04:00
Alexander Makarov
3ffc027302 Used ternary operator instead of "or" for constant definition 2014-03-04 22:17:11 +04:00
Alexander Mohorev
d78c7a7d21 @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
b61e6d214a Support for other auth types. 2014-03-03 10:18:39 -05:00
Qiang Xue
e9148837ee rest api WIP 2014-03-01 23:14:16 -05:00
Tobias Munk
23c3420af0 replaced keyword "yii" with "yii2" in composer.json files (fixes #2557) 2014-02-27 17:37:08 +01:00
Mark
be3c8c5e80 added server name, for creating url rules 2014-02-27 18:37:34 +04:00
maximal
4e188239cf Closing and opening braces in Yii2 coding standards. 2014-02-24 20:32:15 +04:00
maximal
c2c3c22ff5 Further coding standards fixes. 2014-02-24 20:17:38 +04:00
MaximAL
94c6095df3 Coding standards fixes. 2014-02-24 18:45:35 +03:00
Alexander Makarov
dca062e4e2 Validate login data only of there are no other errors 2014-02-21 00:57:29 +04:00
Alexander Makarov
1d58a83d8e Merge pull request #2446 from Theill11/update-apps
Minor updates to apps
2014-02-16 13:42:13 +03:00
Johnny Theill
7227889464 Fix newlines and missing parameter description 2014-02-16 03:14:28 +01:00
Alexander Makarov
fe5df96616 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
a6c43f5eb7 Update doc-blocks and small fixes according to coding standards 2014-02-15 17:53:57 +01:00
Qiang Xue
24151471d5 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
0eff9fb382 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
2fe23bc740 visibility changed 2014-02-14 18:08:07 +04:00
Mark
d4b50fcf06 forcing user component to logout 2014-02-14 18:05:56 +04:00
Qiang Xue
d9ff05cb75 Fixed test break. 2014-02-13 21:18:43 -05:00
Qiang Xue
dd0a8defbf fixed test break. 2014-02-13 20:00:12 -05:00
Qiang Xue
41685fe8df Fixed test break. 2014-02-13 19:37:49 -05:00
Qiang Xue
eb44722100 The directory holding email templates is renamed from mails to mail 2014-02-12 15:01:01 -05:00
Qiang Xue
6e5525a531 adjusted wording. 2014-02-10 15:39:38 -05:00
Mark
aa6dcbf200 fixed message 2014-02-11 00:21:12 +04:00
Mark
2d68c55d98 view improved 2014-02-11 00:13:21 +04:00
Mark
987057ab13 improved config 2014-02-10 17:11:08 +04:00
Mark
58de43ef0f added yii console command to tests 2014-02-09 19:04:26 +04:00
Alexander Makarov
f28cb26f22 Edited description 2014-02-08 14:21:28 +03:00
Alexander Makarov
6db5566637 Fixed suggest descriptions 2014-02-07 23:20:37 +04:00
Alexander Makarov
e5195ef76e Reordered items 2014-02-07 18:58:17 +03:00
Alexander Makarov
30fc6f00fd Reverted numbered list 2014-02-07 19:44:28 +04:00
Alexander Makarov
8ddd77d31a Fixed list in tests readme 2014-02-07 19:40:25 +04:00
Alexander Makarov
7fd54ec5ed Updated readme in apps/basic/tests 2014-02-07 19:36:20 +04:00
Alexander Makarov
caf8874782 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
042ba3f435 CS fix. 2014-02-06 20:39:55 -05:00
Mark
5f6a9d4a66 tests improved 2014-02-07 05:36:46 +04:00
Mark
e877a23aad code fix 2014-02-07 05:34:33 +04:00
Mark
1cc276076a tests improved 2014-02-07 05:22:11 +04:00
Mark
d703b819b8 docs added 2014-02-07 04:24:58 +04:00
Qiang Xue
3cb2721885 Revert "Fixes #1856: The default CSS class for hint generated by ActiveField is changed to help-block"
This reverts commit 7ae4695d0cf46f3347ff8f340f572a08419f21a7.
2014-01-29 20:33:24 -05:00
Qiang Xue
b59b213c58 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
4d854f7471 Fix typos in constant 2014-01-25 01:33:28 +04:00
Qiang Xue
c710fe7dba doc update. 2014-01-22 11:09:59 -05:00
Qiang Xue
e27b07ffd9 Fixes #1782 2014-01-22 09:28:59 -05:00
Qiang Xue
ceabdffd57 Merge branch 'tests_improved_verify' of github.com:Ragazzo/yii2 into Ragazzo-tests_improved_verify
Conflicts:
	apps/basic/tests/README.md
	apps/basic/tests/unit/models/LoginFormTest.php
2014-01-22 09:27:11 -05:00