Merge branch 'master' into TMSS-368
# Conflicts: # SAS/TMSS/frontend/tmss_webapp/src/layout/components/PageHeader.js Conflict Resolved. Scheduling Unit Create page opening issue fixed Task View close button click naviation issue fixed Add Scheduling Unit menu from project view in collapsed mnu solved.
Showing
- .DS_Store 0 additions, 0 deletions.DS_Store
- .gitlab-ci.yml 21 additions, 19 deletions.gitlab-ci.yml
- Docker/lofar-ci/Dockerfile_ci_sas 4 additions, 1 deletionDocker/lofar-ci/Dockerfile_ci_sas
- MAC/APL/MainCU/src/MACScheduler/MACScheduler.cc 4 additions, 3 deletionsMAC/APL/MainCU/src/MACScheduler/MACScheduler.cc
- MAC/Services/src/PipelineControl.py 2 additions, 4 deletionsMAC/Services/src/PipelineControl.py
- SAS/TMSS/client/lib/populate.py 17 additions, 7 deletionsSAS/TMSS/client/lib/populate.py
- SAS/TMSS/client/lib/tmss_http_rest_client.py 31 additions, 0 deletionsSAS/TMSS/client/lib/tmss_http_rest_client.py
- SAS/TMSS/docker-compose-scu199.yml 1 addition, 1 deletionSAS/TMSS/docker-compose-scu199.yml
- SAS/TMSS/docker-compose-tmss.yml 1 addition, 1 deletionSAS/TMSS/docker-compose-tmss.yml
- SAS/TMSS/docker-compose-ua.yml 1 addition, 1 deletionSAS/TMSS/docker-compose-ua.yml
- SAS/TMSS/frontend/tmss_webapp/src/App.css 4 additions, 0 deletionsSAS/TMSS/frontend/tmss_webapp/src/App.css
- SAS/TMSS/frontend/tmss_webapp/src/App.js 27 additions, 20 deletionsSAS/TMSS/frontend/tmss_webapp/src/App.js
- SAS/TMSS/frontend/tmss_webapp/src/layout/_overrides.scss 28 additions, 0 deletionsSAS/TMSS/frontend/tmss_webapp/src/layout/_overrides.scss
- SAS/TMSS/frontend/tmss_webapp/src/layout/components/AppMenu.js 21 additions, 5 deletions...MSS/frontend/tmss_webapp/src/layout/components/AppMenu.js
- SAS/TMSS/frontend/tmss_webapp/src/layout/components/PageHeader.js 1 addition, 1 deletion.../frontend/tmss_webapp/src/layout/components/PageHeader.js
- SAS/TMSS/frontend/tmss_webapp/src/layout/sass/_menu.scss 16 additions, 0 deletionsSAS/TMSS/frontend/tmss_webapp/src/layout/sass/_menu.scss
- SAS/TMSS/frontend/tmss_webapp/src/routes/Cycle/create.js 3 additions, 1 deletionSAS/TMSS/frontend/tmss_webapp/src/routes/Cycle/create.js
- SAS/TMSS/frontend/tmss_webapp/src/routes/Cycle/edit.js 4 additions, 2 deletionsSAS/TMSS/frontend/tmss_webapp/src/routes/Cycle/edit.js
- SAS/TMSS/frontend/tmss_webapp/src/routes/Cycle/list.js 0 additions, 1 deletionSAS/TMSS/frontend/tmss_webapp/src/routes/Cycle/list.js
- SAS/TMSS/frontend/tmss_webapp/src/routes/Cycle/view.js 1 addition, 1 deletionSAS/TMSS/frontend/tmss_webapp/src/routes/Cycle/view.js
Loading
Please register or sign in to comment