# Conflicts: # SAS/TMSS/frontend/tmss_webapp/src/App.css # SAS/TMSS/frontend/tmss_webapp/src/App.js # SAS/TMSS/frontend/tmss_webapp/src/components/ViewTable.js # SAS/TMSS/frontend/tmss_webapp/src/layout/sass/_layout.scss # SAS/TMSS/frontend/tmss_webapp/src/routes/Project/index.js # SAS/TMSS/frontend/tmss_webapp/src/routes/Project/view.js # 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/routes/index.js # SAS/TMSS/frontend/tmss_webapp/src/services/ScheduleService.js # SAS/TMSS/frontend/tmss_webapp/src/utils/unit.converter.js Resolved Conflicts. Updated styles, links, icons and positions in page header.
No related branches found
No related tags found
Showing
- SAS/TMSS/frontend/tmss_webapp/src/App.css 14 additions, 2 deletionsSAS/TMSS/frontend/tmss_webapp/src/App.css
- SAS/TMSS/frontend/tmss_webapp/src/App.js 5 additions, 2 deletionsSAS/TMSS/frontend/tmss_webapp/src/App.js
- SAS/TMSS/frontend/tmss_webapp/src/components/ViewTable.js 114 additions, 134 deletionsSAS/TMSS/frontend/tmss_webapp/src/components/ViewTable.js
- SAS/TMSS/frontend/tmss_webapp/src/layout/sass/_layout.scss 1 addition, 0 deletionsSAS/TMSS/frontend/tmss_webapp/src/layout/sass/_layout.scss
- SAS/TMSS/frontend/tmss_webapp/src/layout/sass/_viewtable.scss 45 additions, 0 deletions...TMSS/frontend/tmss_webapp/src/layout/sass/_viewtable.scss
- SAS/TMSS/frontend/tmss_webapp/src/routes/Project/create.js 3 additions, 3 deletionsSAS/TMSS/frontend/tmss_webapp/src/routes/Project/create.js
- SAS/TMSS/frontend/tmss_webapp/src/routes/Project/edit.js 3 additions, 3 deletionsSAS/TMSS/frontend/tmss_webapp/src/routes/Project/edit.js
- SAS/TMSS/frontend/tmss_webapp/src/routes/Project/index.js 2 additions, 1 deletionSAS/TMSS/frontend/tmss_webapp/src/routes/Project/index.js
- SAS/TMSS/frontend/tmss_webapp/src/routes/Project/list.js 126 additions, 0 deletionsSAS/TMSS/frontend/tmss_webapp/src/routes/Project/list.js
- SAS/TMSS/frontend/tmss_webapp/src/routes/Project/list.test.js 39 additions, 0 deletions...TMSS/frontend/tmss_webapp/src/routes/Project/list.test.js
- SAS/TMSS/frontend/tmss_webapp/src/routes/Project/view.js 20 additions, 8 deletionsSAS/TMSS/frontend/tmss_webapp/src/routes/Project/view.js
- SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/SchedulingUnitList.js 39 additions, 19 deletions...d/tmss_webapp/src/routes/Scheduling/SchedulingUnitList.js
- SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/ViewSchedulingUnit.js 88 additions, 40 deletions...d/tmss_webapp/src/routes/Scheduling/ViewSchedulingUnit.js
- SAS/TMSS/frontend/tmss_webapp/src/routes/Task/edit.js 6 additions, 5 deletionsSAS/TMSS/frontend/tmss_webapp/src/routes/Task/edit.js
- SAS/TMSS/frontend/tmss_webapp/src/routes/Task/view.js 71 additions, 55 deletionsSAS/TMSS/frontend/tmss_webapp/src/routes/Task/view.js
- SAS/TMSS/frontend/tmss_webapp/src/routes/index.js 6 additions, 2 deletionsSAS/TMSS/frontend/tmss_webapp/src/routes/index.js
- SAS/TMSS/frontend/tmss_webapp/src/services/project.services.js 92 additions, 0 deletions...MSS/frontend/tmss_webapp/src/services/project.services.js
- SAS/TMSS/frontend/tmss_webapp/src/services/schedule.service.js 114 additions, 0 deletions...MSS/frontend/tmss_webapp/src/services/schedule.service.js
- SAS/TMSS/frontend/tmss_webapp/src/utils/unit.converter.js 11 additions, 2 deletionsSAS/TMSS/frontend/tmss_webapp/src/utils/unit.converter.js
Loading
Please register or sign in to comment