Merge branch 'feature/new-crypto' into develop
d5a5edfa334a
Actions

Authored by Ty <Ty_Coghlan@hms.harvard.edu> on Oct 13 2016, 20:23.

Description

Merge branch 'feature/new-crypto' into develop

Committed

Ty <Ty_Coghlan@hms.harvard.edu>

Oct 13 2016, 20:23

Pushed

mickmis

Mar 14 2017, 15:12

Parents

Branches

Unknown

Tags

Unknown

Ty <Ty_Coghlan@hms.harvard.edu> committed R2664:d5a5edfa334a: Merge branch 'feature/new-crypto' into develop (authored by Ty <Ty_Coghlan@hms.harvard.edu>).Oct 13 2016, 20:23

	Commit			Author	Details	Committed
	9ae80c2ec519			Ty	front end to display summary date	Oct 13 2016
	ac4fa7e85ffc			Ty	Merge branch 'develop' into feature/new-crypto	Oct 13 2016

				Path
	M			apps/dashboard-app/src/main/js/src/app/diagnostic/views/summary.controller.js
	M			apps/dashboard-app/src/main/js/src/app/diagnostic/views/summary.tpl.html
	M			apps/dashboard-app/src/main/js/test/admin/status/adapter.json
	P			apps/dashboard-app/src/main/js/test/admin/status/summary.json Copied to apps/dashboard-app/src/test/resources/teststatus/summary
	M			apps/dashboard-app/src/test/resources/teststatus/adapter
	P			apps/dashboard-app/src/test/resources/teststatus/summary Copied from apps/dashboard-app/src/main/js/test/admin/status/summary.json