Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Prerelease: 1.0.0-rc.6 #176

Merged
merged 5 commits into from
Sep 15, 2020
Merged

Prerelease: 1.0.0-rc.6 #176

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ff9efac
release(prerelease): 1.0.0-rc.6
kilchenmann Sep 15, 2020
d10cb50
chore: Update js-lib version
kilchenmann Sep 15, 2020
f4f64a1
chore: Fix md warning
kilchenmann Sep 15, 2020
044bf26
chore: Update js-lib version
kilchenmann Sep 15, 2020
41826bd
Merge branch 'master' into prerelease/v1.0.0-rc.6
kilchenmann Sep 15, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,6 +246,7 @@ To build and run the application in Docker, do the following:
The first step builds the lib and app in Docker. Make sure to delete the contents of the `dist` folder on your local system first.

The second step runs a container based on the image built in the previous step:

- `-v` mounts a config file from your local file system in the Docker container, so you can set the config.
- `--publish` maps the port on your local machine to the port in the Docker container.

Expand Down
8 changes: 4 additions & 4 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "dsp-ui-lib",
"version": "1.0.0-rc.5",
"version": "1.0.0-rc.6",
"description": "Angular library to easily create a Knora/DSP user interface",
"repository": {
"type": "git",
Expand Down Expand Up @@ -46,7 +46,7 @@
"@angular/platform-browser": "~9.1.2",
"@angular/platform-browser-dynamic": "~9.1.2",
"@angular/router": "~9.1.2",
"@dasch-swiss/dsp-js": "1.0.0-rc.10",
"@dasch-swiss/dsp-js": "1.0.0-rc.11",
"jdnconvertiblecalendar": "^0.0.5",
"jdnconvertiblecalendardateadapter": "^0.0.13",
"ngx-color-picker": "^9.1.0",
Expand Down
2 changes: 1 addition & 1 deletion projects/dsp-ui/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@dasch-swiss/dsp-ui",
"version": "1.0.0-rc.5",
"version": "1.0.0-rc.6",
"description": "Angular library to easily create a Knora/DSP user interface",
"repository": {
"type": "git",
Expand Down