Diffusion SHRINE MedCo Fork 5352ec1cb7fe

shrine…
5352ec1cb7fe
Actions

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

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 15 2015, 19:30

Pushed

mickmis

Mar 14 2017, 15:12

Parents

R2664:f7808f7965d5: Merge remote-tracking branch 'origin/develop' into develop
R2664:8ddc7d190c0a: Added a little logging to see the request forwarded to happy

Branches

Unknown

Tags

Unknown

Event Timeline

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

Merged Changes

Commit	Author	Details	Committed
f7808f7965d5	Ben Carmen	Merge remote-tracking branch 'origin/develop' into develop	Sep 15 2015
e8a3f1c8105c	Ben Carmen	Fixed an error that I crearted for displaying query results.	Sep 15 2015
b54d97bc15f6	Ben Carmen	Update of Steward App Styles.	Sep 15 2015
e1b2ca918e44	Ben Carmen	Commit of updated styles.	Sep 12 2015
2fde363333fc	Ben Carmen	addition of images for re-style.	Sep 11 2015

Changes (44)

		Path
M		apps/steward-app/src/main/js/config/steward.config.json
M		apps/steward-app/src/main/js/index.html
M		apps/steward-app/src/main/js/src/app/dashboard/MainCtrl.js
M		apps/steward-app/src/main/js/src/app/dashboard/footer/footer.tpl.html
M		apps/steward-app/src/main/js/src/app/dashboard/header/header.tpl.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/main.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/sidebar/sidebar.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/topics.tpl.html
M		apps/steward-app/src/main/js/src/assets/css/app.css
D		apps/steward-app/src/main/js/src/assets/css/main.css
A		apps/steward-app/src/main/js/src/assets/css/shrine.css
A	(dir)	apps/steward-app/src/main/js/src/assets/fnt/
A	(dir)	apps/steward-app/src/main/js/src/assets/fnt/open-sans/
P		apps/steward-app/src/main/js/src/assets/fnt/open-sans/LICENSE.txt Copied from apps/admin-app/src/main/js/src/vendor/foundation-datepicker/LICENSE
A		apps/steward-app/src/main/js/src/assets/fnt/open-sans/OpenSans-Bold.ttf
A		apps/steward-app/src/main/js/src/assets/fnt/open-sans/OpenSans-BoldItalic.ttf
A		apps/steward-app/src/main/js/src/assets/fnt/open-sans/OpenSans-ExtraBold.ttf
A		apps/steward-app/src/main/js/src/assets/fnt/open-sans/OpenSans-ExtraBoldItalic.ttf
A		apps/steward-app/src/main/js/src/assets/fnt/open-sans/OpenSans-Italic.ttf
A		apps/steward-app/src/main/js/src/assets/fnt/open-sans/OpenSans-Light.ttf
A		apps/steward-app/src/main/js/src/assets/fnt/open-sans/OpenSans-LightItalic.ttf
A		apps/steward-app/src/main/js/src/assets/fnt/open-sans/OpenSans-Regular.ttf
A		apps/steward-app/src/main/js/src/assets/fnt/open-sans/OpenSans-Semibold.ttf
A		apps/steward-app/src/main/js/src/assets/fnt/open-sans/OpenSans-SemiboldItalic.ttf
A	(dir)	apps/steward-app/src/main/js/src/assets/fnt/roboto/
A		apps/steward-app/src/main/js/src/assets/fnt/roboto/Apache License.txt
A		apps/steward-app/src/main/js/src/assets/fnt/roboto/Roboto-Black.ttf
A		apps/steward-app/src/main/js/src/assets/fnt/roboto/Roboto-BlackItalic.ttf
A		apps/steward-app/src/main/js/src/assets/fnt/roboto/Roboto-Bold.ttf
A		apps/steward-app/src/main/js/src/assets/fnt/roboto/Roboto-BoldItalic.ttf
A		apps/steward-app/src/main/js/src/assets/fnt/roboto/Roboto-Italic.ttf
A		apps/steward-app/src/main/js/src/assets/fnt/roboto/Roboto-Light.ttf
A		apps/steward-app/src/main/js/src/assets/fnt/roboto/Roboto-LightItalic.ttf
A		apps/steward-app/src/main/js/src/assets/fnt/roboto/Roboto-Medium.ttf
A		apps/steward-app/src/main/js/src/assets/fnt/roboto/Roboto-MediumItalic.ttf
A		apps/steward-app/src/main/js/src/assets/fnt/roboto/Roboto-Regular.ttf
A		apps/steward-app/src/main/js/src/assets/fnt/roboto/Roboto-Thin.ttf
A		apps/steward-app/src/main/js/src/assets/fnt/roboto/Roboto-ThinItalic.ttf
A		apps/steward-app/src/main/js/src/assets/img/Background_Shrine.png
M		shrine-webclient/src/main/html/js-i2b2/cells/CRC/CRC_ctrlr_QryStatus.js