-
- Downloads
Merge branch 'master' into TMSS-302
# Conflicts: # SAS/TMSS/frontend/tmss_webapp/src/App.js Resolved conflicts and updated timeline routing path
No related branches found
No related tags found
Showing
- .DS_Store 0 additions, 0 deletions.DS_Store
- Docker/lofar-ci/Dockerfile_ci_sas 3 additions, 0 deletionsDocker/lofar-ci/Dockerfile_ci_sas
- SAS/TMSS/frontend/tmss_webapp/package.json 1 addition, 1 deletionSAS/TMSS/frontend/tmss_webapp/package.json
- SAS/TMSS/frontend/tmss_webapp/src/App.js 28 additions, 21 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 23 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
- SAS/TMSS/frontend/tmss_webapp/src/routes/Project/create.js 2 additions, 2 deletionsSAS/TMSS/frontend/tmss_webapp/src/routes/Project/create.js
- SAS/TMSS/frontend/tmss_webapp/src/routes/Project/edit.js 2 additions, 2 deletionsSAS/TMSS/frontend/tmss_webapp/src/routes/Project/edit.js
- SAS/TMSS/frontend/tmss_webapp/src/routes/Project/view.js 3 additions, 4 deletionsSAS/TMSS/frontend/tmss_webapp/src/routes/Project/view.js
- SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/SchedulingUnitList.js 1 addition, 1 deletion...d/tmss_webapp/src/routes/Scheduling/SchedulingUnitList.js
- SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/ViewSchedulingUnit.js 12 additions, 4 deletions...d/tmss_webapp/src/routes/Scheduling/ViewSchedulingUnit.js
- SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/create.js 2 additions, 2 deletions...TMSS/frontend/tmss_webapp/src/routes/Scheduling/create.js
- SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/edit.js 2 additions, 2 deletionsSAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/edit.js
- SAS/TMSS/frontend/tmss_webapp/src/routes/Task/edit.js 2 additions, 2 deletionsSAS/TMSS/frontend/tmss_webapp/src/routes/Task/edit.js
Loading
Please register or sign in to comment