-
- Downloads
Merge branch 'master' into TMSS-299_22Oct
# Conflicts: # SAS/TMSS/frontend/tmss_webapp/src/components/ViewTable.js # SAS/TMSS/frontend/tmss_webapp/src/layout/sass/_viewtable.scss # SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/SchedulingUnitList.js # SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/ViewSchedulingUnit.js # SAS/TMSS/frontend/tmss_webapp/src/services/schedule.service.js Resolved Conflicts
No related branches found
No related tags found
Showing
- .DS_Store 0 additions, 0 deletions.DS_Store
- .gitlab-ci.yml 7 additions, 1 deletion.gitlab-ci.yml
- Docker/lofar-ci/Dockerfile_ci_sas 1 addition, 1 deletionDocker/lofar-ci/Dockerfile_ci_sas
- LCS/Messaging/python/messaging/config.py 1 addition, 1 deletionLCS/Messaging/python/messaging/config.py
- LCS/PyCommon/json_utils.py 7 additions, 17 deletionsLCS/PyCommon/json_utils.py
- LCS/PyCommon/test/t_json_utils.py 11 additions, 6 deletionsLCS/PyCommon/test/t_json_utils.py
- RTCP/Cobalt/GPUProc/etc/parset-additions.d/default/PVSS-feedback.parset 1 addition, 1 deletion...UProc/etc/parset-additions.d/default/PVSS-feedback.parset
- SAS/TMSS/docker-compose-ua.yml 2 additions, 1 deletionSAS/TMSS/docker-compose-ua.yml
- SAS/TMSS/frontend/tmss_webapp/debug.log 2 additions, 0 deletionsSAS/TMSS/frontend/tmss_webapp/debug.log
- SAS/TMSS/frontend/tmss_webapp/src/App.css 8 additions, 0 deletionsSAS/TMSS/frontend/tmss_webapp/src/App.css
- SAS/TMSS/frontend/tmss_webapp/src/components/JSONEditor/JEditor.js 71 additions, 79 deletions...frontend/tmss_webapp/src/components/JSONEditor/JEditor.js
- 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 31 additions, 15 deletionsSAS/TMSS/frontend/tmss_webapp/src/components/ViewTable.js
- SAS/TMSS/frontend/tmss_webapp/src/layout/_overrides.scss 2 additions, 0 deletionsSAS/TMSS/frontend/tmss_webapp/src/layout/_overrides.scss
- SAS/TMSS/frontend/tmss_webapp/src/layout/components/PageHeader.js 3 additions, 4 deletions.../frontend/tmss_webapp/src/layout/components/PageHeader.js
- SAS/TMSS/frontend/tmss_webapp/src/layout/sass/_timeline.scss 17 additions, 1 deletionSAS/TMSS/frontend/tmss_webapp/src/layout/sass/_timeline.scss
- SAS/TMSS/frontend/tmss_webapp/src/layout/sass/_viewtable.scss 10 additions, 6 deletions...TMSS/frontend/tmss_webapp/src/layout/sass/_viewtable.scss
- SAS/TMSS/frontend/tmss_webapp/src/routes/Project/view.js 1 addition, 1 deletionSAS/TMSS/frontend/tmss_webapp/src/routes/Project/view.js
- SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/SchedulingUnitList.js 6 additions, 4 deletions...d/tmss_webapp/src/routes/Scheduling/SchedulingUnitList.js
- SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/ViewSchedulingUnit.js 61 additions, 36 deletions...d/tmss_webapp/src/routes/Scheduling/ViewSchedulingUnit.js
Loading
Please register or sign in to comment