Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

P

plugin
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Iterations
- Wiki
- Requirements
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

This is an archived project. Repository and other project resources are read-only.

c1e0eb24

Commit c1e0eb24 authored 4 years ago by Julian Späth

Downloads
- Plain Diff

Merge branch 'master' into 'screenshot'

# Conflicts:
#   src/app/components/analysis-window/analysis-window.component.ts
#   src/app/pages/explorer-page/explorer-page.component.html

parents 3e3c0c70 818c4b14

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

src/app/analysis.service.ts 9 additions, 9 deletions

src/app/analysis.service.ts
src/app/components/analysis-window/analysis-window.component.ts 53 additions, 27 deletions

...p/components/analysis-window/analysis-window.component.ts
src/app/interfaces.ts 8 additions, 2 deletions

src/app/interfaces.ts
src/app/pages/explorer-page/explorer-page.component.html 38 additions, 18 deletions

src/app/pages/explorer-page/explorer-page.component.html
src/app/pages/explorer-page/explorer-page.component.ts 30 additions, 30 deletions

src/app/pages/explorer-page/explorer-page.component.ts
src/styles.scss 4 additions, 0 deletions

src/styles.scss

with 142 additions and 86 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