From 87c313c933d8c66e45a6c6dcd6df3b3399fd50b8 Mon Sep 17 00:00:00 2001 From: Yuri Kuznetsov Date: Mon, 30 Aug 2021 10:46:57 +0300 Subject: [PATCH 1/2] update markdown --- composer.json | 2 +- composer.lock | 24 ++++++++++++++++-------- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/composer.json b/composer.json index 3102fae35b..592181916e 100644 --- a/composer.json +++ b/composer.json @@ -34,7 +34,7 @@ "cboden/ratchet": "^0.4.1", "react/zmq": "^0.4.0", "guzzlehttp/psr7": "^1.6", - "michelf/php-markdown": "^1.8", + "michelf/php-markdown": "^1.9", "robthree/twofactorauth": "^1.6", "nesbot/carbon": "^2.26", "zbateson/mail-mime-parser": "1.3.*", diff --git a/composer.lock b/composer.lock index c131bee75f..e9e336a16a 100644 --- a/composer.lock +++ b/composer.lock @@ -1,10 +1,10 @@ { "_readme": [ "This file locks the dependencies of your project to a known state", - "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", + "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "a32e7a77ab0ae1e795186b26455beb14", + "content-hash": "32d107ad55c128f9406e516593c6379d", "packages": [ { "name": "cboden/ratchet", @@ -1426,21 +1426,24 @@ }, { "name": "michelf/php-markdown", - "version": "1.8.0", + "version": "1.9.0", "source": { "type": "git", "url": "https://github.com/michelf/php-markdown.git", - "reference": "01ab082b355bf188d907b9929cd99b2923053495" + "reference": "c83178d49e372ca967d1a8c77ae4e051b3a3c75c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/michelf/php-markdown/zipball/01ab082b355bf188d907b9929cd99b2923053495", - "reference": "01ab082b355bf188d907b9929cd99b2923053495", + "url": "https://api.github.com/repos/michelf/php-markdown/zipball/c83178d49e372ca967d1a8c77ae4e051b3a3c75c", + "reference": "c83178d49e372ca967d1a8c77ae4e051b3a3c75c", "shasum": "" }, "require": { "php": ">=5.3.0" }, + "require-dev": { + "phpunit/phpunit": ">=4.3 <5.8" + }, "type": "library", "autoload": { "psr-4": { @@ -1468,7 +1471,11 @@ "keywords": [ "markdown" ], - "time": "2018-01-15T00:49:33+00:00" + "support": { + "issues": "https://github.com/michelf/php-markdown/issues", + "source": "https://github.com/michelf/php-markdown/tree/1.9.0" + }, + "time": "2019-12-02T02:32:27+00:00" }, { "name": "monolog/monolog", @@ -5521,5 +5528,6 @@ "ext-curl": "*", "ext-exif": "*" }, - "platform-dev": [] + "platform-dev": [], + "plugin-api-version": "2.1.0" } From 717b9db4afa5a574fd7291f08d01bb5439fc95bf Mon Sep 17 00:00:00 2001 From: Yuri Kuznetsov Date: Mon, 30 Aug 2021 10:49:36 +0300 Subject: [PATCH 2/2] v --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 696ba8335e..2f6c0b99ff 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "espocrm", - "version": "6.1.8", + "version": "6.1.9", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 31f61d9e25..6aa02e5fd4 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "espocrm", - "version": "6.1.8", + "version": "6.1.9", "description": "", "main": "index.php", "repository": {