Diffusion SHRINE MedCo Fork 5d17d5e2763a

shrine…
5d17d5e2763a
Actions

Authored by ben-carmen <benjamin_carmen@hms.harvard.edu> on Nov 15 2016, 19:44.

Description

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

Details

Committed

ben-carmen <benjamin_carmen@hms.harvard.edu>

Nov 15 2016, 19:44

Pushed

mickmis

Mar 14 2017, 15:12

Parents

R2664:523a7d800a25: Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine…
R2664:b85e06edcef9: Fix of SHRINE-1767

Branches

Unknown

Tags

Unknown

Event Timeline

ben-carmen <benjamin_carmen@hms.harvard.edu> committed R2664:5d17d5e2763a: Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine… (authored by ben-carmen <benjamin_carmen@hms.harvard.edu>).Nov 15 2016, 19:44

Merged Changes

Commit	Author	Details	Committed
523a7d800a25	David Walend	Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine…	Nov 15 2016
9722101779f5	David Walend	Removing the trace code	Nov 15 2016
38676013d2f3	Ty	removed attempt at catch all bad response handling	Nov 15 2016
0b2b9c519d0c	Ty	Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine…	Nov 15 2016
5c74ad176912	Ty	fixed qep typo	Nov 15 2016
b1cc9432c0a5	Ty	forgot vm.today variable	Nov 15 2016
bc905e3b0d81	Ty	fixed calendar	Nov 15 2016
579fbd2ad454	David Walend	Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine…	Nov 15 2016
a8a07235bd05	David Walend	A lot of one-line changes consolidating ConfigSource implementations into just…	Nov 15 2016
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

Changes (52)

				Path
	D			adapter/adapter-api/src/main/scala/net/shrine/adapter/service/AdapterConfigSource.scala
	M			adapter/adapter-service/src/main/scala/net/shrine/adapter/audit/AdapterAuditDb.scala
	M			adapter/adapter-service/src/test/scala/net/shrine/adapter/audit/AdapterAuditDbTest.scala
	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/dashboard-app/src/main/js/test/admin/status/problems
	M			apps/dashboard-app/src/main/scala/net/shrine/dashboard/Boot.scala
	D			apps/dashboard-app/src/main/scala/net/shrine/dashboard/DashboardConfigSource.scala
	M			apps/dashboard-app/src/main/scala/net/shrine/dashboard/DashboardService.scala
	M			apps/dashboard-app/src/main/scala/net/shrine/dashboard/httpclient/HttpClientDirectives.scala
	M			apps/dashboard-app/src/test/scala/net/shrine/dashboard/DashboardServiceTest.scala
	M			apps/meta-app/src/main/scala/net/shrine/metadata/Boot.scala
	D			apps/meta-app/src/main/scala/net/shrine/metadata/MetaConfigSource.scala
	M			apps/meta-app/src/main/scala/net/shrine/metadata/MetaDataService.scala
	M			apps/shrine-app/src/main/scala/net/shrine/wiring/ShrineOrchestrator.scala
	M			apps/steward-app/src/main/scala/net/shrine/steward/Boot.scala
	V			apps/steward-app/src/main/scala/net/shrine/steward/{CreateTopicsMode.scala ← StewardConfigSource.scala}
	V			apps/steward-app/src/main/scala/net/shrine/steward/{StewardConfigSource.scala → CreateTopicsMode.scala}
	M			apps/steward-app/src/main/scala/net/shrine/steward/StewardService.scala
	M			apps/steward-app/src/main/scala/net/shrine/steward/db/StewardDatabase.scala
	M			apps/steward-app/src/main/scala/net/shrine/steward/email/AuditEmailer.scala
	M			apps/steward-app/src/test/scala/net/shrine/steward/StewardServiceSpec.scala
	M			commons/util/src/main/scala/net/shrine/problem/DashboardProblemDatabase.scala
	M			commons/util/src/main/scala/net/shrine/problem/Problem.scala
	D			commons/util/src/main/scala/net/shrine/problem/ProblemConfigSource.scala
	M			commons/util/src/main/scala/net/shrine/source/ConfigSource.scala
	D			qep/service/src/main/scala/net/shrine/qep/QepConfigSource.scala
	M			qep/service/src/main/scala/net/shrine/qep/audit/QepAuditDb.scala
	M			qep/service/src/main/scala/net/shrine/qep/queries/QepQueryDb.scala
	M			qep/service/src/test/scala/net/shrine/qep/audit/QepQueryAuditTest.scala
	M			tools/adapter-queries-to-qep/src/main/scala/net/shrine/utilities/adapterqueriestoqep/AdapterQueriesToQep.scala