Diffusion SHRINE MedCo Fork 579fbd2ad454

shrine…
579fbd2ad454
Actions

Authored by David Walend <david_walend@hms.harvard.edu> on Nov 15 2016, 18:28.

Description

Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine into develop

Details

Committed

David Walend <david_walend@hms.harvard.edu>

Nov 15 2016, 18:28

Pushed

mickmis

Mar 14 2017, 15:12

Parents

R2664:a8a07235bd05: A lot of one-line changes consolidating ConfigSource implementations into just…
R2664:86f09d24a1ee: Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine…

Branches

Unknown

Tags

Unknown

Event Timeline

David Walend <david_walend@hms.harvard.edu> committed R2664:579fbd2ad454: Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine… (authored by David Walend <david_walend@hms.harvard.edu>).Nov 15 2016, 18:28

Merged Changes

Commit	Author	Details	Committed
86f09d24a1ee	Ty	Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine…	Nov 15 2016
29b7db7ad357	Ty	improved error handling on dashboard	Nov 15 2016
de3e9a8165ce	ben-carmen	fix of SHRINE-1760	Nov 15 2016
e4dd86563f1b	ben-carmen	Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine…	Nov 15 2016
17dfb1aecfcf	ben-carmen	Fix For SHRINE-1775 Add name inside of parenthesis	Nov 15 2016

Changes (27)

				Path
	M			apps/dashboard-app/src/main/js/src/app/diagnostic/diagnostic.model.js
	D			apps/dashboard-app/src/main/js/src/app/diagnostic/sidebar/node-menu.tpl.html
	M			apps/dashboard-app/src/main/js/src/app/diagnostic/sidebar/sidebar.tpl.html
	A			apps/dashboard-app/src/main/js/src/app/diagnostic/templates/error-handler-template.html
	M			apps/dashboard-app/src/main/js/src/app/diagnostic/views/adapter.controller.js
	M			apps/dashboard-app/src/main/js/src/app/diagnostic/views/adapter.tpl.html
	M			apps/dashboard-app/src/main/js/src/app/diagnostic/views/config.controller.js
	M			apps/dashboard-app/src/main/js/src/app/diagnostic/views/dashboard.controller.js
	M			apps/dashboard-app/src/main/js/src/app/diagnostic/views/dashboard.tpl.html
	A			apps/dashboard-app/src/main/js/src/app/diagnostic/views/errorHandler.js
	M			apps/dashboard-app/src/main/js/src/app/diagnostic/views/hub.controller.js
	M			apps/dashboard-app/src/main/js/src/app/diagnostic/views/hub.tpl.html
	M			apps/dashboard-app/src/main/js/src/app/diagnostic/views/i2b2-connections.controller.js
	M			apps/dashboard-app/src/main/js/src/app/diagnostic/views/i2b2-connections.tpl.html
	M			apps/dashboard-app/src/main/js/src/app/diagnostic/views/keystore.controller.js
	M			apps/dashboard-app/src/main/js/src/app/diagnostic/views/keystore.tpl.html
	M			apps/dashboard-app/src/main/js/src/app/diagnostic/views/problems.controller.js
	M			apps/dashboard-app/src/main/js/src/app/diagnostic/views/problems.tpl.html
	M			apps/dashboard-app/src/main/js/src/app/diagnostic/views/qep.controller.js
	M			apps/dashboard-app/src/main/js/src/app/diagnostic/views/qep.tpl.html
	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/src/app/shrine-tools.configuration.js
	M			apps/steward-app/src/main/js/app/assets/css/graphs.css
	M			apps/steward-app/src/main/js/app/assets/css/shrine.css
	M			apps/steward-app/src/main/js/app/client/statistics/query-digest/query-digest.tpl.html
	M			apps/steward-app/src/main/js/app/sass/graphs.scss