Pull the latest changes from main repo (#5)

* new file repolint-json (hyperledger-labs#223) Signed-off-by: Anil Kumar <anil.special2018@gmail.com> * Bump jinja2 from 2.10.1 to 2.11.3 in /docs (hyperledger-labs#224) Bumps [jinja2](https://github.com/pallets/jinja) from 2.10.1 to 2.11.3. - [Release notes](https://github.com/pallets/jinja/releases) - [Changelog](https://github.com/pallets/jinja/blob/master/CHANGES.rst) - [Commits](pallets/jinja@2.10.1...2.11.3) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump pygments from 2.1.3 to 2.7.4 in /docs (hyperledger-labs#225) Bumps [pygments](https://github.com/pygments/pygments) from 2.1.3 to 2.7.4. - [Release notes](https://github.com/pygments/pygments/releases) - [Changelog](https://github.com/pygments/pygments/blob/master/CHANGES) - [Commits](pygments/pygments@2.1.3...2.7.4) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump y18n from 3.2.1 to 3.2.2 (hyperledger-labs#226) Bumps [y18n](https://github.com/yargs/y18n) from 3.2.1 to 3.2.2. - [Release notes](https://github.com/yargs/y18n/releases) - [Changelog](https://github.com/yargs/y18n/blob/master/CHANGELOG.md) - [Commits](https://github.com/yargs/y18n/commits) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Be 694 UI link to trans (hyperledger-labs#227) * Bump react-dev-utils from 11.0.3 to 11.0.4 in /client (hyperledger-labs#222) Bumps [react-dev-utils](https://github.com/facebook/create-react-app/tree/HEAD/packages/react-dev-utils) from 11.0.3 to 11.0.4. - [Release notes](https://github.com/facebook/create-react-app/releases) - [Changelog](https://github.com/facebook/create-react-app/blob/master/CHANGELOG-1.x.md) - [Commits](https://github.com/facebook/create-react-app/commits/HEAD/packages/react-dev-utils) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Signed-off-by: Anil Kumar <anil.special2018@gmail.com> * new file repolint-json (hyperledger-labs#223) (#3) Signed-off-by: Anil Kumar <anil.special2018@gmail.com> * direct link to a transaction Signed-off-by: Anil Kumar <anil.special2018@gmail.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Be 862 Fix sync error (hyperledger-labs#228) * BE-862 Add null validation for sync error And upgraded fabric version Explorer supports Signed-off-by: Atsushi Neki <nekiaiken@gmail.com> * BE-862 Add test case to validate the fix Signed-off-by: Atsushi Neki <nekiaiken@gmail.com> * BE-866 Release v1.1.5 (hyperledger-labs#229) Signed-off-by: Atsushi Neki <nekiaiken@gmail.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Atsushin <atsushin@fast.au.fujitsu.com> Signed-off-by: Anil Kumar <anil.special2018@gmail.com>
anilspecial · May 14, 2021 · 2be2306 · 2be2306
1 parent 821245e
commit 2be2306
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,20 @@
+## v1.1.5
+
+* [5ce121a](https://github.com/hyperledger/blockchain-explorer/commit/5ce121a) Be 862 Fix sync error  (#228)
+* [b28b16e](https://github.com/hyperledger/blockchain-explorer/commit/b28b16e) Be 694 UI link to trans (#227)
+* [f658497](https://github.com/hyperledger/blockchain-explorer/commit/f658497) Bump y18n from 3.2.1 to 3.2.2 (#226)
+* [a3ec219](https://github.com/hyperledger/blockchain-explorer/commit/a3ec219) Bump pygments from 2.1.3 to 2.7.4 in /docs (#225)
+* [8c85d2a](https://github.com/hyperledger/blockchain-explorer/commit/8c85d2a) Bump jinja2 from 2.10.1 to 2.11.3 in /docs (#224)
+* [183a717](https://github.com/hyperledger/blockchain-explorer/commit/183a717) new file repolint-json (#223)
+* [157423b](https://github.com/hyperledger/blockchain-explorer/commit/157423b) Bump react-dev-utils from 11.0.3 to 11.0.4 in /client (#222)
+* [356804b](https://github.com/hyperledger/blockchain-explorer/commit/356804b) [BE-858](https://jira.hyperledger.org/browse/BE-858) Upgrade base image of Explorer container image (#220)
+* [b330520](https://github.com/hyperledger/blockchain-explorer/commit/b330520) Bump elliptic from 6.5.3 to 6.5.4 (#221)
+* [ab91ca7](https://github.com/hyperledger/blockchain-explorer/commit/ab91ca7) [BE-801](https://jira.hyperledger.org/browse/BE-801) Add the steps to configure a subdomain (#219)
+* [9834430](https://github.com/hyperledger/blockchain-explorer/commit/9834430) Fix layout of icons on navigation bar (#218)
+* [88b534d](https://github.com/hyperledger/blockchain-explorer/commit/88b534d) [BE-820](https://jira.hyperledger.org/browse/BE-820) fix vulnerabilities (#216)
+* [44a3065](https://github.com/hyperledger/blockchain-explorer/commit/44a3065) Change default branch to main (#215)
+* [0eb3340](https://github.com/hyperledger/blockchain-explorer/commit/0eb3340) [BE-854](https://jira.hyperledger.org/browse/BE-854) v1.1.4 release (2) (#214)
+
 ## v1.1.4
 
 * [2556be6](https://github.com/hyperledger/blockchain-explorer/commit/2556be6) [BE-853](https://jira.hyperledger.org/browse/BE-853) Resolve race condition of discovery request (#212)

diff --git a/README.md b/README.md
@@ -27,13 +27,13 @@ Hyperledger Explorer is a simple, powerful, easy-to-use, well maintained, open s
 
 | Hyperledger Explorer Version                                | Fabric Version Supported                                         | NodeJS Version Supported                          |
 | --                                                          | --                                                               | --                                                |
+| <b>[v1.1.5](release_notes/v1.1.5.md)</b> (Apr 20, 2021)  | [v1.4 to v2.3](https://hyperledger-fabric.readthedocs.io/en/release-2.3) | [^12.13.1, ^14.13.1](https://nodejs.org/en/download/releases) |
 | <b>[v1.1.4](release_notes/v1.1.4.md)</b> (Jan 29, 2021)  | [v1.4 to v2.2](https://hyperledger-fabric.readthedocs.io/en/release-2.2) | [^12.13.1, ^14.13.1](https://nodejs.org/en/download/releases) |
 | <b>[v1.1.3](release_notes/v1.1.3.md)</b> (Sep 28, 2020)  | [v1.4.0 to v2.2.0](https://hyperledger-fabric.readthedocs.io/en/release-2.2) | [12.16.x](https://nodejs.org/en/download/releases) |
 | <b>[v1.1.2](release_notes/v1.1.2.md)</b> (Aug 12, 2020)  | [v1.4.0 to v2.2.0](https://hyperledger-fabric.readthedocs.io/en/release-2.2) | [12.16.x](https://nodejs.org/en/download/releases) |
 | <b>[v1.1.1](release_notes/v1.1.1.md)</b> (Jul 17, 2020)  | [v1.4.0 to v2.1.1](https://hyperledger-fabric.readthedocs.io/en/release-2.1) | [12.16.x](https://nodejs.org/en/download/releases) |
 | <b>[v1.1.0](release_notes/v1.1.0.md)</b> (Jul 01, 2020)  | [v1.4.0 to v2.1.1](https://hyperledger-fabric.readthedocs.io/en/release-2.1) | [12.16.x](https://nodejs.org/en/download/releases) |
 | <b>[v1.0.0](release_notes/v1.0.0.md)</b> (Apr 09, 2020)  | [v1.4.0 to v1.4.8](https://hyperledger-fabric.readthedocs.io/en/release-1.4) | [10.19.x](https://nodejs.org/en/download/releases) |
-| <b>[v1.0.0-rc3](release_notes/v1.0.0-rc3.md)</b> (Apr 01, 2020)  | [v1.4.0 to v1.4.6](https://hyperledger-fabric.readthedocs.io/en/release-1.4) | [10.19.x](https://nodejs.org/en/download/releases) |
 
 ---
 

diff --git a/client/package.json b/client/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "hyperledger-explorer-client",
-	"version": "1.1.4",
+	"version": "1.1.5",
 	"private": true,
 	"license": "Apache-2.0",
 	"dependencies": {

diff --git a/client/src/FabricVersion.js b/client/src/FabricVersion.js
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: Apache-2.0
 
 // add new version of fabric here
-const FabricVersion = ['v2.2', 'v1.4'];
+const FabricVersion = ['v2.3', 'v1.4'];
 
 export default FabricVersion;
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "hyperledger-explorer",
-	"version": "1.1.4",
+	"version": "1.1.5",
 	"description": "hyperledger-explorer",
 	"private": true,
 	"main": "main.js",

diff --git a/release_notes/v1.1.5.md b/release_notes/v1.1.5.md
@@ -0,0 +1,18 @@
+<!-- (SPDX-License-Identifier: CC-BY-4.0) -->  <!-- Ensure there is a newline before, and after, this line -->
+
+## New Features
+
+* [BE-694](https://jira.hyperledger.org/browse/BE-694) Add UI link to trans (#227)
+* [BE-858](https://jira.hyperledger.org/browse/BE-858) Upgrade base image of Explorer container image (#220)
+* [BE-801](https://jira.hyperledger.org/browse/BE-801) Add the steps to configure a subdomain (#219)
+* Upgrade fabric version supported by Explorer (#227)
+
+## Bug Fixes and Updates
+
+* [BE-862](https://jira.hyperledger.org/browse/BE-862) Fix sync error  (#228)
+* Fix layout of icons on navigation bar (#218)
+
+## Known Vulnerabilities
+
+None
+