Merge branch 'addSettings' into 'master' (5ab3d2e8) · Commits · ARSnova / arsnova-lite · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

A

arsnova-lite
- Activity
- Members
- Labels
- Releases
- Environments
- Incidents

Snippets Groups Projects

5ab3d2e8

Commit 5ab3d2e8 authored 6 years ago by

Lukas Mauß

Downloads
- Plain Diff

Merge branch 'addSettings' into 'master'

add json config to repository

Closes #198

See merge request !149

parents 8122bcd6 760be3f2

Pipeline #23998 failed with stages

in 2 minutes and 7 seconds

Changes 8
Pipelines 2

Hide whitespace changes

Inline Side-by-side

Showing

src/app/app.config.ts 20 additions, 0 deletions

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

src/app/app.module.ts
src/app/components/home/new-landing/new-landing.component.ts 3 additions, 1 deletion

src/app/components/home/new-landing/new-landing.component.ts
src/app/models/app-config.model.ts 14 additions, 0 deletions

src/app/models/app-config.model.ts
src/assets/config/config.dev.json 14 additions, 0 deletions

src/assets/config/config.dev.json
src/assets/config/config.prod.json 14 additions, 0 deletions

src/assets/config/config.prod.json
src/environments/environment.prod.ts 1 addition, 0 deletions

src/environments/environment.prod.ts
src/environments/environment.ts 1 addition, 0 deletions

src/environments/environment.ts

with 78 additions and 2 deletions

0% 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