Skip to content

Commit

Permalink
Merge pull request #738 from nemgrouplimited/dev
Browse files Browse the repository at this point in the history
Dev -> Main
  • Loading branch information
AnthonyLaw authored Dec 14, 2020
2 parents 9b227c1 + 2e9421e commit 44bd60c
Show file tree
Hide file tree
Showing 30 changed files with 299 additions and 282 deletions.
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "travis"]
path = travis
url = https://github.com/nemgrouplimited/travis-functions.git
66 changes: 39 additions & 27 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,38 +2,50 @@ language: node_js
services:
- docker
node_js:
- "8"
- "9"
- "10"
- "12"
env:
global:
- DEV_BRANCH=dev
- RELEASE_BRANCH=main
- POST_RELEASE_BRANCH=main
- RELEASE_MESSAGE=release
cache:
npm: true
directories:
- ./node_modules
- "node_modules"
override:
- npx cypress verify
before_install:
- npm i -g [email protected]
before_script:
- npm run build
- . ./travis/node-functions.sh
- VERSION="$(node_load_version)"
- log_env_variables
script:
- npm run lint
- npm run lint:css
deploy:
# automation build docker images for release branch
- provider: script
skip_cleanup: true
script: /bin/sh travis/docker.sh
on:
branch: $RELEASE_BRANCH
- provider: script
skip_cleanup: true
script: /bin/sh travis/release.sh
on:
branch: $RELEASE_BRANCH
# automation build docker images for main branch
- provider: script
skip_cleanup: true
script: /bin/sh travis/docker.sh
on:
branch: $MAIN_BRANCH

- npm run build
jobs:
include:
- stage: test
name: lint
script: npm run lint
- stage: test
name: lint css
script: npm run lint:css
- stage: test
name: docker test build
script: /bin/bash travis/docker-functions.sh docker_build $VERSION
node_js: 10
- stage: publish
name: docker publish alpha
script: /bin/bash travis/docker-functions.sh docker_build $VERSION publish
if: branch = env(DEV_BRANCH) AND type = push
node_js: 10
- stage: release
name: docker publish release
script: /bin/bash travis/docker-functions.sh docker_build $VERSION release
if: branch = env(RELEASE_BRANCH) AND type = api AND commit_message = env(RELEASE_MESSAGE)
node_js: 10
- stage: post release
name: tag and version upgrade
script: /bin/bash travis/node-functions.sh node_post_release
if: branch = env(RELEASE_BRANCH) AND type = api AND commit_message = env(RELEASE_MESSAGE)
node_js: 10
33 changes: 32 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,36 @@ All notable changes to this project will be documented in this file.

The changelog format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).

## [v0.7.0][v0.7.0] - 9-Dec-2020

### Milestone: [[email protected]](https://github.com/nemtech/catapult-server/releases/tag/v0.10.0.4)

Package | Version | Link
---|---|---
REST Core| v2.2.0 | [catapult-rest](https://github.com/nemtech/catapult-rest/releases/tag/v2.2.0)
SDK Core| v0.22.2 | [symbol-sdk](https://www.npmjs.com/package/symbol-sdk)

### Added
- Added compatibility for 0.10.0.4 server.
- Add extra graph info into transaction list [#709](https://github.com/nemgrouplimited/symbol-explorer/pull/709)
- Display node type on base info widget (Voting node / non voting node) [#723](https://github.com/nemgrouplimited/symbol-explorer/pull/723)
- View receipt info in detail page such as Account, Block, Mosaic and Namespace [#716](https://github.com/nemgrouplimited/symbol-explorer/pull/716)
- Display more than 1 alias name in listing or detail page. [#716](https://github.com/nemgrouplimited/symbol-explorer/pull/717)
- New message component [#724](https://github.com/nemgrouplimited/symbol-explorer/pull/724)

### Fixed
- Finalized Blocks are not up to date [#675](https://github.com/nemgrouplimited/symbol-explorer/issues/675)
- Replace hardcoded XYM text from i18n properties [#684](https://github.com/nemgrouplimited/symbol-explorer/issues/684)
- Addresses are not displayed correctly [#701](https://github.com/nemgrouplimited/symbol-explorer/issues/701)
- Transaction Detail. Doesn't display info for some transactions [#703](https://github.com/nemgrouplimited/symbol-explorer/issues/703)
- Display all transactions at one page for an account [#704](https://github.com/nemgrouplimited/symbol-explorer/issues/704)
- Namespace Detail. Handle expired namespace. [#705](https://github.com/nemgrouplimited/symbol-explorer/issues/705)
- TG. Aggrate Bonded icon missing. [#706](https://github.com/nemgrouplimited/symbol-explorer/issues/706)
- Only one account alias is presented. [#714](https://github.com/nemgrouplimited/symbol-explorer/issues/714)
- Minor change for CR. [#718](https://github.com/nemgrouplimited/symbol-explorer/issues/718)
- Account Detail. metadata is missing. [#725](https://github.com/nemgrouplimited/symbol-explorer/issues/725)


## [v0.6.2][v0.6.2] - 19-Oct-2020

### Milestone: [[email protected]](https://github.com/nemtech/catapult-server/releases/tag/v0.10.0.3)
Expand All @@ -26,7 +56,7 @@ SDK Core| v0.21.0 | [symbol-sdk](https://www.npmjs.com/package/symbol-sdk)
- Namespaces List. Showing wrong Expiration and Expiration Date [#644](https://github.com/nemgrouplimited/symbol-explorer/issues/644)
- Problem with presenting address without outgoing transactions. [#663](https://github.com/nemgrouplimited/symbol-explorer/issues/663)
- Problem with displaying account detail. [#638](https://github.com/nemgrouplimited/symbol-explorer/issues/638)
- Page Assembler 'adaptive' card layout.
- Page Assembler 'adaptive' card layout.
- Fixes wrong display expiration date in the namespace list on the private network. [#686](https://github.com/nemgrouplimited/symbol-explorer/pull/686)

## [v0.6.1][v0.6.1] - 2-Oct-2020
Expand Down Expand Up @@ -175,3 +205,4 @@ SDK Core| v0.20.7 | [symbol-sdk](https://www.npmjs.com/package/symbol-sdk)
[v0.6.0]: https://github.com/nemfoundation/symbol-explorer/releases/tag/v0.6.0
[v0.6.1]: https://github.com/nemfoundation/symbol-explorer/releases/tag/v0.6.1
[v0.6.2]: https://github.com/nemfoundation/symbol-explorer/releases/tag/v0.6.2
[v0.7.0]: https://github.com/nemfoundation/symbol-explorer/releases/tag/v0.7.0
Loading

0 comments on commit 44bd60c

Please sign in to comment.