Diffusion SHRINE MedCo Fork 00293ebcc692

shrine…
00293ebcc692
Actions

Authored by David Walend <david_walend@hms.harvard.edu> on Oct 9 2015, 21:12.

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>

Oct 9 2015, 21:12

Pushed

mickmis

Mar 14 2017, 15:12

Parents

R2664:dfeb70732730: Fix for failing test, added reference.conf to resources directory in admin…
R2664:7fdfa71abc77: Renamed the test query from PDD to TestQuery

Branches

Unknown

Tags

Unknown

Event Timeline

David Walend <david_walend@hms.harvard.edu> committed R2664:00293ebcc692: Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine… (authored by David Walend <david_walend@hms.harvard.edu>).Oct 9 2015, 21:12

Merged Changes

Commit	Author	Details	Committed
dfeb70732730	Ben Carmen	Fix for failing test, added reference.conf to resources directory in admin…	Oct 9 2015
e3e7853d3cba	Ben Carmen	Merge remote-tracking branch 'origin/develop' into develop	Oct 8 2015
fd2bfdc341a2	Ben Carmen	Commit of latest styles and bug fixes	Oct 8 2015
e978f494c176	Ben Carmen	Removal of happy.xml	Oct 8 2015

Changes (35)

				Path
	M			apps/admin-app/src/main/js/config/steward.config.json
	D			apps/admin-app/src/main/js/happy
	D			apps/admin-app/src/main/js/happy/happy-adapter.xml
	D			apps/admin-app/src/main/js/happy/happy-all.xml
	D			apps/admin-app/src/main/js/happy/happy-audit.xml
	D			apps/admin-app/src/main/js/happy/happy-hive.xml
	D			apps/admin-app/src/main/js/happy/happy-keystore.xml
	D			apps/admin-app/src/main/js/happy/happy-network.xml
	D			apps/admin-app/src/main/js/happy/happy-routing.xml
	D			apps/admin-app/src/main/js/happy/happy-version.xml
	D			apps/admin-app/src/main/js/happy/happy-whoami.xml
	P			apps/admin-app/src/main/js/index.html Copied from apps/steward-app/src/main/js/index.html
	M			apps/admin-app/src/main/js/src/app/dashboard/apps/happy/general/general.tpl.html
	M			apps/admin-app/src/main/js/src/app/dashboard/apps/happy/hub/hub.tpl.html
	M			apps/admin-app/src/main/js/src/app/st.spec.js
	M			apps/admin-app/src/main/js/src/assets/css/shrine.css
	A			apps/admin-app/src/main/js/src/assets/img/logo_harvard.png
	A			apps/admin-app/src/main/js/src/assets/img/logo_ohsu.png
	D			apps/admin-app/src/main/resources/client
	D			apps/admin-app/src/main/resources/client/happy
	D			apps/admin-app/src/main/resources/client/happy/happy-adapter.xml
	D			apps/admin-app/src/main/resources/client/happy/happy-all.xml
	D			apps/admin-app/src/main/resources/client/happy/happy-audit.xml
	D			apps/admin-app/src/main/resources/client/happy/happy-hive.xml
	D			apps/admin-app/src/main/resources/client/happy/happy-keystore.xml
	D			apps/admin-app/src/main/resources/client/happy/happy-network.xml
	D			apps/admin-app/src/main/resources/client/happy/happy-routing.xml
	D			apps/admin-app/src/main/resources/client/happy/happy-version.xml
	M			apps/admin-app/src/main/resources/reference.conf
	M			apps/steward-app/src/main/js/config/steward.config.json
	M			apps/steward-app/src/main/js/src/app/app.js
	M			apps/steward-app/src/main/js/src/app/app.spec.js
	M			apps/steward-app/src/main/js/src/assets/css/shrine.css
	A			apps/steward-app/src/main/js/src/assets/img/logo_harvard.png
	A			apps/steward-app/src/main/js/src/assets/img/logo_ohsu.png