Merge branch 'master' into prepare-admin (dbf1681e) · Commits · IQB / discontinued / testcenter-frontend · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

T

testcenter-frontend
- Activity
- Members
- Environments
- Terraform modules

Snippets Groups Projects

dbf1681e

Commit dbf1681e authored 5 years ago by Martin Mechtel

Downloads
- Plain Diff

Merge branch 'master' into prepare-admin

# Conflicts:
#	src/app/maindata.service.ts
#	src/app/sys-check/start.component.ts

parents 993b0ef6 98a41423

No related branches found

No related tags found

No related merge requests found

Changes 20

Hide whitespace changes

Inline Side-by-side

Showing

package.json 1 addition, 1 deletion

package.json
src/app/about/about.component.ts 3 additions, 5 deletions

src/app/about/about.component.ts
src/app/admin/workspace.component.ts 1 addition, 1 deletion

src/app/admin/workspace.component.ts
src/app/app.component.ts 1 addition, 1 deletion

src/app/app.component.ts
src/app/app.config.ts 2 additions, 2 deletions

src/app/app.config.ts
src/app/app.module.ts 4 additions, 1 deletion

src/app/app.module.ts
src/app/maindata.service.ts 6 additions, 6 deletions

src/app/maindata.service.ts
src/app/start/start.component.ts 2 additions, 2 deletions

src/app/start/start.component.ts
src/app/sys-check/backend.service.ts 1 addition, 4 deletions

src/app/sys-check/backend.service.ts
src/app/sys-check/network-check/network-check.component.ts 3 additions, 4 deletions

src/app/sys-check/network-check/network-check.component.ts
src/app/sys-check/questionnaire/questionnaire.component.ts 3 additions, 4 deletions

src/app/sys-check/questionnaire/questionnaire.component.ts
src/app/sys-check/report/report.component.ts 6 additions, 6 deletions

src/app/sys-check/report/report.component.ts
src/app/sys-check/start.component.ts 3 additions, 3 deletions

src/app/sys-check/start.component.ts
src/app/sys-check/sys-check.component.ts 6 additions, 6 deletions

src/app/sys-check/sys-check.component.ts
src/app/sys-check/unit-check/tc-navi-buttons/unit-navi-buttons.component.ts 1 addition, 1 deletion

...unit-check/tc-navi-buttons/unit-navi-buttons.component.ts
src/app/sys-check/unit-check/unit-check.component.html 1 addition, 1 deletion

src/app/sys-check/unit-check/unit-check.component.html
src/app/test-controller/test-controller.module.ts 2 additions, 1 deletion

src/app/test-controller/test-controller.module.ts
src/app/test-controller/unithost/unit-routing-guards.ts 5 additions, 2 deletions

src/app/test-controller/unithost/unit-routing-guards.ts
src/environments/environment.build.ts 1 addition, 1 deletion

src/environments/environment.build.ts
src/environments/environment.prod.ts 1 addition, 1 deletion

src/environments/environment.prod.ts

with 53 additions and 53 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment

Impressum | Datenschutzerklärung