Homec4science
Authored by Ty <Ty_Coghlan@hms.harvard.edu> on Dec 21 2016, 22:52.

Description

merging

Event Timeline

Ty <Ty_Coghlan@hms.harvard.edu> committed R2664:76e240101956: merging (authored by Ty <Ty_Coghlan@hms.harvard.edu>).Dec 21 2016, 22:52

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.
CommitAuthorDetailsCommitted
561a0855b521Ty
reset to 1.22.2.5 
Dec 21 2016
d790946550b8Ty
Revert "resetting to 1.22.2.5" 
Dec 20 2016
b5bb2ab35756Ty
resetting to 1.22.2.5 
Dec 20 2016
e55eb140216eTy
1.22.2.4 w/ help files 
Dec 20 2016
14b581de4f77ben-carmen
Update of latest shrine-webclient help guide 
Dec 20 2016
6a34ac3fe19dben-carmen
Update of latest Steward Help File 
Dec 20 2016
39b15b5d2b72Ty
grabbing query from context uri 
Dec 19 2016
b61761ba2f72Ty
further debugging 
Dec 19 2016
420141663367Ty
adding debug statements 
Dec 19 2016
5933d9d32976Ty
added queries to fowarded paths 
Dec 19 2016
fe1be87bc825Ty
Merge branch '1.22.2.x' of https://open.med.harvard.edu/stash/scm/shrine/shrine… 
Dec 16 2016
29e0a2a9db4eTy
fixed it so you can't connect to remote dashboards with an incorrect keystore 
Dec 16 2016
ec5f2f11f51fTy
date fix... again 
Dec 16 2016
e448ae847237ben-carmen
SHRINE-1755 
Dec 14 2016
9d741e380d18ben-carmen
SHRINE-1755 
Dec 14 2016
a86fb58f7a54Ty
utc month fix 
Dec 14 2016
9c81e55d49a6Ty
version bump 
Dec 14 2016
1a5978a10f95ben-carmen
update of term usage label 
Dec 14 2016
0b03152f7d45ben-carmen
fix of bar graphs in IE 
Dec 14 2016
a6d473cd5bd1ben-carmen
code cleanup 
Dec 14 2016
495b90e2b0bcben-carmen
code cleanup 
Dec 14 2016
493aec5b995eTy
Merge branch '1.22.2.x' of https://open.med.harvard.edu/stash/scm/shrine/shrine… 
Dec 14 2016
02fafa3d3f56Ty
removed loading wheel for just timeout error 
Dec 14 2016
2c441d012775ben-carmen
Merge branch '1.22.2.x' of https://open.med.harvard.edu/stash/scm/shrine/shrine… 
Dec 14 2016
c833d0e254d8ben-carmen
SHRINE-1838 
Dec 14 2016
fe73d191f184Ty
added a loading screen to summary 
Dec 13 2016
532f2e0ea45dTy
fix for safari version 9 
Dec 13 2016
1d6ccd1e522cTy
Merge branch '1.22.2.x' of https://open.med.harvard.edu/stash/scm/shrine/shrine… 
Dec 13 2016
12ace3debfb4Ty
removed useless import 
Dec 13 2016
a6fa22f8787fben-carmen
fix of mystery IE issue attempt #2 
Dec 13 2016
f033e2760742Ty
Merge branch 'backwards-check' into 1.22.2.x 
Dec 13 2016
f65b498e1100Ty
date fix 
Dec 13 2016
d924ba8c5bfbben-carmen
Fix of mysterious IE parsing issue 
Dec 13 2016
992ec5567e35Ty
update to 1.22.2.4 
Dec 12 2016
4f52d2b1c870Ty
Merge branch '1.22.2.x' of https://open.med.harvard.edu/stash/scm/shrine/shrine… 
Dec 12 2016
eb8b66546529Ty
minor commenting/formatting 
Dec 12 2016
f627c4ef3ef7ben-carmen
refinement of date range 
Dec 12 2016
f700d59eb571ben-carmen
Merge branch '1.22.2.x' of https://open.med.harvard.edu/stash/scm/shrine/shrine… 
Dec 12 2016
5bd76f3ee426ben-carmen
Fix for SHRINE-1833 
Dec 12 2016
acc750dfec32David Walend
Now creates a problem for a missing database for SHRINE-1824 
Dec 12 2016
981c6a37b8c2David Walend
Merge branch '1.22.2.x' of https://open.med.harvard.edu/stash/scm/shrine/shrine… 
Dec 12 2016
8b97ba02e01eDavid Walend
Attempt to fix SHRINE-1824 - better error handling if the DSA email audit table… 
Dec 12 2016
84f4225330ffDavid Walend
Missing semicolons 
Dec 12 2016
102ae7da8213ben-carmen
Fix for SHRINE-1588 
Dec 9 2016
b75812d58e21ben-carmen
fix of clearUsers method missing 
Dec 9 2016
c04a8c3a7324Ty
home-button summary page fix 
Dec 8 2016
d999e1de604bTy
shrine-tools-module readded angular-loading-bar 
Dec 8 2016
7b2041d0ffeeben-carmen
Added fix to truncate username in graphing 
Dec 8 2016
5621ad765682ben-carmen
fix of topic dropdown styles 
Dec 7 2016
32f56ae07837ben-carmen
Merge branch '1.22.2.x' of https://open.med.harvard.edu/stash/scm/shrine/shrine… 
Dec 7 2016