1. 09 Mar, 2014 1 commit
  2. 08 Mar, 2014 28 commits
  3. 07 Mar, 2014 11 commits
    • Fixes #2659 · 6d97ded6
      Alexander Makarov authored
    • Minor code style fixes for apidoc · 24b0de63
      Alexander Makarov authored
    • code style · cf9597a7
      Carsten Brandt authored
    • Merge branch 'code-style' · a8ef7bab
      Carsten Brandt authored
      * 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
    • Merge pull request #2657 from Theill11/fix-validation · fe48ae0d
      Alexander Makarov authored
      Advanced app: Username should be unique
    • Merge pull request #2605 branch 'feature' of https://github.com/mongosoft/yii2 into code-style · 1b7e1cd0
      Carsten Brandt authored
      * '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
    • username should be unique · a5e6e2d4
      Johnny Theill authored
    • Merge pull request #2622 branch 'ext-codestyle-fix' of… · 668dacba
      Carsten Brandt authored
      Merge pull request #2622 branch 'ext-codestyle-fix' of https://github.com/AlexGx/yii2 into code-style
      
      * 'ext-codestyle-fix' of https://github.com/AlexGx/yii2:
        fix php5.4 array syntax
        many phpcs fixes
        fix phpDoc LuaScriptBuilder build @throws
      
      Conflicts:
      	extensions/apidoc/commands/RenderController.php
      	extensions/apidoc/models/BaseDoc.php
      	extensions/apidoc/templates/BaseRenderer.php
      	extensions/apidoc/templates/bootstrap/Renderer.php
      	extensions/apidoc/templates/bootstrap/layouts/guide.php
      	extensions/apidoc/templates/bootstrap/layouts/main.php
      	extensions/apidoc/templates/html/Renderer.php
      	extensions/apidoc/templates/offline/Renderer.php
      	extensions/apidoc/templates/offline/assets/AssetBundle.php
      	extensions/apidoc/templates/offline/views/index.php
    • Changed assertions · 95e01899
      Johnny Theill authored
    • Added links to PHP.net to apidoc · e2aacad8
      Carsten Brandt authored
    • be consistent, use singular inheritdoc · f2797191
      Carsten Brandt authored