Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

LOFAR
- Activity
- Members
- Labels
- Issues
- Wiki
- Jira issues
- Open Jira
- Environments
- Terraform modules

Snippets Groups Projects

89f02982

Commit 89f02982 authored 4 years ago by Ramesh Kumar

Downloads
- Plain Diff

TMSS-319:Merge branch 'TMSS-319' into TMSS-348

# Conflicts:
#	SAS/TMSS/frontend/tmss_webapp/src/routes/Project/list.js

Resolved Conflicts

parents 52949868 08f63993

No related branches found

No related tags found

1 merge request!214Resolve TMSS-348 - Merged other local branches

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

SAS/TMSS/frontend/tmss_webapp/src/__mocks__/project.service.data.js 4 additions, 0 deletions

...rontend/tmss_webapp/src/__mocks__/project.service.data.js
SAS/TMSS/frontend/tmss_webapp/src/routes/Project/create.js 73 additions, 24 deletions

SAS/TMSS/frontend/tmss_webapp/src/routes/Project/create.js
SAS/TMSS/frontend/tmss_webapp/src/routes/Project/edit.js 67 additions, 19 deletions

SAS/TMSS/frontend/tmss_webapp/src/routes/Project/edit.js
SAS/TMSS/frontend/tmss_webapp/src/routes/Project/list.js 36 additions, 29 deletions

SAS/TMSS/frontend/tmss_webapp/src/routes/Project/list.js
SAS/TMSS/frontend/tmss_webapp/src/routes/Project/view.js 18 additions, 23 deletions

SAS/TMSS/frontend/tmss_webapp/src/routes/Project/view.js
SAS/TMSS/frontend/tmss_webapp/src/services/project.service.js 18 additions, 0 deletions

...TMSS/frontend/tmss_webapp/src/services/project.service.js
SAS/TMSS/frontend/tmss_webapp/src/services/project.services.js 162 additions, 0 deletions

...MSS/frontend/tmss_webapp/src/services/project.services.js

with 378 additions and 95 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