Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

616f5c81

Commit 616f5c81 authored 4 years ago by Auke Klazema

Downloads
- Plain Diff

Merge branch 'TMSS-309' into 'master'

Resolve TMSS-309

Closes TMSS-309

See merge request !263

parents 0e58647a 1e2ed56c

No related branches found

No related tags found

2 merge requests!263Resolve TMSS-309,!260syncing cob-master with master again

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

.gitignore 1 addition, 0 deletions

.gitignore
SAS/TMSS/frontend/tmss_webapp/src/components/Timeline/CalendarTimeline.js 2 additions, 2 deletions

...d/tmss_webapp/src/components/Timeline/CalendarTimeline.js
SAS/TMSS/frontend/tmss_webapp/src/routes/Project/view.js 2 additions, 2 deletions

SAS/TMSS/frontend/tmss_webapp/src/routes/Project/view.js
SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/SchedulingUnitList.js 40 additions, 29 deletions

...d/tmss_webapp/src/routes/Scheduling/SchedulingUnitList.js
SAS/TMSS/frontend/tmss_webapp/src/routes/Timeline/view.js 1 addition, 1 deletion

SAS/TMSS/frontend/tmss_webapp/src/routes/Timeline/view.js
SAS/TMSS/frontend/tmss_webapp/src/routes/Timeline/week.view.js 2 additions, 2 deletions

...MSS/frontend/tmss_webapp/src/routes/Timeline/week.view.js
SAS/TMSS/frontend/tmss_webapp/src/services/schedule.service.js 8 additions, 0 deletions

...MSS/frontend/tmss_webapp/src/services/schedule.service.js

with 56 additions and 36 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