diff --git a/CHANGELOG.md b/CHANGELOG.md index e0f62489a3..4547c72cdc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,11 +2,11 @@ ## v3.0.0 (Next Release) -### Breaking changes +## Breaking changes - #283 Upgrade to Angular 9 -### Enhancements +## Enhancements - #286 Get dsp-api version from the api server info - #285 Integrate OntoVis @@ -16,17 +16,23 @@ - #256 Add new unit tests to components in the main folder - #255 Fix wording through Knora-app -### Styling +## Styling - #275 Refactor material icons - #260 Same content style in each project tab -### Dependencies +## Documentation + +- #292 docs: Update README +## Dependencies + +- #293 Update js- and ui-lib version - #283 Upgrade to Angular 9 -### Maintenance +## Maintenance +- #291 DSP-617 Update release process - #290 DSP-617 Use release-drafter instead gren - #288 DSP-420 update release process - #287 Replace the term source by resource @@ -35,9 +41,10 @@ - #275 Refactor material icons - #259 Delete dev folder -### Testing +## Testing - #281 Update CI test environment +- #256 Add new unit tests to components in the main folder - #254 Add todo list in spec files --- diff --git a/Dockerfile b/Dockerfile index 9a65cfd8d6..8d9eb5263a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ ### STAGE 1: Build ### # We label our stage as 'builder' -FROM node:11-stretch as builder +FROM node:12-stretch as builder LABEL maintainer="ivan.subotic@unibas.ch" diff --git a/Makefile b/Makefile index c9b5816798..c070fa868d 100644 --- a/Makefile +++ b/Makefile @@ -7,7 +7,7 @@ CURRENT_DIR := $(shell dirname $(realpath $(firstword $(MAKEFILE_LIST)))) include vars.mk .PHONY: build-dsp-app-image -build-dsp-app-image: ## build and publish DSP APP image locally +build-dsp-app-image: ## build DSP APP image locally docker build -t $(DSP_APP_IMAGE) . docker tag $(DSP_APP_IMAGE) $(DSP_APP_REPO):latest diff --git a/package-lock.json b/package-lock.json index 9e2a52280e..71ab629ce6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1588,9 +1588,9 @@ } }, "@dasch-swiss/dsp-ui": { - "version": "1.0.0-rc.6", - "resolved": "https://registry.npmjs.org/@dasch-swiss/dsp-ui/-/dsp-ui-1.0.0-rc.6.tgz", - "integrity": "sha512-/IwxJ0D39ss2eolrMmWZAQW2hMyz/0465VUirFVuEmeX5S+zVZ98zx1nwqC50/MjQgxWbbj6d6BzlcUZPbI3Tg==", + "version": "1.0.0-rc.7", + "resolved": "https://registry.npmjs.org/@dasch-swiss/dsp-ui/-/dsp-ui-1.0.0-rc.7.tgz", + "integrity": "sha512-VvXEWlHSwPZtX3sUn2vwFBzFimjALYVL0ELHOslXtGttdpUbuMwtpIq7e1MCbrkYSq7bAru/lU1hgq3lE6ua3g==", "requires": { "tslib": "^1.10.0" } diff --git a/package.json b/package.json index 9642306e2c..b60d809db8 100644 --- a/package.json +++ b/package.json @@ -31,7 +31,7 @@ "@angular/platform-browser-dynamic": "~9.1.12", "@angular/router": "~9.1.12", "@dasch-swiss/dsp-js": "1.0.0-rc.11", - "@dasch-swiss/dsp-ui": "1.0.0-rc.6", + "@dasch-swiss/dsp-ui": "1.0.0-rc.7", "@ngx-translate/core": "^13.0.0", "@ngx-translate/http-loader": "^6.0.0", "3d-force-graph": "^1.60.12",