From 56cd81ca96c94bd7fa770f633b7714a70bc58f02 Mon Sep 17 00:00:00 2001 From: Lucas Bartholemy Date: Tue, 4 May 2021 10:58:24 +0200 Subject: [PATCH 1/5] Updated Composer HumHub-Prosemirror --- composer.json | 2 +- composer.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/composer.json b/composer.json index d6d8f604b2..062cf24aca 100644 --- a/composer.json +++ b/composer.json @@ -36,7 +36,7 @@ "npm-asset/bootstrap-tour": "0.11.0", "npm-asset/clipboard-polyfill": "3.0.*", "npm-asset/font-awesome": "^4.7.0", - "npm-asset/humhub-prosemirror-richtext": "1.1.3", + "npm-asset/humhub-prosemirror-richtext": "1.1.5", "npm-asset/imagesloaded": "*", "npm-asset/intersection-observer": "^0.7.0", "npm-asset/jplayer": "2.9.*", diff --git a/composer.lock b/composer.lock index b8da9183ae..b9ad9229c3 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "8ce4dc3e98c455997a22f12c165d2cd9", + "content-hash": "e25fa2ed3ad8e6c99542573587da0caa", "packages": [ { "name": "bower-asset/bootstrap", @@ -3392,10 +3392,10 @@ }, { "name": "npm-asset/humhub-prosemirror-richtext", - "version": "1.1.3", + "version": "1.1.5", "dist": { "type": "tar", - "url": "https://registry.npmjs.org/humhub-prosemirror-richtext/-/humhub-prosemirror-richtext-1.1.3.tgz" + "url": "https://registry.npmjs.org/humhub-prosemirror-richtext/-/humhub-prosemirror-richtext-1.1.5.tgz" }, "type": "npm-asset", "license": [ From 0112192149e1d98e5ca47054a248aca5a089568a Mon Sep 17 00:00:00 2001 From: Yuriy Bakhtin Date: Mon, 10 May 2021 20:43:33 +0300 Subject: [PATCH 2/5] Fix login form view on browser back button after footer link (#5063) --- CHANGELOG.md | 4 ++++ protected/humhub/widgets/views/footerNavigation_login.php | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a073bd1dc2..33d5bca660 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,10 @@ HumHub Changelog ================ +1.8.3 (Unreleased) +---------------------- +- Fix #29: Fix login form view on browser back button after footer link + 1.8.2 (April 26, 2021) ---------------------- diff --git a/protected/humhub/widgets/views/footerNavigation_login.php b/protected/humhub/widgets/views/footerNavigation_login.php index d4d1301a89..97601998f2 100644 --- a/protected/humhub/widgets/views/footerNavigation_login.php +++ b/protected/humhub/widgets/views/footerNavigation_login.php @@ -14,7 +14,7 @@ $i = 0;
0): ?> - + true]); ?>  ·  From e388db32b2ce6ed24914c1169b795825113d533e Mon Sep 17 00:00:00 2001 From: Yuriy Bakhtin Date: Tue, 11 May 2021 14:00:07 +0300 Subject: [PATCH 3/5] Fix pin and archive global content without container (#5066) --- CHANGELOG.md | 1 + protected/humhub/modules/content/models/Content.php | 9 +++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 33d5bca660..1656fe79f4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ HumHub Changelog 1.8.3 (Unreleased) ---------------------- - Fix #29: Fix login form view on browser back button after footer link +- Fix #5066: Fix pin and archive global content without container 1.8.2 (April 26, 2021) diff --git a/protected/humhub/modules/content/models/Content.php b/protected/humhub/modules/content/models/Content.php index 71e9599a5d..3c09e2f8fb 100644 --- a/protected/humhub/modules/content/models/Content.php +++ b/protected/humhub/modules/content/models/Content.php @@ -371,6 +371,11 @@ class Content extends ActiveRecord implements Movable, ContentOwner */ public function canPin() { + // Currently global content can not be pinned + if (!$this->getContainer()) { + return false; + } + if ($this->isArchived()) { return false; } @@ -410,12 +415,12 @@ class Content extends ActiveRecord implements Movable, ContentOwner public function canArchive() { // Currently global content can not be archived - if (!$this->contentcontainer_id) { + if (!$this->getContainer()) { return false; } // No need to archive content on an archived container, content is marked as archived already - if ($this->content->content->getContainer()->isArchived()) { + if ($this->getContainer()->isArchived()) { return false; } From 9d9640a07c87955d3e0f2a2c53b477994d03604f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 12 May 2021 15:26:20 +0200 Subject: [PATCH 4/5] Bump lodash from 4.17.19 to 4.17.21 (#5070) Bumps [lodash](https://github.com/lodash/lodash) from 4.17.19 to 4.17.21. - [Release notes](https://github.com/lodash/lodash/releases) - [Commits](https://github.com/lodash/lodash/compare/4.17.19...4.17.21) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/package-lock.json b/package-lock.json index 15f117310c..3d11cdcbba 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1023,12 +1023,6 @@ "requires": { "lodash": "^4.17.10" } - }, - "lodash": { - "version": "4.17.19", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz", - "integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==", - "dev": true } } }, @@ -1551,9 +1545,9 @@ } }, "lodash": { - "version": "4.17.20", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz", - "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==", + "version": "4.17.21", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", + "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", "dev": true }, "longest": { From 29f9972da2b1a06cb2822f602c145dd37cbd32ad Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 12 May 2021 15:33:06 +0200 Subject: [PATCH 5/5] Bump hosted-git-info from 2.5.0 to 2.8.9 (#5069) Bumps [hosted-git-info](https://github.com/npm/hosted-git-info) from 2.5.0 to 2.8.9. - [Release notes](https://github.com/npm/hosted-git-info/releases) - [Changelog](https://github.com/npm/hosted-git-info/blob/v2.8.9/CHANGELOG.md) - [Commits](https://github.com/npm/hosted-git-info/compare/v2.5.0...v2.8.9) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 3d11cdcbba..7f4e3e1091 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1229,9 +1229,9 @@ "dev": true }, "hosted-git-info": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.5.0.tgz", - "integrity": "sha1-bWDjSzq7yDEwYsO3mO+NkBoHrzw=", + "version": "2.8.9", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz", + "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==", "dev": true }, "iconv-lite": {