Homec4science
Diffusion SHRINE MedCo Fork d1396f01faca

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

Authored by David Walend <david_walend@hms.harvard.edu> on Oct 16 2015, 19:13.

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 16 2015, 19:13
Pushed
mickmisMar 14 2017, 15:12
Parents
R2664:11e2217d708e: Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine…
R2664:c3ab6b036abc: Temporarily switching off AdapterClientBroadcasterLoggingTest
Branches
Unknown
Tags
Unknown

Event Timeline

David Walend <david_walend@hms.harvard.edu> committed R2664:d1396f01faca: Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine… (authored by David Walend <david_walend@hms.harvard.edu>).Oct 16 2015, 19:13

Merged Changes

CommitAuthorDetailsCommitted
11e2217d708eKeith Dwyer
Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine… 
Oct 16 2015
404f50a82102Keith Dwyer
[dashboard] remove a few more references to "steward", remove Role/Help from… 
Oct 16 2015
7f23d410a1d0Ben Carmen
Fixed 'undefined' bug for exception.message vs. exception. 
Oct 16 2015

Changes (14)

Path
Mapps/dashboard-app/src/main/js/bower.json
Aapps/dashboard-app/src/main/js/config/dashboard.config.json
Dapps/dashboard-app/src/main/js/config/steward.config.json
Mapps/dashboard-app/src/main/js/package.json
Mapps/dashboard-app/src/main/js/src/app/header/header.tpl.html
Mapps/dashboard-app/src/main/js/src/app/header/user-status/user-status.tpl.html
Mapps/dashboard-app/src/main/js/src/app/st-model.js
Mapps/dashboard-app/src/main/js/src/assets/css/shrine.css
Dapps/dashboard-app/src/main/js/src/assets/img/SHRINE-Data-Steward-Help.pdf
Dapps/dashboard-app/src/main/js/src/assets/img/logo_TSU.png
Vapps/dashboard-app/src/main/js/src/assets/img/{logo_harvard.png → logo_placeholder.png}
Dapps/dashboard-app/src/main/js/src/assets/img/logo_ohsu.png
Vapps/dashboard-app/src/main/js/src/assets/img/{logo_placeholder.png ← logo_harvard.png}
Mshrine-webclient/src/main/html/js-i2b2/cells/SHRINE/EnhancedError.js

R2664:d1396f01faca

View Options

apps/dashboard-app/src/main/js/bower.json

Loading...
View Options

apps/dashboard-app/src/main/js/config/dashboard.config.json

Loading...
View Options

apps/dashboard-app/src/main/js/config/steward.config.json

Loading...
View Options

apps/dashboard-app/src/main/js/package.json

Loading...
View Options

apps/dashboard-app/src/main/js/src/app/header/header.tpl.html

Loading...
View Options

apps/dashboard-app/src/main/js/src/app/header/user-status/user-status.tpl.html

Loading...
View Options

apps/dashboard-app/src/main/js/src/app/st-model.js

Loading...
View Options

apps/dashboard-app/src/main/js/src/assets/css/shrine.css

Loading...
View Options

apps/dashboard-app/src/main/js/src/assets/img/SHRINE-Data-Steward-Help.pdf

Loading...
View Options

apps/dashboard-app/src/main/js/src/assets/img/logo_TSU.png

Loading...
View Options

apps/dashboard-app/src/main/js/src/assets/img/logo_harvard.png

Loading...
View Options

apps/dashboard-app/src/main/js/src/assets/img/logo_ohsu.png

Loading...
View Options

apps/dashboard-app/src/main/js/src/assets/img/logo_placeholder.png

Loading...
View Options

shrine-webclient/src/main/html/js-i2b2/cells/SHRINE/EnhancedError.js

Loading...
c4science · Help