bcarmen | 5496547a609 | Unblock Marc Danie | | |
dwalend | 9098a300af5 | Merge branch 'develop' into bugfix/SHRINE-3650-don-t-write-the-sent-to-adapters | | |
dwalend | 296deb5ac77 | Chaser - missed pom.xml dependencies on the deleted shrine-client | | |
dwalend | 4263400f3fb | Merge remote-tracking branch 'origin/develop' into bugfix/SHRINE-3650-don-t-write-the-sent-to-adapters | | |
mjdiloreto | 069ff8741e1 | Add unit test for every possibility to reload mappings. Rename adapterAuditDb update sql scripts. | | |
marc-danie | fac3c1f41e8 | Fixed path to the category definition test file | | |
bcarmen | 2e068431510 | saving work | | |
mjdiloreto | 98fb207f27a | Removed more imports of scala.concurrent.duration._ | | |
bcarmen | 735600dfded | Merge branch '2.0-webclient' into feature/SHRINE2020-31-display-validation-errors-for-group-date-ranges | | |
mjdiloreto | 6c6c352556d | Registered net.shrine.log with logback so those classes are ignored in logged output. | | |
David Walend | ca1f95bdab9 | Merge pull request #732 in SHRINE/shrine from bugfix/SHRINE-3594-delete-some-dead-directories to develop
* commit '3... | | |
marc-danie | c34cd6be5bd | Merging changes from SHRINE 2020 (2.0-webclient) branch for ticket SHRINE2020-78 - Create JSON structure to run query... | | |
Marc-Danie Nazaire | 21b4ec4b32f | Merge pull request #729 in SHRINE/shrine from feature/SHRINE2020-78-technical-story-create-json to 2.0-webclient
* c... | | |
Marc-Danie Nazaire | 44bc64ae455 | Merge pull request #733 in SHRINE/shrine from feature/SHRINE2020-95-incorporate-code-categories to 2.0-webclient
* c... | | |
mjdiloreto | 5296a5949e5 | Changed all occurances of 'import scala.concurrent.duration._' to be explicit | | |
bcarmen | 911bd44128f | used parseFloat | | |
bcarmen | e88d7cae382 | Merge branch '2.0-webclient' into feature/SHRINE2020-31-display-validation-errors-for-group-date-ranges | | |
mjdiloreto | 8dd706ffa3a | Removed unused import | | |
mjdiloreto | 384abcfeb61 | Moved adapter mappings table schema to an update script. | | |
marc-danie | c6ffde2182d | Merge branches '2.0-webclient' and 'feature/SHRINE2020-78-technical-story-create-json' of https://open.med.harvard.ed... | | |
marc-danie | 4f99885ce59 | SHRINE2020-78 - Create JSON structure to run query with boolean logic, multiple terms, and groups - fixed issue with ... | | |
bcarmen | d1c428eb2be | tweaks based on BA review | | |
bcarmen | 7dc47530a8a | changed around some jsx for lab values | | |
bcarmen | fe5f6ca03e8 | working version of labs aligned with green text. | | |
bcarmen | 9b7793dd3bd | Fix of order validation error. | | |
bcarmen | 09678148dce | saving work | | |
mjdiloreto | ab1879e4df0 | Added filename in adapter mapping file metadata table. | | |
Matthew DiLoreto | 0f9da3b9fac | Merge pull request #734 in SHRINE/shrine from bugfix/SHRINE-3622-Move-to-mysql-driver-8.0.17 to develop
* commit '42... | | |
marc-danie | 3ec4a289856 | SHRINE2020-78 - Create JSON structure to run query with boolean logic, multiple terms, and groups - more code review ... | | |
mjdiloreto | 42d876de65d | Upgrade mysql driver. | | |
David Walend | 0e78489bc75 | Merge pull request #728 in SHRINE/shrine from feature/SHRINE-3658-label-closing-curly-braces-of to develop
* commit ... | | |
marc-danie | 5597d688a16 | SHRINE2020-78 - Create JSON structure to run query with boolean logic, multiple terms, and groups - Moved runQuery fu... | | |
marc-danie | 8f674071aff | SHRINE2020-95 - Incorporate code categories into the Lucene index - small code review changes | | |
Matthew DiLoreto | 0ac8c46741a | Merge pull request #730 in SHRINE/shrine from bugfix/SHRINE-3586-Replace-use-of-Base64 to develop
* commit '36da133f... | | |
Ben Carmen | 23143fc16e5 | Merge pull request #731 in SHRINE/shrine from feature/SHRINE2020-91-inline-lab-validation to 2.0-webclient
* commit ... | | |
bcarmen | 5796562e751 | adjusted space between terms | | |
marc-danie | c4c1b4111f8 | SHRINE2020-95 - Incorporate code categories into the Lucene index - added to SHRINE tools POM file | | |
marc-danie | 2b50418cf2b | SHRINE2020-95 - Incorporate code categories into the Lucene index | | |
bcarmen | 85169c29b04 | applied 12px margin top only to first query term | | |
Matthew DiLoreto | acad49d1054 | Merge pull request #724 in SHRINE/shrine from bugfix/SHRINE-3654-Add-try-until-success-API to develop
* commit 'ac9f... | | |
bcarmen | f45bbb05748 | added comment | | |
dwalend | 331035e6538 | Merge remote-tracking branch 'origin/develop' into bugfix/SHRINE-3594-delete-some-dead-directories | | |
dwalend | fa8d93c8fd8 | Deleting js-tools for SHRINE-3594 | | |
Ben C | dea2d847bcb | changed wording per BA review | | |
Ben C | eaf65ef1d1a | removed test data | | |
Ben C | 32439c42e91 | added unit tests | | |
Ben C | be5c2897c7d | saving work | | |
Ben C | 1187e8366be | updated tests and added propTypes | | |
Ben C | 483ed58c3bc | made change to wording per BA review | | |
Ben C | 68a263a1461 | saving refactor work | | |
Ben C | 2904c4adb4d | code refactor | | |
Ben C | 90d24a41d30 | saving work | | |
dwalend | 19ca714450d | Some progress on SHRINE-3650, but some work to go | | |
Ben C | df53b7a3af0 | saving work | | |
mjdiloreto | 36da133f006 | Replace javax DatatypeConverter with java.util.Base64 | | |
dwalend | 08c70c5bc1d | Send to node now has explicit symantics for who to send to for all cases for SHRINE-3650 | | |
dwalend | a18889d7f32 | Merge remote-tracking branch 'origin/bugfix/SHRINE-3654-Add-try-until-success-API' into bugfix/SHRINE-3650-don-t-writ... | | |
marc-danie | ed1cfe7af70 | SHRINE2020-81 - Server side conversion of JSON to i2b2 XML in QEP - removed unused import | | |
marc-danie | 95215d01fb3 | SHRINE2020-81 - Server side conversion of JSON to i2b2 XML in QEP - Replaced IllegalArgumentException when validating... | | |
marc-danie | 96457f7ca71 | SHRINE2020-81 - Server side conversion of JSON to i2b2 XML in QEP - Added unit test to for validatation of the lab va... | | |
marc-danie | 529b9f423b1 | SHRINE2020-81 - Server side conversion of JSON to i2b2 XML in QEP - removed use squerylDataSource from shrine.conf | | |
marc-danie | 81fa080b0a8 | SHRINE2020-94 - incorporate laboratory values to run a query - added validation of value constraints and updated unit... | | |
mjdiloreto | ac9f71241ac | Fix compilation warnings | | |
mjdiloreto | 2d86bf9bd2d | Merge branch 'develop' into bugfix/SHRINE-3654-Add-try-until-success-API | | |
Ben C | 66209ecc178 | saving work | | |
dwalend | 0ec48e2d34f | Merge branch 'bugfix/SHRINE-3654-Add-try-until-success-API' into bugfix/SHRINE-3650-don-t-write-the-sent-to-adapters | | |
dwalend | e9f588d6ba4 | Merge branch 'develop' into bugfix/SHRINE-3650-don-t-write-the-sent-to-adapters | | |
Ben C | 92ec7dd287e | saving progress | | |
Ben C | 74fa6cff96e | Merge branch '2.0-webclient' into feature/SHRINE2020-91-inline-lab-validation | | |
Ben C | dbf566a3d25 | Merge branch '2.0-webclient' of https://open.med.harvard.edu/stash/scm/shrine/shrine into 2.0-webclient | | |
Ben C | b76105cc75c | saving changes from BA review. | | |
dwalend | 2ff2e91b34f | Deleted some dead directories for SHRINE-3594 | | |
David Walend | 3618119b109 | Merge pull request #723 in SHRINE/shrine from feature/SHRINE-3647-prototype-using-type-safe-config to develop
* comm... | | |
marc-danie | ed2cd66164d | Merge branch '2.0-webclient' of https://open.med.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-78-techn... | | |
dwalend | 1799c67cc00 | Added more comments for SHRINE-3658 | | |
dwalend | 7b4f301909c | Added comments for SHRINE-3658 | | |
Ben C | 42c5117237d | saving work | | |
marc-danie | 45cd100a04b | Manually merging changes from SHRINE2020-81 - Server side conversion of JSON to i2b2 XML in QEP | | |
Matthew DiLoreto | 0a168b16eb2 | Merge pull request #719 in SHRINE/shrine from bugfix/SHRINE-3657-Annotate-SEnum to develop
* commit 'b8ff615cc33b02f... | | |
mjdiloreto | f5fea6a1901 | Code review changes. | | |
dwalend | 4c304f455a4 | No need for network.conf or qaNetwork.conf for SHRINE-3647 testing | | |
dwalend | c1b6ad6c30b | Removed network.conf and qaNetwork.conf, renamed qa.conf to override.conf for SHRINE-3647 | | |
Marc-Danie Nazaire | 49bf3aa1cd9 | Merge pull request #726 in SHRINE/shrine from feature/SHRINE2020-81-server-side-conversion-of-json to develop
* comm... | | |
dwalend | 1b86d2a2e09 | Merge remote-tracking branch 'origin/develop' into feature/SHRINE-3647-prototype-using-type-safe-config | | |
David Walend | 65b6020b306 | Merge pull request #718 in SHRINE/shrine from feature/SHRINE-3545-replace-the-jersey-http-client to develop
* commit... | | |
Ben C | b13044d0f0b | Merge branch '2.0-webclient' into feature/SHRINE2020-91-inline-lab-validation | | |
Ben C | 1147413d637 | text change from BA review | | |
Ben C | 54a67d7c80d | saving work | | |
dwalend | 8d355fadcce | Merge remote-tracking branch 'origin/develop' into feature/SHRINE-3545-replace-the-jersey-http-client | | |
Matthew DiLoreto | 317785285fb | Merge pull request #721 in SHRINE/shrine from bugfix/SHRINE-3660-Fix-QepService-shouldRespondNow to develop
* commit... | | |
dwalend | b6714f64901 | Swapped precedence of qaNetworkConfig and shrineConfig to support migration for SHRINE-3647 | | |
David Walend | 77684e8a398 | Merge pull request #722 in SHRINE/shrine from more-SHRINE-3545-replace-the-jersey-http-client to feature/SHRINE-3545-... | | |
Matthew DiLoreto | ecf5168be04 | Merge pull request #727 in SHRINE/shrine from bugfix/SHRINE-3668-Actually-Create-Network-From-Config to develop
* co... | | |
mjdiloreto | 535de63b37f | SHRINE-3668: Make sure network is created if none is found. | | |
marc-danie | 7a9eee52229 | Merge branches '2.0-webclient' and 'feature/SHRINE2020-78-technical-story-create-json' of https://open.med.harvard.ed... | | |
marc-danie | 65818c642b4 | SHRINE2020-81 - Server side conversion of JSON to i2b2 XML in QEP - removed use of SquerylAuditDao and AuditDao | | |
marc-danie | 72a8bc257a7 | SHRINE2020-81 - Server side conversion of JSON to i2b2 XML in QEP - code cleanup | | |
marc-danie | fdcf29fb800 | SHRINE2020-81 - Server side conversion of JSON to i2b2 XML in QEP - Code changes to support the changes for running t... | | |
dwalend | 5662afcc196 | Added test of nulling out a config value for SHRINE-3647 | | |
marc-danie | 1a5fd0642aa | SHRINE2020-81 - Server side conversion of JSON to i2b2 XML in QEP - Code review improvements | | |
marc-danie | bd87303b439 | SHRINE2020-81 - Server side conversion of JSON to i2b2 XML in QEP - More code cleanup | | |
marc-danie | 05c8363004a | SHRINE2020-81 - Server side conversion of JSON to i2b2 XML in QEP - Code cleanup | | |
marc-danie | ae9742b4dcf | SHRINE2020-81 - Server side conversion of JSON to i2b2 XML in QEP - Adding unit tests and fixed audit logging | | |
marc-danie | b2fbf3d89bf | SHRINE2020-81 - Server side conversion of JSON to i2b2 XML in QEP - added authorization check | | |
dwalend | 3a99b630200 | some stray bits got into SHRINE-3647 - take them out | | |
dwalend | 3599bf2a47d | Merge remote-tracking branch 'origin/develop' into feature/SHRINE-3647-prototype-using-type-safe-config | | |
dwalend | 867344929aa | Got tests passing, and all features except variables in reference.conf working for SHRINE-3647 | | |
Ben C | d30f860cf7f | Merge branch '2.0-webclient' into feature/SHRINE2020-91-inline-lab-validation | | |
Ben C | 7a28a3f4bce | Added background on drag over query group. | | |
Ben C | f1d143d4ad5 | saving work | | |
mjdiloreto | b1ff6a24119 | Catch bug in delayedUnbounded and delayedBounded where they do not try first before waiting. | | |
Ben Carmen | 5e189d75c0c | Merge pull request #720 in SHRINE/shrine from feature/SHRINE2020-85-tweak-concept-group-styles to 2.0-webclient
* co... | | |
dwalend | 3632feacfe3 | Progress and setup for SHRINE-3647 | | |
dwalend | 33442418441 | First round of code review fixes for SHRINE-3545 | | |
mjdiloreto | 5093f0c55e0 | Merge branch 'develop' into bugfix/SHRINE-3654-Add-try-until-success-API | | |
mjdiloreto | d7cea45f7d2 | Created tests for RetryIO. | | |
dwalend | 4531bd5d04f | Adding timeout and some more cleanup for SHRINE-3545 | | |
mjdiloreto | b7e3ec6ad98 | SHRINE-3660: QEP should only respond if some unobserved query is not already completed. | | |
dwalend | 6fbbc71c9d2 | todos for handing SSL in a future ticket | | |
Matthew DiLoreto | 027242a69e2 | Merge pull request #711 in SHRINE/shrine from bugfix/SHRINE-3645-Gracefully-handle-shrine-startup to develop
* commi... | | |
dwalend | 8fb1910dfb3 | Merge branch 'feature/SHRINE-3545-replace-the-jersey-http-client' into more-SHRINE-3545-replace-the-jersey-http-client | | |
dwalend | 3a5563f66ff | Early code review fixes from moving the code for SHRINE-3545 | | |
dwalend | 9b351fe7106 | More pom.xml cleanup for SHRINE-3545 | | |
dwalend | ad98943d246 | Cleaning the jersey client out of the pom.xmls for SHRINE-3545 | | |
marc-danie | 6699c35a098 | SHRINE2020-81 - Server side conversion of JSON to i2b2 XML in QEP | | |
dwalend | 1ccc988dd70 | Removed JerseyClient for SHRINE-3545 | | |
dwalend | 9d7895df6cc | Replaced jersey client with http4s client for SHRINE-3545 | | |
Ben C | 2821aedd6c9 | updated variable name | | |
Ben C | 3beef7a06d8 | fixed unit tests | | |
Ben C | 9f6b98248d5 | merge of 2.0-webclient | | |
Ben C | c37538afd05 | updated unit tests | | |
dwalend | 3171a6f4a22 | Successfully talking to the PM cell for SHRINE-3545 | | |
Ben C | 694d8e65930 | added padding to bottom of query term settings. | | |
Ben C | 4142844cde2 | updated unit tests. | | |
Ben C | c31d88434f2 | saving work from tweaking meeting with Anupama. | | |
dwalend | 8c6a59aeef1 | Merge remote-tracking branch 'origin/develop' into feature/SHRINE-3545-replace-the-jersey-http-client | | |
dwalend | 80cf066cc11 | First attempt to use the http4s client to talk to the PM cell for SHRINE-3545 | | |
mjdiloreto | f0727ea2102 | Qep goes crazy responding if QepService line 368 isn't always false. See SHRINE-3660. | | |
mjdiloreto | b8ff615cc33 | SHRINE-3657: No more warnings in shrine build and Xfatal-warnings on | | |
dwalend | 3c4f8bc94d7 | Crosstalk with SHRINE-3545 | | |
Ben C | 7f9119124ed | fixed date range unit test | | |
Ben C | 927ad404d07 | updated snapshot test. | | |
Ben C | e53330fcef1 | update of package lock | | |
Ben C | e6624953047 | fix of snapshot tests. | | |
dwalend | cd64e588ea1 | More dead code for SHRINE-3545 | | |
Ben Carmen | e6753ed47ca | Merge pull request #717 in SHRINE/shrine from feature/SHRINE2020-84-mui-concept-group to 2.0-webclient
* commit 'b54... | | |
Ben C | 62e538eb261 | made style changes specified in ticket. | | |
dwalend | 74676e4082b | Setting the stage to remove the jersey http client class for SHRINE-3545 | | |
dwalend | 5e509af53d0 | Getting rid of some dead code for SHRINE-3545 | | |
Ben C | b54819dc5dd | updated package to be absolute versions and updated unit tests. | | |
Ben C | 83f47ff52b5 | saving work | | |
dwalend | 4816c567150 | todos for SHRINE-3650 | | |
dwalend | 91930e0ea63 | Adding a qa.conf file to the works to test SHRINE-3647 | | |
dwalend | 47e0a9cdebe | Merge branch 'develop' into feature/SHRINE-3647-prototype-using-type-safe-config | | |
David Walend | 29ca2354065 | Merge pull request #716 in SHRINE/shrine from feature/SHRINE-3655-the-build-slowed-down-with-the to develop
* commit... | | |
Ben C | c7b5b26c26f | Merge branch '2.0-webclient' into feature/SHRINE2020-84-mui-concept-group | | |
Ben C | 2b29572cd8c | potential solution for Material UI for QueryTermGroup | | |
mjdiloreto | f43c8d95169 | Created methods in RetryIO for only the methods that are actually used elsewhere in SHRINE. | | |
Marc-Danie Nazaire | 812e1138c37 | Merge pull request #710 in SHRINE/shrine from feature/SHRINE2020-54-create-lucene-index-for-the to 2.0-webclient
* c... | | |
marc-danie | eeea87f5da8 | SHRINE2020-54 - Create Lucene index for the Ontology - Updated to use lucene-version property | | |
marc-danie | 281ffa981a3 | SHRINE2020-54 - Create Lucene index for the Ontology - Added isRoot field since using hlevel will not work for \\Diag... | | |
marc-danie | 6a70fcc3e57 | Merge branch '2.0-webclient' of https://open.med.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-54-creat... | | |
Matthew DiLoreto | 79db363cc9f | Merge pull request #714 in SHRINE/shrine from bugfix/SHRINE-3553-Clean-up-warnings-in-the-shrine-build to develop
* ... | | |
dwalend | 22c1e863a3c | Some more comments for SHRINE-3655 | | |
Marc-Danie Nazaire | 84ea9637d60 | Merge pull request #708 in SHRINE/shrine from feature/SHRINE2020-69-update-api-calls-for-browsing to 2.0-webclient
*... | | |
David Walend | 6d3e45de5b9 | Merge pull request #715 in SHRINE/shrine from feature/SHRINE-3655-the-build-slowed-down-with-the to develop
* commit... | | |
David Walend | 9944b83fabc | Merge pull request #712 in SHRINE/shrine from feature/SHRINE-3603-fail-fast-attempts-of-the-qep to develop
* commit ... | | |
dwalend | 74e428f20a0 | Reverting the scala-maven-plugin to 3.4.6 for some temporary relief - see SHRINE-3655 | | |
mjdiloreto | f237a63b736 | Merge branch 'develop' into bugfix/SHRINE-3553-Clean-up-warnings-in-the-shrine-build | | |
mjdiloreto | b25636bb378 | Merge branch 'develop' into bugfix/SHRINE-3645-Gracefully-handle-shrine-startup | | |
Matthew DiLoreto | 66c5e9c4d22 | Merge pull request #706 in SHRINE/shrine from bugfix/SHRINE-640-Adapter-Mapping-errors-should-specify to develop
* c... | | |
Ben C | a464d718f6f | saving work | | |
dwalend | f58cdf6b8f1 | Merge remote-tracking branch 'origin/develop' into feature/SHRINE-3647-prototype-using-type-safe-config | | |
dwalend | 0071f136b8d | Proof example for SHRINE-3647, but likely don't want to keep all these changes | | |
mjdiloreto | 5c9112b13ef | Convert multiple unsafeRunSync to nested flatmaps. | | |
Matthew DiLoreto | 581bc0ab66e | Merge pull request #713 in SHRINE/shrine from bugfix/SHRINE-3652-Connectivity-test-not-displaying to develop
* commi... | | |
marc-danie | 3b3200d2a4b | SHRINE2020-69 - Update api calls for browsing the hierarchy to use the Lucene index - Fixed issue with running | | |
marc-danie | 1f73f61632d | SHRINE2020-54 - Create Lucene index for the Ontology - Added comment about the input file format | | |
marc-danie | c108e473824 | SHRINE2020-69 - Update api calls for browsing the hierarchy to use the Lucene index - Increased default value for the... | | |
marc-danie | 23f3c911175 | SHRINE2020-54 - Create Lucene index for the Ontology - Added default value for the location of the lucene index per B... | | |
marc-danie | 3df66d6dc39 | SHRINE2020-54 - Create Lucene index for the Ontology - Updated the README | | |
marc-danie | 2a8eb3a0e3b | SHRINE2020-54 - Create Lucene index for the Ontology - update to test | | |
marc-danie | 2ff6307e258 | SHRINE2020-54 - Create Lucene index for the Ontology - Added unit test and readme | | |
mjdiloreto | 29123357ff0 | Remove unsafeRunSync from NetworkHealthScheduler. | | |
mjdiloreto | 6ce7893a70a | Fixed network connectivity test not checking after time limit reached. | | |
marc-danie | 6da9e00ddc8 | SHRINE2020-54 - Create Lucene index for the Ontology - Added note about c_* and m_* prefix in the field names | | |
marc-danie | 759df1b9576 | SHRINE2020-69 - Update api calls for browsing the hierarchy to use the Lucene index - Removed with BeforeAndAfter | | |
marc-danie | cbe1bcdad99 | SHRINE2020-69 - Update api calls for browsing the hierarchy to use the Lucene index - Updated to used @Test annotation | | |
| Next → |