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

5d814ec8

Commit 5d814ec8 authored 4 years ago by Jorrit Schaap

Downloads
- Plain Diff

Merge branch 'TMSS-356' into 'master'

Resolve TMSS-356

Closes TMSS-356 and TMSS-353

See merge request !243

parents 1cf01681 084e9b3b

No related branches found

No related tags found

2 merge requests!260syncing cob-master with master again,!243Resolve TMSS-356

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

SAS/TMSS/frontend/tmss_webapp/src/components/Timeline/CalendarTimeline.js 47 additions, 28 deletions

...d/tmss_webapp/src/components/Timeline/CalendarTimeline.js
SAS/TMSS/frontend/tmss_webapp/src/components/ViewTable.js 28 additions, 13 deletions

SAS/TMSS/frontend/tmss_webapp/src/components/ViewTable.js
SAS/TMSS/frontend/tmss_webapp/src/layout/sass/_timeline.scss 17 additions, 1 deletion

SAS/TMSS/frontend/tmss_webapp/src/layout/sass/_timeline.scss
SAS/TMSS/frontend/tmss_webapp/src/layout/sass/_viewtable.scss 6 additions, 6 deletions

...TMSS/frontend/tmss_webapp/src/layout/sass/_viewtable.scss
SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/summary.js 71 additions, 0 deletions

...MSS/frontend/tmss_webapp/src/routes/Scheduling/summary.js
SAS/TMSS/frontend/tmss_webapp/src/routes/Timeline/view.js 54 additions, 26 deletions

SAS/TMSS/frontend/tmss_webapp/src/routes/Timeline/view.js
SAS/TMSS/frontend/tmss_webapp/src/services/schedule.service.js 12 additions, 10 deletions

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

with 235 additions and 84 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