Merge branch 'development' into '63-alterar-as-cores-da-pagina-de-visualizacao' (8c23b555) · Commits · pinsis-dev / pinsis-portal · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

P

pinsis-portal
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Environments
- Incidents

Snippets Groups Projects

8c23b555

Commit 8c23b555 authored 5 years ago by Mariana Moreira

Downloads
- Plain Diff

Merge branch 'development' into '63-alterar-as-cores-da-pagina-de-visualizacao'

# Conflicts:
#   pinsisApp/src/app/events/events.component.html

parents c8115b8c 591631cb

No related branches found

No related tags found

Loading

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

pinsisApp/src/app/edit-machine/edit-machine.component.html 9 additions, 4 deletions

pinsisApp/src/app/edit-machine/edit-machine.component.html
pinsisApp/src/app/edit-machine/edit-machine.component.scss 49 additions, 10 deletions

pinsisApp/src/app/edit-machine/edit-machine.component.scss
pinsisApp/src/app/edit-machine/edit-machine.component.ts 3 additions, 3 deletions

pinsisApp/src/app/edit-machine/edit-machine.component.ts
pinsisApp/src/app/events/events.component.html 0 additions, 10 deletions

pinsisApp/src/app/events/events.component.html
pinsisApp/src/app/login/login.component.scss 2 additions, 4 deletions

pinsisApp/src/app/login/login.component.scss
pinsisApp/src/app/login/login.component.ts 1 addition, 1 deletion

pinsisApp/src/app/login/login.component.ts
pinsisApp/src/app/main-page/main-page.component.html 12 additions, 5 deletions

pinsisApp/src/app/main-page/main-page.component.html
pinsisApp/src/app/main-page/main-page.component.ts 3 additions, 2 deletions

pinsisApp/src/app/main-page/main-page.component.ts
pinsisApp/src/app/register/register.component.ts 1 addition, 1 deletion

pinsisApp/src/app/register/register.component.ts

with 80 additions and 40 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