Merge branch 'master' into 'screenshot'
# Conflicts: # src/app/components/analysis-window/analysis-window.component.ts # src/app/pages/explorer-page/explorer-page.component.html
No related branches found
No related tags found
Showing
- package-lock.json 5 additions, 0 deletionspackage-lock.json
- package.json 1 addition, 0 deletionspackage.json
- src/app/analysis.service.ts 77 additions, 25 deletionssrc/app/analysis.service.ts
- src/app/components/analysis-window/analysis-window.component.html 32 additions, 75 deletions...components/analysis-window/analysis-window.component.html
- src/app/components/analysis-window/analysis-window.component.scss 12 additions, 0 deletions...components/analysis-window/analysis-window.component.scss
- src/app/components/analysis-window/analysis-window.component.ts 43 additions, 7 deletions...p/components/analysis-window/analysis-window.component.ts
- src/app/components/launch-analysis/launch-analysis.component.html 11 additions, 14 deletions...components/launch-analysis/launch-analysis.component.html
- src/app/components/launch-analysis/launch-analysis.component.ts 28 additions, 5 deletions...p/components/launch-analysis/launch-analysis.component.ts
- src/app/components/task-list/task-list.component.html 6 additions, 5 deletionssrc/app/components/task-list/task-list.component.html
- src/app/interfaces.ts 2 additions, 0 deletionssrc/app/interfaces.ts
- src/app/pages/explorer-page/explorer-page.component.html 93 additions, 67 deletionssrc/app/pages/explorer-page/explorer-page.component.html
- src/app/pages/explorer-page/explorer-page.component.ts 132 additions, 119 deletionssrc/app/pages/explorer-page/explorer-page.component.ts
- src/index.html 1 addition, 0 deletionssrc/index.html
- src/styles.scss 2 additions, 1 deletionsrc/styles.scss
Loading
Please register or sign in to comment