Merge branch 'release/1.20.0' into develop
96a8bbf46393
Actions

Authored by David Walend <david_walend@hms.harvard.edu> on Nov 2 2015, 16:39.

Description

Merge branch 'release/1.20.0' into develop

Committed

David Walend <david_walend@hms.harvard.edu>

Nov 2 2015, 16:39

Pushed

mickmis

Mar 14 2017, 15:12

Parents

Branches

Unknown

Tags

Unknown

David Walend <david_walend@hms.harvard.edu> committed R2664:96a8bbf46393: Merge branch 'release/1.20.0' into develop (authored by David Walend <david_walend@hms.harvard.edu>).Nov 2 2015, 16:39

Commit	Author	Details	Committed
09b37ce594a4	Ben Carmen	fix for SHRINE-1196	Oct 30 2015
731aeecc72eb	Ben Carmen	fix for SHRINE 1210	Oct 30 2015
5afb4736fb49	Ben Carmen	fix for SHRINE-1209	Oct 30 2015
b9a14872bcd4	Ben Carmen	Update to make https://open.med.harvard.edu/wiki/display/SHRINE/ the default…	Oct 30 2015

				Path
	M			apps/dashboard-app/src/main/js/src/assets/css/shrine.css
	M			apps/steward-app/src/main/js/src/app/dashboard/history/history.tpl.html
	M			apps/steward-app/src/main/js/src/app/dashboard/statistics/statistics.tpl.html
	M			apps/steward-app/src/main/js/src/app/dashboard/topics/topic-table/topic-detail.tpl.html
	M			apps/steward-app/src/main/js/src/app/dashboard/topics/topic-table/topic-detail/role2-edit.tpl.html
	M			apps/steward-app/src/main/js/src/app/dashboard/topics/topics.tpl.html
	M			apps/steward-app/src/main/js/src/assets/css/shrine.css
	M			shrine-webclient/src/main/html/js-i2b2/cells/SHRINE/EnhancedError.js