Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

O

oser-frontend
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

efe22d3e

Commit efe22d3e authored 2 years ago by Hamza Touizrat

Downloads
- Plain Diff

Merge branch 'master' into 'new_signup'

# Conflicts:
#   src/app/members/account/edit-data/edit-data.component.html
#   src/app/members/account/edit-data/edit-data.component.ts

parents c6e1808b 9f776cff

No related branches found

No related tags found

1 merge request!80New signup

Changes 12

Expand all Show whitespace changes

Inline Side-by-side

Showing

.dockerignore 6 additions, 0 deletions

.dockerignore
.vscode/settings.json 3 additions, 0 deletions

.vscode/settings.json
Dockerfile 10 additions, 0 deletions

Dockerfile
README.md 14 additions, 1 deletion

README.md
package-lock.json 14482 additions, 23 deletions

package-lock.json
package.json 1 addition, 0 deletions

package.json
src/app/members/account/edit-data/edit-data.component.html 3 additions, 1 deletion

src/app/members/account/edit-data/edit-data.component.html
src/app/members/account/edit-data/edit-data.component.ts 0 additions, 2 deletions

src/app/members/account/edit-data/edit-data.component.ts
src/app/members/visits/shared/adapters.ts 1 addition, 0 deletions

src/app/members/visits/shared/adapters.ts
src/app/members/visits/shared/models.ts 3 additions, 0 deletions

src/app/members/visits/shared/models.ts
src/app/members/visits/visit-detail/visit-detail.component.html 21 additions, 19 deletions

...p/members/visits/visit-detail/visit-detail.component.html
src/app/signup/core/index.ts 1 addition, 1 deletion

src/app/signup/core/index.ts

with 14545 additions and 47 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