Diffusion SHRINE MedCo Fork 9e63d14f849d

shrine…
9e63d14f849d
Actions

Authored by David Walend <david_walend@hms.harvard.edu> on Sep 23 2015, 22:19.

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>

Sep 23 2015, 22:19

Pushed

mickmis

Mar 14 2017, 15:12

Parents

R2664:a309ca32f76c: Test of adding extra xml
R2664:85ab9e8ebd78: Fix of base url for rest call.

Branches

Unknown

Tags

Unknown

Event Timeline

David Walend <david_walend@hms.harvard.edu> committed R2664:9e63d14f849d: Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine… (authored by David Walend <david_walend@hms.harvard.edu>).Sep 23 2015, 22:19

Merged Changes

Commit	Author	Details	Committed
85ab9e8ebd78	Ben Carmen	Fix of base url for rest call.	Sep 23 2015
fd3180bf3938	Ben Carmen	Fix of user authentication	Sep 23 2015
d7323a57b541	Ben Carmen	Fix of model service.	Sep 23 2015
d9acb3a238ce	Ben Carmen	Commit of latest styles for admin-app	Sep 23 2015
f95213ef7b6d	Ben Carmen	adding adapter and hub templates.	Sep 23 2015
a06ef07cb42e	Ben Carmen	Commit of style updates.	Sep 23 2015
79c7739cd6b4	Ben Carmen	Merge remote-tracking branch 'origin/develop' into develop	Sep 21 2015
f33dfb13f51b	Ben Carmen	Commit of latest styles.	Sep 21 2015

Changes (95)

		Path
M		apps/admin-app/src/main/js/config/steward.config.json
M		apps/admin-app/src/main/js/index.html
M		apps/admin-app/src/main/js/src/app/common/authentication/authentication-model.js
M		apps/admin-app/src/main/js/src/app/common/model-service.js
M		apps/admin-app/src/main/js/src/app/dashboard/MainCtrl.js
A	(dir)	apps/admin-app/src/main/js/src/app/dashboard/apps/happy/adapter/
D		apps/admin-app/src/main/js/src/app/dashboard/apps/happy/adapter.tpl.html
A		apps/admin-app/src/main/js/src/app/dashboard/apps/happy/adapter/adapter.tpl.html
D		apps/admin-app/src/main/js/src/app/dashboard/apps/happy/collapsible.tpl.html
D		apps/admin-app/src/main/js/src/app/dashboard/apps/happy/downstream-nodes.tpl.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/happy-model.js
M		apps/admin-app/src/main/js/src/app/dashboard/apps/happy/happy.js
M		apps/admin-app/src/main/js/src/app/dashboard/apps/happy/happy.tpl.html
D		apps/admin-app/src/main/js/src/app/dashboard/apps/happy/hive-config.tpl.html
A	(dir)	apps/admin-app/src/main/js/src/app/dashboard/apps/happy/hub/
A		apps/admin-app/src/main/js/src/app/dashboard/apps/happy/hub/hub.tpl.html
D		apps/admin-app/src/main/js/src/app/dashboard/apps/happy/keystore-report.tpl.html
D		apps/admin-app/src/main/js/src/app/dashboard/apps/happy/network.tpl.html
D		apps/admin-app/src/main/js/src/app/dashboard/apps/happy/recent-audit-entries.tpl.html
D		apps/admin-app/src/main/js/src/app/dashboard/apps/happy/recent-queries.tpl.html
D		apps/admin-app/src/main/js/src/app/dashboard/apps/happy/version-info.tpl.html
M		apps/admin-app/src/main/js/src/app/dashboard/footer/footer.tpl.html
M		apps/admin-app/src/main/js/src/app/dashboard/header/header.tpl.html
M		apps/admin-app/src/main/js/src/app/dashboard/login/login.tpl.html
M		apps/admin-app/src/main/js/src/app/dashboard/main.tpl.html
M		apps/admin-app/src/main/js/src/app/dashboard/sidebar/sidebar.tpl.html
M		apps/admin-app/src/main/js/src/app/st-model.js
P		apps/admin-app/src/main/js/src/assets/css/shrine.css Copied from apps/steward-app/src/main/js/src/assets/css/shrine.css
A	(dir)	apps/admin-app/src/main/js/src/assets/fnt/
A	(dir)	apps/admin-app/src/main/js/src/assets/fnt/nexa/
A		apps/admin-app/src/main/js/src/assets/fnt/nexa/EULA Free Font License Ver. 2.0.pdf
A		apps/admin-app/src/main/js/src/assets/fnt/nexa/Nexa-Bold.otf
A		apps/admin-app/src/main/js/src/assets/fnt/nexa/Nexa-Light.otf
A	(dir)	apps/admin-app/src/main/js/src/assets/fnt/open-sans/
A		apps/admin-app/src/main/js/src/assets/fnt/open-sans/LICENSE.txt
A		apps/admin-app/src/main/js/src/assets/fnt/open-sans/OpenSans-Bold.ttf
A		apps/admin-app/src/main/js/src/assets/fnt/open-sans/OpenSans-BoldItalic.ttf
A		apps/admin-app/src/main/js/src/assets/fnt/open-sans/OpenSans-ExtraBold.ttf
A		apps/admin-app/src/main/js/src/assets/fnt/open-sans/OpenSans-ExtraBoldItalic.ttf
A		apps/admin-app/src/main/js/src/assets/fnt/open-sans/OpenSans-Italic.ttf
A		apps/admin-app/src/main/js/src/assets/fnt/open-sans/OpenSans-Light.ttf
A		apps/admin-app/src/main/js/src/assets/fnt/open-sans/OpenSans-LightItalic.ttf
A		apps/admin-app/src/main/js/src/assets/fnt/open-sans/OpenSans-Regular.ttf
A		apps/admin-app/src/main/js/src/assets/fnt/open-sans/OpenSans-Semibold.ttf
A		apps/admin-app/src/main/js/src/assets/fnt/open-sans/OpenSans-SemiboldItalic.ttf
A	(dir)	apps/admin-app/src/main/js/src/assets/fnt/roboto/
A		apps/admin-app/src/main/js/src/assets/fnt/roboto/Apache License.txt
A		apps/admin-app/src/main/js/src/assets/fnt/roboto/Roboto-Black.ttf
A		apps/admin-app/src/main/js/src/assets/fnt/roboto/Roboto-BlackItalic.ttf
A		apps/admin-app/src/main/js/src/assets/fnt/roboto/Roboto-Bold.ttf
A		apps/admin-app/src/main/js/src/assets/fnt/roboto/Roboto-BoldItalic.ttf
A		apps/admin-app/src/main/js/src/assets/fnt/roboto/Roboto-Italic.ttf
A		apps/admin-app/src/main/js/src/assets/fnt/roboto/Roboto-Light.ttf
A		apps/admin-app/src/main/js/src/assets/fnt/roboto/Roboto-LightItalic.ttf
A		apps/admin-app/src/main/js/src/assets/fnt/roboto/Roboto-Medium.ttf
A		apps/admin-app/src/main/js/src/assets/fnt/roboto/Roboto-MediumItalic.ttf
A		apps/admin-app/src/main/js/src/assets/fnt/roboto/Roboto-Regular.ttf
A		apps/admin-app/src/main/js/src/assets/fnt/roboto/Roboto-Thin.ttf
A		apps/admin-app/src/main/js/src/assets/fnt/roboto/Roboto-ThinItalic.ttf
A		apps/admin-app/src/main/js/src/assets/img/Background_Shrine.jpg
A		apps/admin-app/src/main/js/src/assets/img/Background_Shrine.png
A		apps/admin-app/src/main/js/src/assets/img/bckg_diagonal_lines.png
A		apps/admin-app/src/main/js/src/assets/img/bckg_diagonal_lines_no_border.png
A		apps/admin-app/src/main/js/src/assets/img/bckg_diagonal_lines_opacity25.png
D		apps/admin-app/src/main/js/src/assets/img/catalyst_logo.gif
D		apps/admin-app/src/main/js/src/assets/img/catalyst_logo.png
D		apps/admin-app/src/main/js/src/assets/img/generic-banner.png
A		apps/admin-app/src/main/js/src/assets/img/logo_TSU.png
A		apps/admin-app/src/main/js/src/assets/img/logo_harvard_catalyst.png
A		apps/admin-app/src/main/js/src/assets/img/logo_shrine_data_steward.png
D		apps/admin-app/src/main/js/src/assets/img/logo_tsu-small.png
D		apps/admin-app/src/main/js/src/assets/img/skin
D		apps/admin-app/src/main/js/src/assets/img/skin/add16x16.png
D		apps/admin-app/src/main/js/src/assets/img/skin/exclamation.png
D		apps/admin-app/src/main/js/src/assets/img/skin/external_link.png
D		apps/admin-app/src/main/js/src/assets/img/skin/information.png
D		apps/admin-app/src/main/js/src/assets/img/skin/magnifying_glass16x15.png
D		apps/admin-app/src/main/js/src/assets/img/skin/sorted_asc.gif
D		apps/admin-app/src/main/js/src/assets/img/skin/sorted_desc.gif
M		apps/steward-app/src/main/js/index.html
M		apps/steward-app/src/main/js/src/app/dashboard/history/history.tpl.html
M		apps/steward-app/src/main/js/src/app/dashboard/login/login.tpl.html
M		apps/steward-app/src/main/js/src/app/dashboard/sidebar/sidebar.js
M		apps/steward-app/src/main/js/src/app/dashboard/statistics/query-counts-table.tpl.html
M		apps/steward-app/src/main/js/src/app/dashboard/statistics/query-topic-status-table.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/new-topic/new-topic.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/role1-description.tpl.html
M		apps/steward-app/src/main/js/src/app/dashboard/topics/topic-table/topic-detail/role1-edit.tpl.html
M		apps/steward-app/src/main/js/src/app/dashboard/topics/topic-table/topic-detail/role2-description.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
P		apps/steward-app/src/main/js/src/assets/css/shrine.css Copied to apps/admin-app/src/main/js/src/assets/css/shrine.css