keep update
fix deleted files in master
Merge branch 'master' of
http://ray@10.239.3.132:9763/gitblit/r/galaxy2021.git

Conflicts:
	.project
	app/components/workOrderGrid.js
	app/components/workOrderSummary.js
	app/views/workOrderGrid.html
	app/views/workOrderSummary.html
	app/views/workOrderSummaryAsset.html
	app/views/workOrderSummaryConfig.html
	app/views/workOrderSummaryFacility.html
Reset to phil's last commit
added dashboard
updated the version of jquery from ~3.0.x to ~2.x.x
Add initFlatten to chartHelper to automatically flatten the data
structure generated from dataService. Change charts to accomidate ticket
data.
work Order Summary: fixed error that was causing discrepancies between
views.
So now the widget actually shows a chart instead of pretending to.
Removed dependency on css file which doesn't exist
example of modifying dc-chart svg directly. see utilityGraph.js
Merge branch 'master' of http://phil@10.239.3.132:9763/gitblit/r/galaxy2021.git