Homec4science

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

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

Description

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

Event Timeline

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

Merged Changes

CommitAuthorDetailsCommitted
b7b5d7af0a0aBen Carmen
Happy will report QEP Failure. 
Oct 17 2015
4bba97a96e08Keith Dwyer
[steward] main.tpl.html now references the correct application name 
Oct 16 2015
fedcaa34dd97Keith Dwyer
[steward] merge in CSS and template fixes made in dashboard 
Oct 16 2015
44f527c25976Keith Dwyer
[dashboard] slight emphasis on (potentially empty) logo area 
Oct 16 2015
1a35f0f3f4beKeith Dwyer
[dashboard] revert to div-based logo instead of img-based logo 
Oct 16 2015
16943afd6f12Keith Dwyer
[dashboard] go back to simpler fallback 
Oct 16 2015
7532ad171681Keith Dwyer
[dashboard] wherein variables get referenced but never defined 
Oct 16 2015
42c4019cb5b3Keith Dwyer
[dashboard] stray )s 
Oct 16 2015
b54680e62e06Keith Dwyer
Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine… 
Oct 16 2015
686df1e5089cKeith Dwyer
[dashboard] attempt better fallback for logo image 
Oct 16 2015
7c35b8fc640aBen Carmen
Clean up of model service. 
Oct 16 2015
e04915fbea07Ben Carmen
Fix of the config, an extra comma was causing the footer logo to not be parsed. 
Oct 16 2015