From 2a7fa40737c5c449021e3c32a3d18b2c5fc6b259 Mon Sep 17 00:00:00 2001 From: buddh4 Date: Fri, 21 Sep 2018 17:59:51 +0200 Subject: [PATCH] Chng: Updated `humhub-prosemirror-richtext` to v1.0.10 --- composer.json | 2 +- composer.lock | 163 +++++++++--------- protected/humhub/docs/CHANGELOG.md | 2 + .../resources/js/humhub.stream.Stream.js | 2 +- 4 files changed, 88 insertions(+), 81 deletions(-) diff --git a/composer.json b/composer.json index 00db4fd0cd..54a0103a36 100644 --- a/composer.json +++ b/composer.json @@ -42,7 +42,7 @@ "kartik-v/yii2-widgets": "*", "mistic100/randomcolor": "^1.0", "npm-asset/at.js": "^1.5.1", - "npm-asset/humhub-prosemirror-richtext": "1.0.9", + "npm-asset/humhub-prosemirror-richtext": "1.0.10", "npm-asset/socket.io-client": "^2.0", "nqxcode/zendsearch": "^2.0", "phpoffice/phpspreadsheet": "^1.0", diff --git a/composer.lock b/composer.lock index 7a08a60973..65f573fa6f 100644 --- a/composer.lock +++ b/composer.lock @@ -4,20 +4,20 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "440c83ea1ad4eae3c178ca68c2f87409", + "content-hash": "8eef87ea66e4af9d907221993c5fce48", "packages": [ { "name": "bower-asset/animate.css", - "version": "3.5.2", + "version": "3.7.0", "source": { "type": "git", "url": "https://github.com/daneden/animate.css.git", - "reference": "dac3dab7b59cb6072b5d0fe23eae3805e370a58c" + "reference": "940e4aef81edc26d3458480adcd475e51bd38df5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/daneden/animate.css/zipball/dac3dab7b59cb6072b5d0fe23eae3805e370a58c", - "reference": "dac3dab7b59cb6072b5d0fe23eae3805e370a58c", + "url": "https://api.github.com/repos/daneden/animate.css/zipball/940e4aef81edc26d3458480adcd475e51bd38df5", + "reference": "940e4aef81edc26d3458480adcd475e51bd38df5", "shasum": null }, "type": "bower-asset" @@ -43,16 +43,16 @@ }, { "name": "bower-asset/bluebird", - "version": "v3.5.1", + "version": "v3.5.2", "source": { "type": "git", "url": "https://github.com/petkaantonov/bluebird.git", - "reference": "6320ed7613aa27d3ec375d7bf166473c5c356aef" + "reference": "eb6400a0db2704388bd1652a3599e61d76b23803" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/petkaantonov/bluebird/zipball/6320ed7613aa27d3ec375d7bf166473c5c356aef", - "reference": "6320ed7613aa27d3ec375d7bf166473c5c356aef", + "url": "https://api.github.com/repos/petkaantonov/bluebird/zipball/eb6400a0db2704388bd1652a3599e61d76b23803", + "reference": "eb6400a0db2704388bd1652a3599e61d76b23803", "shasum": null }, "type": "bower-asset", @@ -973,16 +973,16 @@ }, { "name": "kartik-v/bootstrap-star-rating", - "version": "4.0.3", + "version": "v4.0.4", "source": { "type": "git", "url": "https://github.com/kartik-v/bootstrap-star-rating.git", - "reference": "19120d91a4495abd181c7d4cbb69da73537093af" + "reference": "67b2fbcb2d1a42a843d6798c7078c4f776d75664" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/kartik-v/bootstrap-star-rating/zipball/19120d91a4495abd181c7d4cbb69da73537093af", - "reference": "19120d91a4495abd181c7d4cbb69da73537093af", + "url": "https://api.github.com/repos/kartik-v/bootstrap-star-rating/zipball/67b2fbcb2d1a42a843d6798c7078c4f776d75664", + "reference": "67b2fbcb2d1a42a843d6798c7078c4f776d75664", "shasum": "" }, "type": "library", @@ -1013,7 +1013,7 @@ "star", "svg" ], - "time": "2017-11-03T07:22:19+00:00" + "time": "2018-09-15T18:18:35+00:00" }, { "name": "kartik-v/dependent-dropdown", @@ -1064,16 +1064,16 @@ }, { "name": "kartik-v/yii2-krajee-base", - "version": "v1.9.3", + "version": "v1.9.5", "source": { "type": "git", "url": "https://github.com/kartik-v/yii2-krajee-base.git", - "reference": "1d36fae5cdc2538ad048182f0b7362f40e45cea4" + "reference": "b830a4180bc2601df01de1c5c9eb1401f44efd8c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/kartik-v/yii2-krajee-base/zipball/1d36fae5cdc2538ad048182f0b7362f40e45cea4", - "reference": "1d36fae5cdc2538ad048182f0b7362f40e45cea4", + "url": "https://api.github.com/repos/kartik-v/yii2-krajee-base/zipball/b830a4180bc2601df01de1c5c9eb1401f44efd8c", + "reference": "b830a4180bc2601df01de1c5c9eb1401f44efd8c", "shasum": "" }, "require": { @@ -1111,24 +1111,24 @@ "widget", "yii2" ], - "time": "2018-08-29T02:57:02+00:00" + "time": "2018-09-20T14:19:08+00:00" }, { "name": "kartik-v/yii2-widget-activeform", - "version": "v1.5.1", + "version": "v1.5.3", "source": { "type": "git", "url": "https://github.com/kartik-v/yii2-widget-activeform.git", - "reference": "5e27a7181812a0b7eeb067544f000db76d2558dc" + "reference": "9b95a96c5399b2f66c3caaa11fd8d53a144ca861" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/kartik-v/yii2-widget-activeform/zipball/5e27a7181812a0b7eeb067544f000db76d2558dc", - "reference": "5e27a7181812a0b7eeb067544f000db76d2558dc", + "url": "https://api.github.com/repos/kartik-v/yii2-widget-activeform/zipball/9b95a96c5399b2f66c3caaa11fd8d53a144ca861", + "reference": "9b95a96c5399b2f66c3caaa11fd8d53a144ca861", "shasum": "" }, "require": { - "kartik-v/yii2-krajee-base": "~1.9" + "kartik-v/yii2-krajee-base": ">=1.9" }, "type": "yii2-extension", "extra": { @@ -1163,7 +1163,7 @@ "widget", "yii2" ], - "time": "2018-08-16T13:01:56+00:00" + "time": "2018-09-20T15:34:55+00:00" }, { "name": "kartik-v/yii2-widget-affix", @@ -1271,20 +1271,20 @@ }, { "name": "kartik-v/yii2-widget-colorinput", - "version": "v1.0.3", + "version": "v1.0.5", "source": { "type": "git", "url": "https://github.com/kartik-v/yii2-widget-colorinput.git", - "reference": "3f6e847ef72cf6e27e4d3b4870b00b8f80d51752" + "reference": "65f2c4b603ef0c26c3c85b0246a6a59f59045a43" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/kartik-v/yii2-widget-colorinput/zipball/3f6e847ef72cf6e27e4d3b4870b00b8f80d51752", - "reference": "3f6e847ef72cf6e27e4d3b4870b00b8f80d51752", + "url": "https://api.github.com/repos/kartik-v/yii2-widget-colorinput/zipball/65f2c4b603ef0c26c3c85b0246a6a59f59045a43", + "reference": "65f2c4b603ef0c26c3c85b0246a6a59f59045a43", "shasum": "" }, "require": { - "kartik-v/yii2-krajee-base": "*" + "kartik-v/yii2-krajee-base": ">=1.9" }, "type": "yii2-extension", "extra": { @@ -1294,12 +1294,12 @@ }, "autoload": { "psr-4": { - "kartik\\color\\": "" + "kartik\\color\\": "src" } }, "notification-url": "https://packagist.org/downloads/", "license": [ - "BSD 3-Clause" + "BSD-3-Clause" ], "authors": [ { @@ -1321,7 +1321,7 @@ "widget", "yii2" ], - "time": "2016-01-14T11:15:49+00:00" + "time": "2018-09-12T03:12:07+00:00" }, { "name": "kartik-v/yii2-widget-datepicker", @@ -1482,21 +1482,21 @@ }, { "name": "kartik-v/yii2-widget-fileinput", - "version": "v1.0.6", + "version": "v1.0.8", "source": { "type": "git", "url": "https://github.com/kartik-v/yii2-widget-fileinput.git", - "reference": "d2c8dcde1aa69ac0c4a0e3b3cfc0d79b3cc2a550" + "reference": "7f76d784cc48733746ff90b53b8474dcf48ea6c4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/kartik-v/yii2-widget-fileinput/zipball/d2c8dcde1aa69ac0c4a0e3b3cfc0d79b3cc2a550", - "reference": "d2c8dcde1aa69ac0c4a0e3b3cfc0d79b3cc2a550", + "url": "https://api.github.com/repos/kartik-v/yii2-widget-fileinput/zipball/7f76d784cc48733746ff90b53b8474dcf48ea6c4", + "reference": "7f76d784cc48733746ff90b53b8474dcf48ea6c4", "shasum": "" }, "require": { "kartik-v/bootstrap-fileinput": "~4.4", - "kartik-v/yii2-krajee-base": "~1.7" + "kartik-v/yii2-krajee-base": ">=1.9" }, "type": "yii2-extension", "extra": { @@ -1506,7 +1506,7 @@ }, "autoload": { "psr-4": { - "kartik\\file\\": "" + "kartik\\file\\": "src" } }, "notification-url": "https://packagist.org/downloads/", @@ -1520,7 +1520,7 @@ "homepage": "http://www.krajee.com/" } ], - "description": "An enhanced FileInput widget for Bootstrap 3.x with file preview, multiple selection, and more features (sub repo split from yii2-widgets)", + "description": "An enhanced FileInput widget for Bootstrap 3.x & 4.x with file preview, multiple selection, and more features (sub repo split from yii2-widgets)", "homepage": "https://github.com/kartik-v/yii2-widget-fileinput", "keywords": [ "extension", @@ -1533,7 +1533,7 @@ "widget", "yii2" ], - "time": "2017-05-25T20:12:30+00:00" + "time": "2018-09-19T13:09:42+00:00" }, { "name": "kartik-v/yii2-widget-growl", @@ -1586,30 +1586,35 @@ }, { "name": "kartik-v/yii2-widget-rangeinput", - "version": "v1.0.1", + "version": "v1.0.2", "source": { "type": "git", "url": "https://github.com/kartik-v/yii2-widget-rangeinput.git", - "reference": "ad82cf956b95555d39dbb534587c7827b1dc7bdf" + "reference": "dd9019bab7e5bf570a02870d9e74387891bbdb32" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/kartik-v/yii2-widget-rangeinput/zipball/ad82cf956b95555d39dbb534587c7827b1dc7bdf", - "reference": "ad82cf956b95555d39dbb534587c7827b1dc7bdf", + "url": "https://api.github.com/repos/kartik-v/yii2-widget-rangeinput/zipball/dd9019bab7e5bf570a02870d9e74387891bbdb32", + "reference": "dd9019bab7e5bf570a02870d9e74387891bbdb32", "shasum": "" }, "require": { - "kartik-v/yii2-krajee-base": "*" + "kartik-v/yii2-krajee-base": ">=1.9" }, "type": "yii2-extension", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, "autoload": { "psr-4": { - "kartik\\range\\": "" + "kartik\\range\\": "src" } }, "notification-url": "https://packagist.org/downloads/", "license": [ - "BSD 3-Clause" + "BSD-3-Clause" ], "authors": [ { @@ -1631,25 +1636,25 @@ "widget", "yii2" ], - "time": "2015-11-22T06:52:44+00:00" + "time": "2018-09-07T10:05:08+00:00" }, { "name": "kartik-v/yii2-widget-rating", - "version": "v1.0.3", + "version": "v1.0.4", "source": { "type": "git", "url": "https://github.com/kartik-v/yii2-widget-rating.git", - "reference": "5d022668555303c3963582af91beb4a6c9f94243" + "reference": "651eaa5e6a3bd19471e2a907fb17c3fd92f383e7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/kartik-v/yii2-widget-rating/zipball/5d022668555303c3963582af91beb4a6c9f94243", - "reference": "5d022668555303c3963582af91beb4a6c9f94243", + "url": "https://api.github.com/repos/kartik-v/yii2-widget-rating/zipball/651eaa5e6a3bd19471e2a907fb17c3fd92f383e7", + "reference": "651eaa5e6a3bd19471e2a907fb17c3fd92f383e7", "shasum": "" }, "require": { - "kartik-v/bootstrap-star-rating": "*", - "kartik-v/yii2-krajee-base": "*" + "kartik-v/bootstrap-star-rating": "~4.0", + "kartik-v/yii2-krajee-base": ">=1.9" }, "type": "yii2-extension", "extra": { @@ -1659,12 +1664,12 @@ }, "autoload": { "psr-4": { - "kartik\\rating\\": "" + "kartik\\rating\\": "src" } }, "notification-url": "https://packagist.org/downloads/", "license": [ - "BSD 3-Clause" + "BSD-3-Clause" ], "authors": [ { @@ -1687,24 +1692,24 @@ "widget", "yii2" ], - "time": "2017-11-18T12:24:51+00:00" + "time": "2018-09-16T09:30:44+00:00" }, { "name": "kartik-v/yii2-widget-select2", - "version": "v2.1.2", + "version": "v2.1.3", "source": { "type": "git", "url": "https://github.com/kartik-v/yii2-widget-select2.git", - "reference": "c109c0f153def3be9f7a874dbaf5c951e5a62e73" + "reference": "f1ae98b7ec3e46ba0193471647ce15d07aa67f58" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/kartik-v/yii2-widget-select2/zipball/c109c0f153def3be9f7a874dbaf5c951e5a62e73", - "reference": "c109c0f153def3be9f7a874dbaf5c951e5a62e73", + "url": "https://api.github.com/repos/kartik-v/yii2-widget-select2/zipball/f1ae98b7ec3e46ba0193471647ce15d07aa67f58", + "reference": "f1ae98b7ec3e46ba0193471647ce15d07aa67f58", "shasum": "" }, "require": { - "kartik-v/yii2-krajee-base": "~1.9" + "kartik-v/yii2-krajee-base": ">=1.9" }, "type": "yii2-extension", "extra": { @@ -1740,7 +1745,7 @@ "widget", "yii2" ], - "time": "2018-08-17T07:47:43+00:00" + "time": "2018-09-07T08:11:16+00:00" }, { "name": "kartik-v/yii2-widget-sidenav", @@ -1945,20 +1950,20 @@ }, { "name": "kartik-v/yii2-widget-touchspin", - "version": "v1.2.2", + "version": "v1.2.3", "source": { "type": "git", "url": "https://github.com/kartik-v/yii2-widget-touchspin.git", - "reference": "a62555e7aa335c10c64629bba8e4880ca48f4ca8" + "reference": "1daca822ad11258242178155613da8e269e3df2b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/kartik-v/yii2-widget-touchspin/zipball/a62555e7aa335c10c64629bba8e4880ca48f4ca8", - "reference": "a62555e7aa335c10c64629bba8e4880ca48f4ca8", + "url": "https://api.github.com/repos/kartik-v/yii2-widget-touchspin/zipball/1daca822ad11258242178155613da8e269e3df2b", + "reference": "1daca822ad11258242178155613da8e269e3df2b", "shasum": "" }, "require": { - "kartik-v/yii2-krajee-base": "~1.9" + "kartik-v/yii2-krajee-base": ">=1.9" }, "type": "yii2-extension", "extra": { @@ -1996,7 +2001,7 @@ "widget", "yii2" ], - "time": "2018-08-17T12:43:42+00:00" + "time": "2018-09-05T11:59:34+00:00" }, { "name": "kartik-v/yii2-widget-typeahead", @@ -2499,12 +2504,12 @@ }, { "name": "npm-asset/humhub-prosemirror-richtext", - "version": "1.0.9", + "version": "1.0.10", "dist": { "type": "tar", - "url": "https://registry.npmjs.org/humhub-prosemirror-richtext/-/humhub-prosemirror-richtext-1.0.9.tgz", + "url": "https://registry.npmjs.org/humhub-prosemirror-richtext/-/humhub-prosemirror-richtext-1.0.10.tgz", "reference": null, - "shasum": "0221ae843a261b20517cd3bbd117bcb34cc7802b" + "shasum": "8be5623b7065d2229bed2697d36c5e7416fefa85" }, "type": "npm-asset-library", "extra": { @@ -2523,7 +2528,7 @@ ], "description": "Prosemirror based richtext implementation for the humhub social network", "homepage": "https://github.com/humhub/humhub-prosemirror#readme", - "time": "2018-09-04T15:43:03+00:00" + "time": "2018-09-21T15:00:49+00:00" }, { "name": "npm-asset/indexof", @@ -3371,16 +3376,16 @@ }, { "name": "yiisoft/yii2-authclient", - "version": "2.1.5", + "version": "2.1.7", "source": { "type": "git", "url": "https://github.com/yiisoft/yii2-authclient.git", - "reference": "ff826241c231d8f768f4cb58577d6956fdbc5fab" + "reference": "51ed208515a2d04c538b2c498c4f760481a431b5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/yiisoft/yii2-authclient/zipball/ff826241c231d8f768f4cb58577d6956fdbc5fab", - "reference": "ff826241c231d8f768f4cb58577d6956fdbc5fab", + "url": "https://api.github.com/repos/yiisoft/yii2-authclient/zipball/51ed208515a2d04c538b2c498c4f760481a431b5", + "reference": "51ed208515a2d04c538b2c498c4f760481a431b5", "shasum": "" }, "require": { @@ -3419,7 +3424,7 @@ "oauth", "yii2" ], - "time": "2018-02-07T21:12:40+00:00" + "time": "2018-09-20T07:23:55+00:00" }, { "name": "yiisoft/yii2-bootstrap", diff --git a/protected/humhub/docs/CHANGELOG.md b/protected/humhub/docs/CHANGELOG.md index a8d5b91de2..7de46b8c9d 100644 --- a/protected/humhub/docs/CHANGELOG.md +++ b/protected/humhub/docs/CHANGELOG.md @@ -20,6 +20,8 @@ HumHub Change Log - Fix: Space head count includes disabled user - Fix: Broken picker image alignment (acs-ferreira) - Fix: File handling in upgrade path between 1.0.x and 1.3.x +- Chng: Updated `humhub-prosemirror-richtext` to v1.0.10 + 1.3.2 (September 4, 2018) -------------------------- diff --git a/protected/humhub/modules/stream/resources/js/humhub.stream.Stream.js b/protected/humhub/modules/stream/resources/js/humhub.stream.Stream.js index 52588c2f07..e655df9c8e 100644 --- a/protected/humhub/modules/stream/resources/js/humhub.stream.Stream.js +++ b/protected/humhub/modules/stream/resources/js/humhub.stream.Stream.js @@ -5,7 +5,7 @@ * */ -/**do +/** * Core module for managing Streams and StreamItems * @type Function */