-
- Downloads
Merge branch 'develop' into...
Merge branch 'develop' into 217-re-work-login-and-registration-views-based-on-new-landing-page-design # Conflicts: # src/app/welcome/welcome.component.html
No related branches found
No related tags found
This commit is part of merge request !23. Comments created here will be created in the context of that merge request.
Showing
- docker/config.template.json 2 additions, 1 deletiondocker/config.template.json
- src/app/appmarket/appinstance/appinstance/appinstance.component.css 4 additions, 1 deletion...pmarket/appinstance/appinstance/appinstance.component.css
- src/app/appmarket/appinstance/appinstance/appinstance.component.html 1 addition, 1 deletion...market/appinstance/appinstance/appinstance.component.html
- src/app/service/appconfig.service.ts 5 additions, 1 deletionsrc/app/service/appconfig.service.ts
- src/app/shared/footer/footer.component.css 4 additions, 0 deletionssrc/app/shared/footer/footer.component.css
- src/app/shared/footer/footer.component.html 10 additions, 9 deletionssrc/app/shared/footer/footer.component.html
- src/app/shared/navbar/navbar.component.html 2 additions, 2 deletionssrc/app/shared/navbar/navbar.component.html
- src/app/welcome/welcome.component.css 60 additions, 48 deletionssrc/app/welcome/welcome.component.css
- src/app/welcome/welcome.component.html 125 additions, 85 deletionssrc/app/welcome/welcome.component.html
- src/app/welcome/welcome.component.ts 27 additions, 19 deletionssrc/app/welcome/welcome.component.ts
- src/assets/images/landing/VirtualLab.png 0 additions, 0 deletionssrc/assets/images/landing/VirtualLab.png
- src/assets/images/landing/VirtualNOC.png 0 additions, 0 deletionssrc/assets/images/landing/VirtualNOC.png
- src/assets/images/landing/g1.png 0 additions, 0 deletionssrc/assets/images/landing/g1.png
- src/assets/images/logo-small.png 0 additions, 0 deletionssrc/assets/images/logo-small.png
- src/config.json 2 additions, 1 deletionsrc/config.json
Loading
Please register or sign in to comment