Homec4science

Merge remote-tracking branch 'origin/develop' into develop

Authored by Ben Carmen <benjamin_carmen@hms.harvard.edu> on Oct 16 2015, 04:39.

Description

Merge remote-tracking branch 'origin/develop' into develop

Event Timeline

Ben Carmen <benjamin_carmen@hms.harvard.edu> committed R2664:55f8d1a3ffb8: Merge remote-tracking branch 'origin/develop' into develop (authored by Ben Carmen <benjamin_carmen@hms.harvard.edu>).Oct 16 2015, 04:39

Merged Changes

CommitAuthorDetailsCommitted
5a2ef294c268Keith Dwyer
[dashboard] add cases for 1-or-many for downstreamNodes, importedCerts, and… 
Oct 16 2015
f472f4dd287aKeith Dwyer
[dashboard] ng-repeat scope fix 
Oct 16 2015
5b005fd48649Keith Dwyer
[dashboard] make width of first column consistent across all tables, swap… 
Oct 15 2015
0acb0aa1fa74Keith Dwyer
[dashboard] change 3-9 split to 2-10, add margin to main wrapper to prevent… 
Oct 15 2015
47a8b38f9cc5Keith Dwyer
[dashboard] notAHub logic works the way it should now 
Oct 15 2015
2459fe1cd485David Walend
Updated language to match the wiki 
Oct 15 2015
92366f1212eaKeith Dwyer
Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine… 
Oct 15 2015
82e80799c1d3Keith Dwyer
add .DS_Store to .gitignore (seems to already be ignored, adding solely to be… 
Oct 15 2015
864ec7b27fafKeith Dwyer
[dashboard] background-attachment: fixed 
Oct 15 2015
84bdca4c12e5David Walend
Added HttpErrorCodeFromAdapter and CouldNotParseXmlFromAdapter 
Oct 15 2015
f65c647aa242Keith Dwyer
[dashboard] sidebar fix, JS booleans and === 
Oct 15 2015
c3a063dff576David Walend
Changed details to an xml element, which seems to carry through everything as… 
Oct 15 2015
38a6b6096fd6Keith Dwyer
[dashboard] CSS fixes (now adds up to 12 columns) 
Oct 15 2015