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

Resolved Conflicts.

Updated the table view and file structure

# Conflicts:
#	SAS/TMSS/frontend/tmss_webapp/src/App.js
#	SAS/TMSS/frontend/tmss_webapp/src/layout/components/AppMenu.js
#	SAS/TMSS/frontend/tmss_webapp/src/routes/index.js

Resolved Conflicts

# Conflicts:
#	SAS/TMSS/frontend/tmss_webapp/src/App.js

Conflicts resolved

TMSS-216: Task View and Edit pages added with JSON Editor customized. This commit is before merging other branches

Resolve TMSS-166 and TMSS-209

Closes TMSS-166

See merge request !176

Resolve TMSS-248

Closes TMSS-248

See merge request !178

This was suggested by the gitlab documentation when using rules. I ran
into the issue that when doing a merge request it only saw the new
rules for tests so it skipped all the other stages. This ofcource does
not result in a full build.

https://docs.gitlab.com/ee/ci/yaml/README.html#workflowrules-templates

Resolve TMSS-232

Closes TMSS-232

See merge request !177

Resolve SW-819

Closes SW-819

See merge request !173

TMSS-231: Initial Commit of TMSS Webapp with base code and navigation route.

Closes TMSS-231

See merge request !174

TMSS-207: moved allow_scheduling_observations setting from observation check to generic check... fixed test

Resolve TMSS-207

Closes TMSS-207

See merge request !175