Merge branch 'develop' of github.com:humhub/humhub into develop

composer.json

@@ -48,7 +48,7 @@
         "raoul2000/yii2-jcrop-widget": "*",
         "twig/twig": "^1.0",
         "xj/yii2-jplayer-widget": "*",
-        "yiisoft/yii2": "2.0.16",
+        "yiisoft/yii2": "2.0.27",
         "yiisoft/yii2-authclient": "~2.2.0",
         "yiisoft/yii2-bootstrap": "~2.0.0",
         "yiisoft/yii2-httpclient": "~2.0.0",

package-lock.json

@@ -86,8 +86,7 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
       "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "async": {
       "version": "1.5.2",
@@ -280,7 +279,6 @@
       "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz",
       "integrity": "sha1-cj599ugBrFYTETp+RFqbactjKBg=",
       "dev": true,
-      "optional": true,
       "requires": {
         "delayed-stream": "~1.0.0"
       }
@@ -372,8 +370,7 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
       "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "duplexer": {
       "version": "0.1.1",
@@ -455,8 +452,7 @@
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
       "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "fast-deep-equal": {
       "version": "1.1.0",
@@ -1280,15 +1276,13 @@
       "version": "1.30.0",
       "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.30.0.tgz",
       "integrity": "sha1-dMZD2i3Z1qRTmZY0ZbJtXKfXHwE=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "mime-types": {
       "version": "2.1.17",
       "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.17.tgz",
       "integrity": "sha1-Cdejk/A+mVp5+K+Fe3Cp4KsWVXo=",
       "dev": true,
-      "optional": true,
       "requires": {
         "mime-db": "~1.30.0"
       }

protected/humhub/docs/CHANGELOG_DEV.md

@@ -57,3 +57,4 @@ HumHub Change Log (DEVELOP)
 - Fix `humhub\modules\file\widgets\Upload::progress` config options not working
 - Enh: More generic approach to determine themed view files
 - Enh: Always use ISO 639-1 alpha-2 (and ISO 3166-2) language codes
+- Enh: Update Yii version to 2.0.27

protected/humhub/modules/admin/views/module/list.php

@@ -4,12 +4,13 @@ use yii\helpers\Html;
 use yii\helpers\Url;
 
 ?>
-<?php if (count($installedModules) == 0): ?>
-    <br>
-    <div><?= Yii::t('AdminModule.module_list', 'No modules installed yet. Install some to enhance the functionality!'); ?></div>
-<?php endif; ?>
 
 <div class="panel-body">
+    <?php if (count($installedModules) == 0): ?>
+        <br>
+        <div><?= Yii::t('AdminModule.module_list', 'No modules installed yet. Install some to enhance the functionality!'); ?></div>
+    <?php endif; ?>
+
     <?php foreach ($installedModules as $moduleId => $module) : ?>
         <div class="media">
             <img class="media-object img-rounded pull-left" data-src="holder.js/64x64" alt="64x64"

protected/humhub/modules/ui/view/components/ThemeViews.php

@@ -79,8 +79,7 @@ class ThemeViews extends Component
             $path = str_replace(Yii::getAlias($stripPath), '', $path);
         }
 
-        return $path;
-        #return $this->theme->getBasePath() . '/views/' . $path;
+        return $this->theme->getBasePath() . '/views/' . $path;
     }
 
 

static/less/progress.less

@@ -20,5 +20,5 @@
 //
 #nprogress .bar {
     height:2px;
-    background: @primary;
+    background: @info;
 }