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

# Conflicts:
#	protected/humhub/docs/CHANGELOG.md

protected/humhub/docs/CHANGELOG.md

@@ -5,6 +5,7 @@ HumHub Change Log
 --------------------------------
 
 Important note for LDAP users: There is a new setting "ID Attribute" which should be set to clearly identify users.
+Important note for Git/Composer installations: http://www.yiiframework.com/news/148/important-note-about-bower-and-the-asset-plugin/
 
 - Fix: Readonly markdown field issue.
 - Enh: Fixed registration approval/denial mails and made their default value configurable.
@@ -50,6 +51,7 @@ Important note for LDAP users: There is a new setting "ID Attribute" which shoul
 - Fix wrong Comment date issue in notification mails
 - Enh: Added `data-file-*` attributes to download links, for beeing able to intercept file downloads
 - Enh: Added `apple-mobile-web-app-*` and `mobile-web-app-capable` meta tags to `head.php`
+- Fix #2783: E-Mail notification link broken when guest mode is enabled (Buliwyfa)
 - Enh: Added `ContentActiveRecord::silentContentCreation` for disabling ContentCreated Activity/Notification on ContentActiveRecord level
 - Enh: Now the `NewContent` live event is always fired with `sourceClass` and `sourceId` information and a `silent` flag for silent content creations
 

protected/humhub/docs/guide/developer/git-installation.md

@@ -32,7 +32,7 @@ git clone https://github.com/humhub/humhub.git
  3. Navigate to your HumHub webroot and fetch dependencies:
 
 ```
-php composer.phar global require "fxp/composer-asset-plugin:~1.3"
+php composer.phar global require "fxp/composer-asset-plugin:^1.4.2"
 php composer.phar update
 ```
 

protected/humhub/modules/notification/controllers/EntryController.php

@@ -2,7 +2,7 @@
 
 /**
  * @link https://www.humhub.org/
- * @copyright Copyright (c) 2015 HumHub GmbH & Co. KG
+ * @copyright Copyright (c) 2017 HumHub GmbH & Co. KG
  * @license https://www.humhub.com/licences
  */
 
@@ -11,6 +11,7 @@ namespace humhub\modules\notification\controllers;
 use Yii;
 use humhub\components\Controller;
 use humhub\modules\notification\models\Notification;
+use humhub\components\access\ControllerAccess;
 
 /**
  * EntryController
@@ -23,12 +24,10 @@ class EntryController extends Controller
     /**
      * @inheritdoc
      */
-    public function behaviors()
+    public function getAccessRules()
     {
         return [
-            'acl' => [
-                'class' => \humhub\components\behaviors\AccessControl::className(),
-            ]
+            [ControllerAccess::RULE_LOGGED_IN_ONLY]
         ];
     }
 
@@ -40,7 +39,7 @@ class EntryController extends Controller
         $notificationModel = Notification::findOne(['id' => Yii::$app->request->get('id'), 'user_id' => Yii::$app->user->id]);
 
         if ($notificationModel === null) {
-            throw new \yii\web\HttpException(404, Yii::t('NotificationModule.error','The requested content is not valid or was removed!'));
+            throw new \yii\web\HttpException(404, Yii::t('NotificationModule.error', 'The requested content is not valid or was removed!'));
         }
 
         $notification = $notificationModel->getClass();

protected/humhub/modules/stream/resources/js/humhub.stream.js

@@ -262,7 +262,6 @@ humhub.module('stream', function (module, require, $) {
                 that.remove().then(function () {
                     stream.loadEntry(that.getKey(), {'prepend': true});
                 });
-                module.log.success('success.pin');
             } else if (data.info) {
                 module.log.info(data.info, true);
             } else {
@@ -298,9 +297,8 @@ humhub.module('stream', function (module, require, $) {
     StreamEntry.prototype.unpin = function (evt) {
         var that = this;
         this.loader();
-        client.post(evt.url).then(function (data) {
+        client.post(evt.url).then(function () {
             that.stream().init();
-            module.log.success('success.unpin');
         }).catch(function (e) {
             module.log.error(e, true);
             that.loader(false);

protected/humhub/modules/stream/tests/codeception/acceptance/StreamCest.php

@@ -113,7 +113,6 @@ class StreamCest
         $I->click('.preferences .dropdown-toggle', $newEntrySelector);
         $I->waitForText('Pin', 10);
         $I->click('Pin', $newEntrySelector);
-        $I->seeSuccess('The content has been pinned.');
 
         $I->see('This is my first stream test post!', '.s2_streamContent div:nth-child(1)');
         $I->see('Pinned', $newEntrySelector);
@@ -122,7 +121,6 @@ class StreamCest
         $I->click('.preferences .dropdown-toggle', $newEntrySelector);
         $I->waitForText('Unpin', 10);
         $I->click('Unpin', $newEntrySelector);
-        $I->seeSuccess('The content has been unpinned.');
         $I->see('This is my second stream test post!', '.s2_streamContent div:nth-child(1)');
         $I->dontSee('Pinned', $newEntrySelector);
     }

protected/humhub/widgets/CoreJsConfig.php

@@ -178,8 +178,6 @@ class CoreJsConfig extends Widget
                         'text' => [
                             'success.archive' => Yii::t('ContentModule.widgets_views_stream', 'The content has been archived.'),
                             'success.unarchive' => Yii::t('ContentModule.widgets_views_stream', 'The content has been unarchived.'),
-                            'success.pin' => Yii::t('ContentModule.widgets_views_stream', 'The content has been pinned.'),
-                            'success.unpin' => Yii::t('ContentModule.widgets_views_stream', 'The content has been unpinned.'),
                             'success.delete' => Yii::t('ContentModule.widgets_views_stream', 'The content has been deleted.'),
                             'info.editCancel' => Yii::t('ContentModule.widgets_views_stream', 'Your last edit state has been saved!'),
                         ]