# 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.

Updated the code to handle the action path from json data

Issues and UI changes are resolved  for TMSS-222, TMSS-270, TMSS-242

# Conflicts:
#	SAS/TMSS/frontend/tmss_webapp/src/routes/index.js
#	SAS/TMSS/frontend/tmss_webapp/src/services/cycle.service.js

Resolved Conflicts

mapped the Category of project and  Category of Period in project list table

TMSS-242 - View table updated and display column header
it is included the changes for TMSS-222.

# Conflicts:
#	SAS/TMSS/frontend/tmss_webapp/src/services/project.service.js

Conflicts resolved

TMSS-275: Updated period_category & project_category field values based on new API developed. Updated resource units and conversions after removal of resource_unit model in the back end.

Review changes have updated.

Project Category and Period Category option label and values updated as per the new API for them.

Changes Updated on Breadcrumbs

# Conflicts:
#	SAS/TMSS/frontend/tmss_webapp/src/routes/Project/ResourceInputList.js

Conflicts resolved

Add Spinner and Breadcrumb are both have combined to this branch.

Created the Project List and services and added unit test cases

Update the viewtable for remove the filter in action column

Duration field in JSON editor customized
Temporarily grid columns size set
Not Found page added
Task page updated for mobile view
Task view route enabled with id and type parameter

# Conflicts:
#	SAS/TMSS/frontend/tmss_webapp/src/components/ViewTable.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/Scheduling/index.js
#	SAS/TMSS/frontend/tmss_webapp/src/routes/Task/index.js
#	SAS/TMSS/frontend/tmss_webapp/src/routes/index.js

Conflicts resolved.

Custom Field for pointing angles, duration updated with validation

TMSS-216: JSON editor modified to have single field for angle, fields displayed in grid format, field display order added as hard coded

Updated the view table and its view and also added api call for schedule unit by id

# Conflicts:
#	SAS/TMSS/frontend/tmss_webapp/src/components/ViewTable.js

Resolved Conflicts.