Commits
![Marc-Danie Nazaire](https://secure.gravatar.com/avatar/5791d61dc20b16df2872683b83344a1e.jpg?s=96&d=mm)
Marc-Danie Nazaire authored cdb715ade9eM
Merge pull request #912 in SHRINE/shrine from feature/SHRINE2020-262 to 2.0-webclient * commit '4a7fcc4b302c2de3fb5d7637e4b5f9c17d30d45c': (134 commits) SHRINE2020-262 - Merge SHRINE 2.0 with Shrine 2020 at the beginning of Sprint 12 - changed network id to be a string in QueryRunner SHRINE2020-262 - Merge SHRINE 2.0 with Shrine 2020 at the beginning of Sprint 12 - fixed merge overwrite SHRINE2020-262 - Merge SHRINE 2.0 with Shrine 2020 at the beginning of Sprint 12 - Replaced queryResultPolling reference in unit test with queryResult Merge branch 'release/2.1.0-M6' of https://open.med.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-262 Moved the version to 2.1.0-M6QA1 for M6's QA pass Merging in most of the changes from SHRINE2020-225 - Include total number of sites and patient counts in the queryResultPolling api call These comments are lies Removed shrine-app and shrine-war for SHRINE-3541 One chaser for SHRINE-3541 Last cleanup for SHRINE-3541 Consolidating aim3-specific parts to the aim3 service for SHRINE-3541 Changed the request handler to more modern scala for SHRINE-3541 Deleted another layer for SHRINE-3541 Consolidated the awkward layers of the request dispatch into just one big if statement for SHRINE-3541 Dissolving HandleableAdminShrineRequest first step for SHRINE-3541 Deleted the held message business for SHRINE-3541 Deleting strange old test bits for SHRINE-3546 Stray Jersey comment for SHRINE-3541 Removed the last of the Jersy dependencies for SHRINE-1861 Less jersey testing - maybe all of it gone SHRINE-3541 ...
Showing diff to196ccc7511d