 David Walend | e9fb670e6e5 | Merge pull request #759 in SHRINE/shrine from bugfix/SHRINE-3424-remove-remotesites-in-the-cert to develop
* commit ... | | |
 Ben Carmen | 7742652ea39 | Merge pull request #757 in SHRINE/shrine from add-polling-back-in to 2.0-webclient
* commit '4d7ba13a6593cba60957a06... | | |
 dwalend | dc1fc665b07 | Removed the unused remoteSites structures for SHRINE-3424 | | |
 Matthew DiLoreto | b1efc1d8a75 | Merge pull request #755 in SHRINE/shrine from feature/SHRINE2020-103-replace-the-harvard-catalyst to 2.0-webclient
*... | | |
 bcarmen | 1975cd4c7d2 | removed ^ from package dependencies | | |
 mjdiloreto | 7d2c7da9559 | Modified query definition help text to fit BA requirements (with Tooltip component). | | |
bcarmen | 0e2526d48f7 | added mui lab dependencu | | |
bcarmen | cd27993113b | Merge branch '2.0-webclient' into feature/SHRINE2020-93-mui-concepts-panel | | |
bcarmen | 1fd3b7ee709 | updated snapshot | | |
bcarmen | 9711aeb2c18 | Potential solution for moving ontology view into MUI | | |
bcarmen | 4d7ba13a659 | removing unused files | | |
bcarmen | 0378e319071 | Fix of query polling | | |
dwalend | 726fd342311 | Merge remote-tracking branch 'origin/develop' into feature/SHRINE-3575-remove-i2b2workarounds-object | | |
dwalend | d83dda1be26 | Removed the I2b2Workarounds class for SHRINE-3575 | | |
David Walend | caa6469fdb0 | Merge pull request #753 in SHRINE/shrine from bugfix/SHRINE-3636-drop-shrine_query_history-hub to develop
* commit '... | | |
mjdiloreto | 05f7eadc40a | SHRINE2020-103 changed Harvard Catalyst Logo to ACT logo. | | |
David Walend | 630796326d6 | Merge pull request #749 in SHRINE/shrine from bugfix/SHRINE-3662-clean-out-most-top-level-dependencies to develop
* ... | | |
bcarmen | 9b3a5cddbc9 | saving work | | |
Matthew DiLoreto | 01b19dba312 | Merge pull request #752 in SHRINE/shrine from bugfix/SHRINE2020-104-or-text-is-missing to 2.0-webclient
* commit '74... | | |
dwalend | 5b1cc89cfbf | Review changes for SHRINE-3636 | | |
dwalend | 4995ed36534 | Merge branch 'develop' into bugfix/SHRINE-3636-drop-shrine_query_history-hub | | |
dwalend | b79732aafe9 | Had to reopen SHRINE-3622. That new database driver needs some more settings. | | |
dwalend | 1ee836739dc | Merge branch 'develop' into bugfix/SHRINE-3662-clean-out-most-top-level-dependencies | | |
David Walend | 4b2d24ade68 | Merge pull request #750 in SHRINE/shrine from feature/SHRINE-3640-remove-dashboard-app-and-steward-app to develop
* ... | | |
dwalend | 24619c897b3 | Moved pom.xml version to 2.1.0-M4 | | |
bcarmen | 50e24a2657e | changed tab header | | |
bcarmen | 5a18bac9151 | saving work | | |
dwalend | 1031b406da4 | Looks like there's no love for if exists clauses in mssql and oracle - for SHRINE-3636 | | |
mjdiloreto | 74f681d5bb8 | SHRINE2020-104 fix QueryTermViews to display or when they are not the first in the list. | | |
dwalend | 80bb7a5e32e | Dropped the unused HUB tables for SHRINE-3636 - also makes SHRINE-2711 irrelevant | | |
Matthew DiLoreto | a7ff72eb65e | Merge pull request #748 in SHRINE/shrine from feature/SHRINE2020-92-implement-material-ui-framework to 2.0-webclient
... | | |
 marc-danie | 28e272ee2e8 | SHRINE2020-80 - Client side representation of query in JSON - Updated category definition file path names to start wi... | | |
 Marc-Danie Nazaire | dc5db00267d | Merge pull request #747 in SHRINE/shrine from feature/SHRINE2020-80-client-side-representation to 2.0-webclient
* co... | | |
marc-danie | ac6b63ff35d | SHRINE2020-80 - Client side representation of query in JSON - Minor change to log message | | |
marc-danie | ac229c8da02 | SHRINE2020-80 - Client side representation of query in JSON - Modified to return Bad Request response when there was ... | | |
dwalend | 8176890156c | Deleted all the non-javscript stuff in the soon-to-be-abandoned dashboard and steward app directories for SHRINE-3640 | | |
dwalend | 6c263c6f18b | Removed some more old cruft from the top-level pom.xml for SHRINE-3662 | | |
marc-danie | 02b021c7c1e | SHRINE2020-80 - Client side representation of query in JSON - Added ticket numbers in comments for temporary code | | |
marc-danie | cf726ccc74a | SHRINE2020-80 - Client side representation of query in JSON - Added ticket numbers in comments for temporary code | | |
dwalend | b033680870a | Removed a lot of top-level maven boilerplate and made dependencies more precise for SHRINE-3662 | | |
mjdiloreto | 7ad00ac6b53 | SHRINE2020-92 changes based on review. | | |
bcarmen | 433295e811c | saving work | | |
marc-danie | 4937aa5ff5f | SHRINE2020-80 - Client side representation of query in JSON - minor code cleanup | | |
marc-danie | 433a10db8e2 | SHRINE2020-80 - Client side representation of query in JSON - Updated topic name to match what is on 2020 servers | | |
mjdiloreto | d0ff07aaa17 | SHRINE2020-92 refactored inclusion/exclusion panel to use material ui. | | |
marc-danie | 2f8ef304d21 | Merge branches '2.0-webclient' and 'feature/SHRINE2020-80-client-side-representation' of https://open.med.harvard.edu... | | |
bcarmen | 4f5323ef25a | fix of failing snapshot test. | | |
Matthew DiLoreto | cf77776333f | Merge pull request #743 in SHRINE/shrine from bugfix/SHRINE-2650-Alpha-sort-breakdown to develop
* commit 'df19613d5... | | |
marc-danie | c120e7fcab8 | Merge branches '2.0-webclient' and 'feature/SHRINE2020-80-client-side-representation' of https://open.med.harvard.edu... | | |
David Walend | 8ab4a4edbca | Merge pull request #746 in SHRINE/shrine from bugfix/SHRINE-3648-request-to-run-a-query-never to develop
* commit '7... | | |
bcarmen | f2a1c038412 | Merge branch '2.0-webclient' into feature/SHRINE2020-93-mui-concepts-panel | | |
bcarmen | 52f4435465b | saving work | | |
 Ben C | f06cb38f1da | commit of .gitfile | | |
marc-danie | 59ff253653e | SHRINE2020-80 - Client side representation of query in JSON | | |
Ben Carmen | 6b8394d1847 | Merge pull request #745 in SHRINE/shrine from feature/SHRINE2020-71-mui-header to 2.0-webclient
* commit '03505bc1f6... | | |
dwalend | 738d50f9459 | Better log message and upgrade to http4s for SHRINE-3676 | | |
bcarmen | 03505bc1f6e | incorporated changes from code review | | |
dwalend | 80cac869073 | Merge remote-tracking branch 'origin/develop' into bugfix/SHRINE-3648-request-to-run-a-query-never | | |
Matthew DiLoreto | 0ee542e6591 | Merge pull request #742 in SHRINE/shrine from bugfix/SHRINE-3606-Add-unit-test-to-adapterMappingsDbTest-to-test-selec... | | |
David Walend | 69bd74cedf0 | Merge pull request #741 in SHRINE/shrine from bugfix/SHRINE-3650-don-t-write-the-sent-to-adapters to develop
* commi... | | |
bcarmen | a07a5da8a1e | added header. | | |
dwalend | 9e2dd8d0855 | Merge branch 'bugfix/SHRINE-3650-don-t-write-the-sent-to-adapters' into bugfix/SHRINE-3648-request-to-run-a-query-never | | |
bcarmen | 9d89ae2dc06 | saving changes | | |
bcarmen | 9a0a4d951f8 | functioning header | | |
Matthew DiLoreto | 8c1cd4a9cd8 | Merge pull request #736 in SHRINE/shrine from bugfix/SHRINE-3637-Cleanup-wildcard-import-of-duration to develop
* co... | | |
Matthew DiLoreto | a3dbaba6022 | Merge pull request #737 in SHRINE/shrine from bugfix/SHRINE-3620-Exclude-Log-as-the-source-of-a-log-entry to develop
... | | |
bcarmen | d0d5ba144c7 | Changes based on BA review | | |
bcarmen | 835210b2e30 | Merge branch 'feature/SHRINE2020-31-display-validation-errors-for-group-date-ranges' into 2.0-webclient | | |
bcarmen | 794bf9ff6b9 | changes based on UAT | | |
dwalend | 2d28d07f427 | Matt's review - comment fixes for SHRINE-3650 | | |
Matthew DiLoreto | 8f694329ba0 | Merge pull request #744 in SHRINE/shrine from bugfix/SHRINE-1471-Incorrect-spelling-of-occurrence to develop
* commi... | | |
dwalend | efdf87feb94 | Merge branch 'bugfix/SHRINE-3650-don-t-write-the-sent-to-adapters' of https://open.med.harvard.edu/stash/scm/shrine/s... | | |
bcarmen | f7f125c12bf | almost working/refactor | | |
mjdiloreto | 88aa4eade34 | Fix typo in web client. | | |
Ben Carmen | cde7f3dd19f | Merge pull request #740 in SHRINE/shrine from feature/SHRINE2020-31-display-validation-errors-for-group-date-ranges t... | | |
Matthew DiLoreto | 124baea74d5 | Merge pull request #735 in SHRINE/shrine from bugfix/SHRINE-3580-Store-Shrine-Ontology-Metadata to develop
* commit ... | | |
dwalend | 995df8b0eac | Making a few attempts to send a message to the adapters before giving up. SHRINE-3650 | | |
Marc-Danie Nazaire | 5c8e98f76f9 | Merge pull request #739 in SHRINE/shrine from feature/SHRINE2020-89-ontology-terms-should-be-displayed to 2.0-webclie... | | |
mjdiloreto | d4eed4cff30 | Added ignored unit test for testing adapter mappings with real ontology terms. | | |
mjdiloreto | df19613d5ab | Use alphanumeric sort to sort QEP breakdown names and type names. | | |
mjdiloreto | 459a1ea22d4 | Rename update sql script names to make automation easier. | | |
bcarmen | ffb25d306c1 | updated snapshot | | |
bcarmen | c3bcff2b3c3 | potential solution for date range validation | | |
marc-danie | 6ffe9cb1c90 | Fixed broken test | | |
mjdiloreto | 8db5100965e | Changed confusing variable name. | | |
bcarmen | a375607ddf8 | potential solution for date range validation | | |
marc-danie | f84b760e890 | Merge branches '2.0-webclient' and 'feature/SHRINE2020-89-ontology-terms-should-be-displayed' of https://open.med.har... | | |
marc-danie | 184d86ee77c | SHRINE2020-89 - Ontology terms should be displayed in the same order as ACT 2.0 prod (alphabetically) | | |
mjdiloreto | 53739e7fa12 | Created unit test for alphanumeric sort. | | |
mjdiloreto | ed1d6240881 | Create sort function for alpha-numeric strings | | |
Ben Carmen | bc50a757ffe | Merge pull request #738 in SHRINE/shrine from feature/SHRINE2020-80-query-object to 2.0-webclient
* commit '90f02386... | | |
dwalend | 0d325699249 | Merge remote-tracking branch 'origin/develop' into bugfix/SHRINE-3650-don-t-write-the-sent-to-adapters | | |
bcarmen | 90f0238694f | removed unwanted spaces | | |
bcarmen | 129093a3a8b | saving updated snapshot | | |
bcarmen | 7a2f6fcb571 | saving work | | |
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... | | |
| Next → |
