Merge branch 'master' of https://github.com/humhub/humhub

protected/humhub/config/common.php

@@ -8,7 +8,7 @@ Yii::setAlias('@config', '@app/config');
 
 $config = [
     'name' => 'HumHub',
-    'version' => '1.1.0-beta.2',
+    'version' => '1.1.0',
     'basePath' => dirname(__DIR__) . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR,
     'bootstrap' => ['log', 'humhub\components\bootstrap\ModuleAutoLoader'],
     'sourceLanguage' => 'en',

protected/humhub/docs/guide/admin-requirements.md

@@ -22,6 +22,9 @@ Requirements
 * Apache XSendfile
 
 ### Packages for Debian/Ubuntu users
+
+#### For PHP 5.x
+
 * imagemagick
 * php5-curl
 * php5-mysql
@@ -32,3 +35,18 @@ Requirements
 * php-apc		(optional)
 * php5-memcached	(optional)
 * libapache2-mod-xsendfile (optional)
+
+#### For PHP 7.0 on Ubuntu
+
+* imagemagick
+* php7.0-curl
+* php7.0-mbstring
+* php7.0-mysql
+* php7.0-gd
+* php7.0-cli
+* php7.0-intl
+* php7.0-ldap		(optional)
+* php7.0-opcache	(optional)
+* php-memcache	(optional)
+* libapache2-mod-xsendfile (optional)
+

protected/humhub/modules/admin/messages/ru/base.php

@@ -19,9 +19,9 @@ return array (
   'Proxy' => 'Прокси',
   'Security' => 'Безопасность',
   'Self test' => '',
-  'Spaces' => 'Пространств',
+  'Spaces' => 'Пространства',
   'Statistics' => 'Статистика',
-  'User posts' => '',
+  'User posts' => 'Посты пользователей',
   'Userprofiles' => 'Профиль пользователя',
   'Users' => 'Пользователи',
 );

protected/humhub/modules/admin/messages/ru/views_space_index.php

@@ -23,4 +23,5 @@ return [
     'Actions' => 'Действия',
     'Overview' => 'Обзор',
     'Settings' => 'Настройки',
+    'Spaces' => 'Пространства'
 ];

protected/humhub/modules/admin/messages/ru/views_space_settings.php

@@ -18,4 +18,5 @@
  */
 return [
     'Save' => 'Сохранить',
+    'Space Settings' => 'Настройки по умолчанию'
 ];

protected/humhub/modules/comment/messages/de/permissions.php

@@ -2,8 +2,8 @@
 return array (
   'Allows the user to add comments' => 'Dem Benutzer erlauben, Kommentare zu erstellen',
   'Allows the user to create posts' => 'Erlaubt dem Benutzer das Erstellen von Beiträgen',
-  'Can manage (e.g. archive, stick or delete) arbitrary content' => '',
+  'Can manage (e.g. archive, stick or delete) arbitrary content' => 'Kann beliebige Inhalte verwalten (z.B. archivieren, anheften oder löschen)',
   'Create comment' => 'Kommentar erstellen',
   'Create post' => 'Beitrag erstellen',
-  'Manage content' => '',
+  'Manage content' => 'Inhalte verwalten',
 );

protected/humhub/modules/content/widgets/Stream.php

@@ -2,7 +2,9 @@
 
 namespace humhub\modules\content\widgets;
 
+use humhub\modules\content\components\ContentContainerActiveRecord;
 use Yii;
+use yii\base\Exception;
 use yii\helpers\Url;
 
 /**
@@ -17,7 +19,7 @@ class Stream extends \yii\base\Widget
     /**
      * Optional content container if this stream belongs to one
      *
-     * @var HActiveRecordContentContainer
+     * @var ContentContainerActiveRecord
      */
     public $contentContainer;
 
@@ -28,6 +30,14 @@ class Stream extends \yii\base\Widget
      */
     public $streamAction = "";
 
+    /**
+     * Additional Params to add to Stream Action URL
+     *
+     * @var array
+     * @since 1.1
+     */
+    public $streamActionParams = [];
+
     /**
      * Show default wall filters
      *
@@ -68,13 +78,14 @@ class Stream extends \yii\base\Widget
      */
     public $messageStreamEmptyCss = "";
 
+
     /**
      * Inits the Wall Stream Widget
      */
     public function init()
     {
         if ($this->streamAction == "") {
-            throw new \yii\web\HttpException(500, 'You need to set the streamAction attribute to use this widget!');
+            throw new Exception('You need to set the streamAction attribute to use this widget!');
         }
 
         // Add default Filters
@@ -89,10 +100,7 @@ class Stream extends \yii\base\Widget
             $this->filters['filter_visibility_private'] = Yii::t('ContentModule.widgets_views_stream', 'Only private posts');
         }
 
-
-        /**
-         * Setup default messages
-         */
+        // Setup default messages
         if ($this->messageStreamEmpty == "") {
             $this->messageStreamEmpty = Yii::t('ContentModule.widgets_views_stream', 'Nothing here yet!');
         }
@@ -111,20 +119,20 @@ class Stream extends \yii\base\Widget
      */
     protected function getStreamUrl()
     {
-        $params = [
-            $this->streamAction,
+        $params = array_merge([
             'limit' => '-limit-',
             'filters' => '-filter-',
             'sort' => '-sort-',
             'from' => '-from-',
             'mode' => \humhub\modules\content\components\actions\Stream::MODE_NORMAL
-        ];
+        ], $this->streamActionParams);
 
         if ($this->contentContainer) {
             return $this->contentContainer->createUrl($this->streamAction, $params);
+        } else {
+            array_unshift($params, $this->streamAction);
+            return Url::to($params);
         }
-
-        return Url::to($params);
     }
 
     /**
@@ -132,8 +140,7 @@ class Stream extends \yii\base\Widget
      */
     public function run()
     {
-        return $this->render('stream', array('streamUrl' => $this->getStreamUrl(), 'showFilters' => $this->showFilters, 'filters' => $this->filters));
+        return $this->render('stream', ['streamUrl' => $this->getStreamUrl(), 'showFilters' => $this->showFilters, 'filters' => $this->filters]);
     }
 
 }
-?>

protected/humhub/modules/directory/messages/ru/base.php

@@ -1,6 +1,6 @@
 <?php
 return array (
   'Directory' => 'Каталог',
-  'Members' => 'Участников',
+  'Members' => 'Участники',
   'Send invite' => 'Отправить приглашение',
 );

protected/humhub/modules/notification/messages/ru/widgets_views_list.php

@@ -17,7 +17,7 @@
  * NOTE: this file must be saved in UTF-8 encoding.
  */
 return [
-    'Show all notifications' => '',
+    'Show all notifications' => 'Показать все уведомления',
     'Mark all as seen' => 'Пометить все как прочитанное',
     'Notifications' => 'Уведомления',
     'There are no notifications yet.' => 'Уведомлений пока нет.',

protected/humhub/modules/space/messages/de/forms_SpaceInviteForm.php

@@ -3,7 +3,7 @@ return array (
   'Invites' => 'Einladungen',
   'New user by e-mail (comma separated)' => 'Neue Benutzer per E-Mail (getrennt durch Kommas)',
   'User \'{username}\' is already a member of this space!' => 'Der Benutzer \'{username}\' ist bereits Mitglied des Spaces!',
-  'User \'{username}\' is already an applicant of this space!' => '',
+  'User \'{username}\' is already an applicant of this space!' => 'Der Benutzer \'{username}\' hat bereits die Mitgliedschaft in diesem Space beantragt!',
   'User not found!' => 'Benutzer nicht gefunden!',
   '{email} is already registered!' => '{email} ist bereits registriert!',
   '{email} is not valid!' => '{email} ist ungültig!',

protected/humhub/modules/space/messages/de/views_settings.php

@@ -2,5 +2,5 @@
 return array (
   '<strong>Security</strong> settings' => '<strong>Sicherheits</strong>-Einstellungen',
   '<strong>Space</strong> settings' => '<strong>Space</strong>-Einstellungen',
-  'Permissions are assigned to different user-roles. To edit a permission, select the user-role you want to edit and change the drop-down value of the given permission.' => '',
+  'Permissions are assigned to different user-roles. To edit a permission, select the user-role you want to edit and change the drop-down value of the given permission.' => 'Berechtigungen sind mit unterschiedlichen Benutzerollen verknüpft. Um eine Berechtigung zu bearbeiten, wähle die betreffende Benutzerrolle und ordne über das Dropdown-Feld eine andere Berechtigung zu.',
 );

protected/humhub/modules/space/models/Space.php

@@ -16,6 +16,7 @@ use humhub\modules\space\components\UrlValidator;
 use humhub\modules\content\models\Content;
 use humhub\modules\content\components\ContentContainerActiveRecord;
 use humhub\modules\user\models\User;
+use yii\helpers\Url;
 
 /**
  * This is the model class for table "space".
@@ -368,9 +369,10 @@ class Space extends ContentContainerActiveRecord implements \humhub\modules\sear
      * See CController createUrl() for more details.
      *
      * @since 0.9
-     * @param type $route the URL route.
-     * @param type $params additional GET parameters.
-     * @param type $ampersand the token separating name-value pairs in the URL.
+     * @param string $route the URL route.
+     * @param array $params additional GET parameters.
+     * @param boolean|string $scheme whether to create an absolute URL and if it is a string, the scheme (http or https) to use.
+     * @return string
      */
     public function createUrl($route = null, $params = array(), $scheme = false)
     {
@@ -383,7 +385,7 @@ class Space extends ContentContainerActiveRecord implements \humhub\modules\sear
             $params['sguid'] = $this->guid;
         }
 
-        return \yii\helpers\Url::toRoute($params, $scheme);
+        return Url::toRoute($params, $scheme);
     }
 
     /**

protected/humhub/modules/user/messages/de/models_User.php

@@ -8,7 +8,7 @@ return array (
   'Email' => 'E-Mail Adresse',
   'Firstname' => 'Vorname',
   'Language' => 'Sprache',
-  'Last Activity Email' => '',
+  'Last Activity Email' => 'Letzte Aktivität (Email)',
   'Last Login' => 'Zuletzt angemeldet am',
   'Lastname' => 'Nachname',
   'Manager' => 'Manager',

protected/humhub/modules/user/messages/de/views_account_emailing.php

@@ -2,7 +2,7 @@
 return array (
   'Always' => 'Sofort',
   'Daily summary' => 'Tägliche Zusammenfassung',
-  'Get an email, for every activity of other users you follow or work together in a workspace.' => '',
+  'Get an email, for every activity of other users you follow or work together in a workspace.' => 'Erhalte eine Email über jede Aktivität der Benutzer denen du folgst oder mit denen du in einem Space zusammenarbeitest.',
   'Get an email, when other users comment or like your posts.' => 'Erhalte eine E-Mail, wenn andere Benutzer deine Beiträge kommentieren oder anderen Benutzer deine Beiträge gefallen.',
   'Never' => 'Nie',
   'Receive desktop notifications when you are online.' => 'Desktop-Benachrichtigungen empfangen, wenn du online bist.',

protected/humhub/modules/user/messages/de/widgets_AccountMenuWidget.php

@@ -1,25 +1,8 @@
 <?php
-/**
- * Message translations.
- *
- * This file is automatically generated by 'yii message/extract' command.
- * It contains the localizable messages extracted from source code.
- * You may modify this file by translating the extracted messages.
- *
- * Each array element represents the translation (value) of a message (key).
- * If the value is empty, the message is considered as not translated.
- * Messages that no longer need translation will have their translations
- * enclosed between a pair of '@@' marks.
- *
- * Message string can be used with plural forms format. Check i18n section
- * of the guide for details.
- *
- * NOTE: this file must be saved in UTF-8 encoding.
- */
-return [
-    'Security' => '',
-    '<strong>Account</strong> settings' => '<strong>Konto</strong>-Verwaltung',
-    'Modules' => 'Module',
-    'Profile' => 'Profil',
-    'Settings' => 'Einstellungen',
-];
+return array (
+  '<strong>Account</strong> settings' => '<strong>Konto</strong>-Verwaltung',
+  'Modules' => 'Module',
+  'Profile' => 'Profil',
+  'Security' => 'Sicherheit',
+  'Settings' => 'Einstellungen',
+);

protected/humhub/modules/user/messages/de/widgets_PermissionGridEditor.php

@@ -1,23 +1,6 @@
 <?php
-/**
- * Message translations.
- *
- * This file is automatically generated by 'yii message/extract' command.
- * It contains the localizable messages extracted from source code.
- * You may modify this file by translating the extracted messages.
- *
- * Each array element represents the translation (value) of a message (key).
- * If the value is empty, the message is considered as not translated.
- * Messages that no longer need translation will have their translations
- * enclosed between a pair of '@@' marks.
- *
- * Message string can be used with plural forms format. Check i18n section
- * of the guide for details.
- *
- * NOTE: this file must be saved in UTF-8 encoding.
- */
-return [
-    'Description' => '',
-    'Title' => '',
-    'Module' => 'Modul',
-];
+return array (
+  'Description' => 'Beschreibung',
+  'Module' => 'Modul',
+  'Title' => 'Titel',
+);