From 84ecb5d31b43aa0bb3e0052f48386a252b75fa8d Mon Sep 17 00:00:00 2001
From: buddh4 <julian.harrer@humhub.com>
Date: Wed, 11 Dec 2019 11:39:38 +0100
Subject: [PATCH] Enh: Updated richtext version to 1.0.18

---
 composer.json                          |  2 +-
 composer.lock                          | 21 +++++++++++----------
 protected/humhub/docs/CHANGELOG_DEV.md |  2 +-
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/composer.json b/composer.json
index 8b6efbdc3c..75b58a059a 100644
--- a/composer.json
+++ b/composer.json
@@ -43,7 +43,7 @@
         "kartik-v/yii2-widgets": "*",
         "mistic100/randomcolor": "^1.0",
         "npm-asset/at.js": "^1.5.1",
-        "npm-asset/humhub-prosemirror-richtext": "1.0.17",
+        "npm-asset/humhub-prosemirror-richtext": "1.0.18",
         "npm-asset/socket.io-client": "^2.0",
         "nqxcode/zendsearch": "^2.0",
         "phpoffice/phpspreadsheet": "^1.0",
diff --git a/composer.lock b/composer.lock
index dc5207bd58..defae1d214 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,14 +4,14 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "5b2fc2e65860abe0c92942c2be8f0617",
+    "content-hash": "4bded2421b5cbe6a721af3b0b7b258f3",
     "packages": [
         {
             "name": "bower-asset/bootstrap",
             "version": "v3.4.1",
             "source": {
                 "type": "git",
-                "url": "git@github.com:twbs/bootstrap.git",
+                "url": "https://github.com/twbs/bootstrap.git",
                 "reference": "68b0d231a13201eb14acd3dc84e51543d16e5f7e"
             },
             "dist": {
@@ -2292,10 +2292,10 @@
         },
         {
             "name": "npm-asset/humhub-prosemirror-richtext",
-            "version": "1.0.17",
+            "version": "1.0.18",
             "dist": {
                 "type": "tar",
-                "url": "https://registry.npmjs.org/humhub-prosemirror-richtext/-/humhub-prosemirror-richtext-1.0.17.tgz",
+                "url": "https://registry.npmjs.org/humhub-prosemirror-richtext/-/humhub-prosemirror-richtext-1.0.18.tgz",
                 "reference": null,
                 "shasum": null
             },
@@ -4821,16 +4821,16 @@
         },
         {
             "name": "guzzlehttp/guzzle",
-            "version": "6.4.1",
+            "version": "6.5.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/guzzle.git",
-                "reference": "0895c932405407fd3a7368b6910c09a24d26db11"
+                "reference": "dbc2bc3a293ed6b1ae08a3651e2bfd213d19b6a5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/0895c932405407fd3a7368b6910c09a24d26db11",
-                "reference": "0895c932405407fd3a7368b6910c09a24d26db11",
+                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/dbc2bc3a293ed6b1ae08a3651e2bfd213d19b6a5",
+                "reference": "dbc2bc3a293ed6b1ae08a3651e2bfd213d19b6a5",
                 "shasum": ""
             },
             "require": {
@@ -4845,12 +4845,13 @@
                 "psr/log": "^1.1"
             },
             "suggest": {
+                "ext-intl": "Required for Internationalized Domain Name (IDN) support",
                 "psr/log": "Required for using the Log middleware"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "6.3-dev"
+                    "dev-master": "6.5-dev"
                 }
             },
             "autoload": {
@@ -4883,7 +4884,7 @@
                 "rest",
                 "web service"
             ],
-            "time": "2019-10-23T15:58:00+00:00"
+            "time": "2019-12-07T18:20:45+00:00"
         },
         {
             "name": "guzzlehttp/promises",
diff --git a/protected/humhub/docs/CHANGELOG_DEV.md b/protected/humhub/docs/CHANGELOG_DEV.md
index faf032ed0b..27923f8105 100644
--- a/protected/humhub/docs/CHANGELOG_DEV.md
+++ b/protected/humhub/docs/CHANGELOG_DEV.md
@@ -28,7 +28,7 @@ HumHub Change Log (DEVELOP)
 - Enh #3771: Added `data-ui-addition="acknowledgeForm"` in order to prevent page changes without save/confirmation
 - Enh #3771: Added `humhub\modules\ui\form\widgets\ActiveForm:acknowledge` flag
 - Chng: Use of `BlueimpGalleryAsset` npm asset instead of static asset file
-- Enh: Add gallery view of richtext images
+- Enh: Updated richtext version to 1.0.18 see (https://github.com/humhub/humhub-prosemirror/blob/master/docs/CHANGELOG.md)
 
 1.4
 ---