merging
Description
Description
Details
Details
- Committed
Ty <Ty_Coghlan@hms.harvard.edu> Dec 21 2016, 22:52 - Pushed
mickmis Mar 14 2017, 15:12 - Parents
- R2664:561a0855b521: reset to 1.22.2.5
R2664:86d9dbd4a152: Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine… - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
Commit | Author | Details | Committed | |||
---|---|---|---|---|---|---|
561a0855b521 | Ty | reset to 1.22.2.5 | Dec 21 2016 | |||
d790946550b8 | Ty | Revert "resetting to 1.22.2.5" | Dec 20 2016 | |||
b5bb2ab35756 | Ty | resetting to 1.22.2.5 | Dec 20 2016 | |||
e55eb140216e | Ty | 1.22.2.4 w/ help files | Dec 20 2016 | |||
14b581de4f77 | ben-carmen | Update of latest shrine-webclient help guide | Dec 20 2016 | |||
6a34ac3fe19d | ben-carmen | Update of latest Steward Help File | Dec 20 2016 | |||
39b15b5d2b72 | Ty | grabbing query from context uri | Dec 19 2016 | |||
b61761ba2f72 | Ty | further debugging | Dec 19 2016 | |||
420141663367 | Ty | adding debug statements | Dec 19 2016 | |||
5933d9d32976 | Ty | added queries to fowarded paths | Dec 19 2016 | |||
fe1be87bc825 | Ty | Merge branch '1.22.2.x' of https://open.med.harvard.edu/stash/scm/shrine/shrine… | Dec 16 2016 | |||
29e0a2a9db4e | Ty | fixed it so you can't connect to remote dashboards with an incorrect keystore | Dec 16 2016 | |||
ec5f2f11f51f | Ty | date fix... again | Dec 16 2016 | |||
e448ae847237 | ben-carmen | SHRINE-1755 | Dec 14 2016 | |||
9d741e380d18 | ben-carmen | SHRINE-1755 | Dec 14 2016 | |||
a86fb58f7a54 | Ty | utc month fix | Dec 14 2016 | |||
9c81e55d49a6 | Ty | version bump | Dec 14 2016 | |||
1a5978a10f95 | ben-carmen | update of term usage label | Dec 14 2016 | |||
0b03152f7d45 | ben-carmen | fix of bar graphs in IE | Dec 14 2016 | |||
a6d473cd5bd1 | ben-carmen | code cleanup | Dec 14 2016 | |||
495b90e2b0bc | ben-carmen | code cleanup | Dec 14 2016 | |||
493aec5b995e | Ty | Merge branch '1.22.2.x' of https://open.med.harvard.edu/stash/scm/shrine/shrine… | Dec 14 2016 | |||
02fafa3d3f56 | Ty | removed loading wheel for just timeout error | Dec 14 2016 | |||
2c441d012775 | ben-carmen | Merge branch '1.22.2.x' of https://open.med.harvard.edu/stash/scm/shrine/shrine… | Dec 14 2016 | |||
c833d0e254d8 | ben-carmen | SHRINE-1838 | Dec 14 2016 | |||
fe73d191f184 | Ty | added a loading screen to summary | Dec 13 2016 | |||
532f2e0ea45d | Ty | fix for safari version 9 | Dec 13 2016 | |||
1d6ccd1e522c | Ty | Merge branch '1.22.2.x' of https://open.med.harvard.edu/stash/scm/shrine/shrine… | Dec 13 2016 | |||
12ace3debfb4 | Ty | removed useless import | Dec 13 2016 | |||
a6fa22f8787f | ben-carmen | fix of mystery IE issue attempt #2 | Dec 13 2016 | |||
f033e2760742 | Ty | Merge branch 'backwards-check' into 1.22.2.x | Dec 13 2016 | |||
f65b498e1100 | Ty | date fix | Dec 13 2016 | |||
d924ba8c5bfb | ben-carmen | Fix of mysterious IE parsing issue | Dec 13 2016 | |||
992ec5567e35 | Ty | update to 1.22.2.4 | Dec 12 2016 | |||
4f52d2b1c870 | Ty | Merge branch '1.22.2.x' of https://open.med.harvard.edu/stash/scm/shrine/shrine… | Dec 12 2016 | |||
eb8b66546529 | Ty | minor commenting/formatting | Dec 12 2016 | |||
f627c4ef3ef7 | ben-carmen | refinement of date range | Dec 12 2016 | |||
f700d59eb571 | ben-carmen | Merge branch '1.22.2.x' of https://open.med.harvard.edu/stash/scm/shrine/shrine… | Dec 12 2016 | |||
5bd76f3ee426 | ben-carmen | Fix for SHRINE-1833 | Dec 12 2016 | |||
acc750dfec32 | David Walend | Now creates a problem for a missing database for SHRINE-1824 | Dec 12 2016 | |||
981c6a37b8c2 | David Walend | Merge branch '1.22.2.x' of https://open.med.harvard.edu/stash/scm/shrine/shrine… | Dec 12 2016 | |||
8b97ba02e01e | David Walend | Attempt to fix SHRINE-1824 - better error handling if the DSA email audit table… | Dec 12 2016 | |||
84f4225330ff | David Walend | Missing semicolons | Dec 12 2016 | |||
102ae7da8213 | ben-carmen | Fix for SHRINE-1588 | Dec 9 2016 | |||
b75812d58e21 | ben-carmen | fix of clearUsers method missing | Dec 9 2016 | |||
c04a8c3a7324 | Ty | home-button summary page fix | Dec 8 2016 | |||
d999e1de604b | Ty | shrine-tools-module readded angular-loading-bar | Dec 8 2016 | |||
7b2041d0ffee | ben-carmen | Added fix to truncate username in graphing | Dec 8 2016 | |||
5621ad765682 | ben-carmen | fix of topic dropdown styles | Dec 7 2016 | |||
32f56ae07837 | ben-carmen | Merge branch '1.22.2.x' of https://open.med.harvard.edu/stash/scm/shrine/shrine… | Dec 7 2016 |