Diffusion SHRINE MedCo Fork f31cf19e668d

shrine…
f31cf19e668d
Actions

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

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 30 2015, 20:29

Pushed

mickmis

Mar 14 2017, 15:12

Parents

R2664:1d6d7c5ff2f5: removed some stray printlns)
R2664:fcfaa2c5112b: Fix of sort arrow not showing on page load.

Branches

Unknown

Tags

Unknown

Event Timeline

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

Merged Changes

Commit	Author	Details	Committed
fcfaa2c5112b	Ben Carmen	Fix of sort arrow not showing on page load.	Sep 30 2015
ef2b1b720f8b	Ben Carmen	Changed the title to SHRINE DASHBOARD.	Sep 30 2015
bcc1cde44947	Ben Carmen	Merge remote-tracking branch 'origin/develop' into develop	Sep 29 2015
7d1c0df30495	Ben Carmen	Commit of style fixes.	Sep 29 2015
8dc7bd13ccb6	Ben Carmen	Commit of style fixes.	Sep 29 2015

Changes (20)

		Path
M		apps/admin-app/src/main/js/index.html
M		apps/admin-app/src/main/js/src/app/dashboard/apps/happy/happy.tpl.html
P		apps/admin-app/src/main/js/src/app/dashboard/main.tpl.html Copied from apps/steward-app/src/main/js/src/app/dashboard/main.tpl.html
M		apps/admin-app/src/main/js/src/app/dashboard/sidebar/sidebar.js
M		apps/admin-app/src/main/js/src/app/dashboard/sidebar/sidebar.tpl.html
M		apps/admin-app/src/main/js/src/app/login/LoginCtrl.js
M		apps/admin-app/src/main/js/src/app/shrine-tools.js
M		apps/admin-app/src/main/js/src/assets/css/shrine.css
M		apps/steward-app/src/main/js/index.html
M		apps/steward-app/src/main/js/src/app/app.js
M		apps/steward-app/src/main/js/src/app/dashboard/history/history-table/history-table.tpl.html
P		apps/steward-app/src/main/js/src/app/dashboard/main.tpl.html Copied to apps/admin-app/src/main/js/src/app/dashboard/main.tpl.html
D		apps/steward-app/src/main/js/src/app/header/header-notification
V		apps/steward-app/src/main/js/src/app/header/{header-notification/header-notification.js → user-status/user-status.js}
D		apps/steward-app/src/main/js/src/app/header/header-notification/header-notification.tpl.html
M		apps/steward-app/src/main/js/src/app/header/header.tpl.html
A	(dir)	apps/steward-app/src/main/js/src/app/header/user-status/
V		apps/steward-app/src/main/js/src/app/header/{user-status/user-status.js ← header-notification/header-notification.js}
P		apps/steward-app/src/main/js/src/app/header/user-status/user-status.tpl.html Copied from apps/admin-app/src/main/js/src/app/header/user-status/user-status.tpl.html
M		apps/steward-app/src/main/js/src/assets/css/shrine.css