SHRINE
  1. SHRINE

shrine

Public
  1. SHRINE
  2. shrine

All Branches Graph  

        
AuthorCommitMessageCommit dateBuilds
bcarmenbcarmen
5496547a609Unblock Marc Danie
dwalenddwalend
9098a300af5Merge branch 'develop' into bugfix/SHRINE-3650-don-t-write-the-sent-to-adapters
dwalenddwalend
296deb5ac77Chaser - missed pom.xml dependencies on the deleted shrine-client
dwalenddwalend
4263400f3fbMerge remote-tracking branch 'origin/develop' into bugfix/SHRINE-3650-don-t-write-the-sent-to-adapters
mjdiloretomjdiloreto
069ff8741e1Add unit test for every possibility to reload mappings. Rename adapterAuditDb update sql scripts.
marc-daniemarc-danie
fac3c1f41e8Fixed path to the category definition test file
bcarmenbcarmen
2e068431510saving work
mjdiloretomjdiloreto
98fb207f27aRemoved more imports of scala.concurrent.duration._
bcarmenbcarmen
735600dfdedMerge branch '2.0-webclient' into feature/SHRINE2020-31-display-validation-errors-for-group-date-ranges
mjdiloretomjdiloreto
6c6c352556dRegistered net.shrine.log with logback so those classes are ignored in logged output.
David WalendDavid Walend
ca1f95bdab9Merge pull request #732 in SHRINE/shrine from bugfix/SHRINE-3594-delete-some-dead-directories to develop * commit '3...
marc-daniemarc-danie
c34cd6be5bdMerging changes from SHRINE 2020 (2.0-webclient) branch for ticket SHRINE2020-78 - Create JSON structure to run query...
Marc-Danie NazaireMarc-Danie Nazaire
21b4ec4b32fMerge pull request #729 in SHRINE/shrine from feature/SHRINE2020-78-technical-story-create-json to 2.0-webclient * c...
Marc-Danie NazaireMarc-Danie Nazaire
44bc64ae455Merge pull request #733 in SHRINE/shrine from feature/SHRINE2020-95-incorporate-code-categories to 2.0-webclient * c...
mjdiloretomjdiloreto
5296a5949e5Changed all occurances of 'import scala.concurrent.duration._' to be explicit
bcarmenbcarmen
911bd44128fused parseFloat
bcarmenbcarmen
e88d7cae382Merge branch '2.0-webclient' into feature/SHRINE2020-31-display-validation-errors-for-group-date-ranges
mjdiloretomjdiloreto
8dd706ffa3aRemoved unused import
mjdiloretomjdiloreto
384abcfeb61Moved adapter mappings table schema to an update script.
marc-daniemarc-danie
c6ffde2182dMerge branches '2.0-webclient' and 'feature/SHRINE2020-78-technical-story-create-json' of https://open.med.harvard.ed...
marc-daniemarc-danie
4f99885ce59SHRINE2020-78 - Create JSON structure to run query with boolean logic, multiple terms, and groups - fixed issue with ...
bcarmenbcarmen
d1c428eb2betweaks based on BA review
bcarmenbcarmen
7dc47530a8achanged around some jsx for lab values
bcarmenbcarmen
fe5f6ca03e8working version of labs aligned with green text.
bcarmenbcarmen
9b7793dd3bdFix of order validation error.
bcarmenbcarmen
09678148dcesaving work
mjdiloretomjdiloreto
ab1879e4df0Added filename in adapter mapping file metadata table.
Matthew DiLoretoMatthew DiLoreto
0f9da3b9facMerge pull request #734 in SHRINE/shrine from bugfix/SHRINE-3622-Move-to-mysql-driver-8.0.17 to develop * commit '42...
marc-daniemarc-danie
3ec4a289856SHRINE2020-78 - Create JSON structure to run query with boolean logic, multiple terms, and groups - more code review ...
mjdiloretomjdiloreto
42d876de65dUpgrade mysql driver.
David WalendDavid Walend
0e78489bc75Merge pull request #728 in SHRINE/shrine from feature/SHRINE-3658-label-closing-curly-braces-of to develop * commit ...
marc-daniemarc-danie
5597d688a16SHRINE2020-78 - Create JSON structure to run query with boolean logic, multiple terms, and groups - Moved runQuery fu...
marc-daniemarc-danie
8f674071affSHRINE2020-95 - Incorporate code categories into the Lucene index - small code review changes
Matthew DiLoretoMatthew DiLoreto
0ac8c46741aMerge pull request #730 in SHRINE/shrine from bugfix/SHRINE-3586-Replace-use-of-Base64 to develop * commit '36da133f...
Ben CarmenBen Carmen
23143fc16e5Merge pull request #731 in SHRINE/shrine from feature/SHRINE2020-91-inline-lab-validation to 2.0-webclient * commit ...
bcarmenbcarmen
5796562e751adjusted space between terms
marc-daniemarc-danie
c4c1b4111f8SHRINE2020-95 - Incorporate code categories into the Lucene index - added to SHRINE tools POM file
marc-daniemarc-danie
2b50418cf2bSHRINE2020-95 - Incorporate code categories into the Lucene index
bcarmenbcarmen
85169c29b04applied 12px margin top only to first query term
Matthew DiLoretoMatthew DiLoreto
acad49d1054Merge pull request #724 in SHRINE/shrine from bugfix/SHRINE-3654-Add-try-until-success-API to develop * commit 'ac9f...
bcarmenbcarmen
f45bbb05748added comment
dwalenddwalend
331035e6538Merge remote-tracking branch 'origin/develop' into bugfix/SHRINE-3594-delete-some-dead-directories
dwalenddwalend
fa8d93c8fd8Deleting js-tools for SHRINE-3594
Ben CBen C
dea2d847bcbchanged wording per BA review
Ben CBen C
eaf65ef1d1aremoved test data
Ben CBen C
32439c42e91added unit tests
Ben CBen C
be5c2897c7dsaving work
Ben CBen C
1187e8366beupdated tests and added propTypes
Ben CBen C
483ed58c3bcmade change to wording per BA review
Ben CBen C
68a263a1461saving refactor work
Ben CBen C
2904c4adb4dcode refactor
Ben CBen C
90d24a41d30saving work
dwalenddwalend
19ca714450dSome progress on SHRINE-3650, but some work to go
Ben CBen C
df53b7a3af0saving work
mjdiloretomjdiloreto
36da133f006Replace javax DatatypeConverter with java.util.Base64
dwalenddwalend
08c70c5bc1dSend to node now has explicit symantics for who to send to for all cases for SHRINE-3650
dwalenddwalend
a18889d7f32Merge remote-tracking branch 'origin/bugfix/SHRINE-3654-Add-try-until-success-API' into bugfix/SHRINE-3650-don-t-writ...
marc-daniemarc-danie
ed1cfe7af70SHRINE2020-81 - Server side conversion of JSON to i2b2 XML in QEP - removed unused import
marc-daniemarc-danie
95215d01fb3SHRINE2020-81 - Server side conversion of JSON to i2b2 XML in QEP - Replaced IllegalArgumentException when validating...
marc-daniemarc-danie
96457f7ca71SHRINE2020-81 - Server side conversion of JSON to i2b2 XML in QEP - Added unit test to for validatation of the lab va...
marc-daniemarc-danie
529b9f423b1SHRINE2020-81 - Server side conversion of JSON to i2b2 XML in QEP - removed use squerylDataSource from shrine.conf
marc-daniemarc-danie
81fa080b0a8SHRINE2020-94 - incorporate laboratory values to run a query - added validation of value constraints and updated unit...
mjdiloretomjdiloreto
ac9f71241acFix compilation warnings
mjdiloretomjdiloreto
2d86bf9bd2dMerge branch 'develop' into bugfix/SHRINE-3654-Add-try-until-success-API
Ben CBen C
66209ecc178saving work
dwalenddwalend
0ec48e2d34fMerge branch 'bugfix/SHRINE-3654-Add-try-until-success-API' into bugfix/SHRINE-3650-don-t-write-the-sent-to-adapters
dwalenddwalend
e9f588d6ba4Merge branch 'develop' into bugfix/SHRINE-3650-don-t-write-the-sent-to-adapters
Ben CBen C
92ec7dd287esaving progress
Ben CBen C
74fa6cff96eMerge branch '2.0-webclient' into feature/SHRINE2020-91-inline-lab-validation
Ben CBen C
dbf566a3d25Merge branch '2.0-webclient' of https://open.med.harvard.edu/stash/scm/shrine/shrine into 2.0-webclient
Ben CBen C
b76105cc75csaving changes from BA review.
dwalenddwalend
2ff2e91b34fDeleted some dead directories for SHRINE-3594
David WalendDavid Walend
3618119b109Merge pull request #723 in SHRINE/shrine from feature/SHRINE-3647-prototype-using-type-safe-config to develop * comm...
marc-daniemarc-danie
ed2cd66164dMerge branch '2.0-webclient' of https://open.med.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-78-techn...
dwalenddwalend
1799c67cc00Added more comments for SHRINE-3658
dwalenddwalend
7b4f301909cAdded comments for SHRINE-3658
Ben CBen C
42c5117237dsaving work
marc-daniemarc-danie
45cd100a04bManually merging changes from SHRINE2020-81 - Server side conversion of JSON to i2b2 XML in QEP
Matthew DiLoretoMatthew DiLoreto
0a168b16eb2Merge pull request #719 in SHRINE/shrine from bugfix/SHRINE-3657-Annotate-SEnum to develop * commit 'b8ff615cc33b02f...
mjdiloretomjdiloreto
f5fea6a1901Code review changes.
dwalenddwalend
4c304f455a4No need for network.conf or qaNetwork.conf for SHRINE-3647 testing
dwalenddwalend
c1b6ad6c30bRemoved network.conf and qaNetwork.conf, renamed qa.conf to override.conf for SHRINE-3647
Marc-Danie NazaireMarc-Danie Nazaire
49bf3aa1cd9Merge pull request #726 in SHRINE/shrine from feature/SHRINE2020-81-server-side-conversion-of-json to develop * comm...
dwalenddwalend
1b86d2a2e09Merge remote-tracking branch 'origin/develop' into feature/SHRINE-3647-prototype-using-type-safe-config
David WalendDavid Walend
65b6020b306Merge pull request #718 in SHRINE/shrine from feature/SHRINE-3545-replace-the-jersey-http-client to develop * commit...
Ben CBen C
b13044d0f0bMerge branch '2.0-webclient' into feature/SHRINE2020-91-inline-lab-validation
Ben CBen C
1147413d637text change from BA review
Ben CBen C
54a67d7c80dsaving work
dwalenddwalend
8d355fadcceMerge remote-tracking branch 'origin/develop' into feature/SHRINE-3545-replace-the-jersey-http-client
Matthew DiLoretoMatthew DiLoreto
317785285fbMerge pull request #721 in SHRINE/shrine from bugfix/SHRINE-3660-Fix-QepService-shouldRespondNow to develop * commit...
dwalenddwalend
b6714f64901Swapped precedence of qaNetworkConfig and shrineConfig to support migration for SHRINE-3647
David WalendDavid Walend
77684e8a398Merge pull request #722 in SHRINE/shrine from more-SHRINE-3545-replace-the-jersey-http-client to feature/SHRINE-3545-...
Matthew DiLoretoMatthew DiLoreto
ecf5168be04Merge pull request #727 in SHRINE/shrine from bugfix/SHRINE-3668-Actually-Create-Network-From-Config to develop * co...
mjdiloretomjdiloreto
535de63b37fSHRINE-3668: Make sure network is created if none is found.
marc-daniemarc-danie
7a9eee52229Merge branches '2.0-webclient' and 'feature/SHRINE2020-78-technical-story-create-json' of https://open.med.harvard.ed...
marc-daniemarc-danie
65818c642b4SHRINE2020-81 - Server side conversion of JSON to i2b2 XML in QEP - removed use of SquerylAuditDao and AuditDao
marc-daniemarc-danie
72a8bc257a7SHRINE2020-81 - Server side conversion of JSON to i2b2 XML in QEP - code cleanup
marc-daniemarc-danie
fdcf29fb800SHRINE2020-81 - Server side conversion of JSON to i2b2 XML in QEP - Code changes to support the changes for running t...
dwalenddwalend
5662afcc196Added test of nulling out a config value for SHRINE-3647
marc-daniemarc-danie
1a5fd0642aaSHRINE2020-81 - Server side conversion of JSON to i2b2 XML in QEP - Code review improvements
marc-daniemarc-danie
bd87303b439SHRINE2020-81 - Server side conversion of JSON to i2b2 XML in QEP - More code cleanup
marc-daniemarc-danie
05c8363004aSHRINE2020-81 - Server side conversion of JSON to i2b2 XML in QEP - Code cleanup
marc-daniemarc-danie
ae9742b4dcfSHRINE2020-81 - Server side conversion of JSON to i2b2 XML in QEP - Adding unit tests and fixed audit logging
marc-daniemarc-danie
b2fbf3d89bfSHRINE2020-81 - Server side conversion of JSON to i2b2 XML in QEP - added authorization check
dwalenddwalend
3a99b630200some stray bits got into SHRINE-3647 - take them out
dwalenddwalend
3599bf2a47dMerge remote-tracking branch 'origin/develop' into feature/SHRINE-3647-prototype-using-type-safe-config
dwalenddwalend
867344929aaGot tests passing, and all features except variables in reference.conf working for SHRINE-3647
Ben CBen C
d30f860cf7fMerge branch '2.0-webclient' into feature/SHRINE2020-91-inline-lab-validation
Ben CBen C
7a28a3f4bceAdded background on drag over query group.
Ben CBen C
f1d143d4ad5saving work
mjdiloretomjdiloreto
b1ff6a24119Catch bug in delayedUnbounded and delayedBounded where they do not try first before waiting.
Ben CarmenBen Carmen
5e189d75c0cMerge pull request #720 in SHRINE/shrine from feature/SHRINE2020-85-tweak-concept-group-styles to 2.0-webclient * co...
dwalenddwalend
3632feacfe3Progress and setup for SHRINE-3647
dwalenddwalend
33442418441First round of code review fixes for SHRINE-3545
mjdiloretomjdiloreto
5093f0c55e0Merge branch 'develop' into bugfix/SHRINE-3654-Add-try-until-success-API
mjdiloretomjdiloreto
d7cea45f7d2Created tests for RetryIO.
dwalenddwalend
4531bd5d04fAdding timeout and some more cleanup for SHRINE-3545
mjdiloretomjdiloreto
b7e3ec6ad98SHRINE-3660: QEP should only respond if some unobserved query is not already completed.
dwalenddwalend
6fbbc71c9d2todos for handing SSL in a future ticket
Matthew DiLoretoMatthew DiLoreto
027242a69e2Merge pull request #711 in SHRINE/shrine from bugfix/SHRINE-3645-Gracefully-handle-shrine-startup to develop * commi...
dwalenddwalend
8fb1910dfb3Merge branch 'feature/SHRINE-3545-replace-the-jersey-http-client' into more-SHRINE-3545-replace-the-jersey-http-client
dwalenddwalend
3a5563f66ffEarly code review fixes from moving the code for SHRINE-3545
dwalenddwalend
9b351fe7106More pom.xml cleanup for SHRINE-3545
dwalenddwalend
ad98943d246Cleaning the jersey client out of the pom.xmls for SHRINE-3545
marc-daniemarc-danie
6699c35a098SHRINE2020-81 - Server side conversion of JSON to i2b2 XML in QEP
dwalenddwalend
1ccc988dd70Removed JerseyClient for SHRINE-3545
dwalenddwalend
9d7895df6ccReplaced jersey client with http4s client for SHRINE-3545
Ben CBen C
2821aedd6c9updated variable name
Ben CBen C
3beef7a06d8fixed unit tests
Ben CBen C
9f6b98248d5merge of 2.0-webclient
Ben CBen C
c37538afd05updated unit tests
dwalenddwalend
3171a6f4a22Successfully talking to the PM cell for SHRINE-3545
Ben CBen C
694d8e65930added padding to bottom of query term settings.
Ben CBen C
4142844cde2updated unit tests.
Ben CBen C
c31d88434f2saving work from tweaking meeting with Anupama.
dwalenddwalend
8c6a59aeef1Merge remote-tracking branch 'origin/develop' into feature/SHRINE-3545-replace-the-jersey-http-client
dwalenddwalend
80cf066cc11First attempt to use the http4s client to talk to the PM cell for SHRINE-3545
mjdiloretomjdiloreto
f0727ea2102Qep goes crazy responding if QepService line 368 isn't always false. See SHRINE-3660.
mjdiloretomjdiloreto
b8ff615cc33SHRINE-3657: No more warnings in shrine build and Xfatal-warnings on
dwalenddwalend
3c4f8bc94d7Crosstalk with SHRINE-3545
Ben CBen C
7f9119124edfixed date range unit test
Ben CBen C
927ad404d07updated snapshot test.
Ben CBen C
e53330fcef1update of package lock
Ben CBen C
e6624953047fix of snapshot tests.
dwalenddwalend
cd64e588ea1More dead code for SHRINE-3545
Ben CarmenBen Carmen
e6753ed47caMerge pull request #717 in SHRINE/shrine from feature/SHRINE2020-84-mui-concept-group to 2.0-webclient * commit 'b54...
Ben CBen C
62e538eb261made style changes specified in ticket.
dwalenddwalend
74676e4082bSetting the stage to remove the jersey http client class for SHRINE-3545
dwalenddwalend
5e509af53d0Getting rid of some dead code for SHRINE-3545
Ben CBen C
b54819dc5ddupdated package to be absolute versions and updated unit tests.
Ben CBen C
83f47ff52b5saving work
dwalenddwalend
4816c567150todos for SHRINE-3650
dwalenddwalend
91930e0ea63Adding a qa.conf file to the works to test SHRINE-3647
dwalenddwalend
47e0a9cdebeMerge branch 'develop' into feature/SHRINE-3647-prototype-using-type-safe-config
David WalendDavid Walend
29ca2354065Merge pull request #716 in SHRINE/shrine from feature/SHRINE-3655-the-build-slowed-down-with-the to develop * commit...
Ben CBen C
c7b5b26c26fMerge branch '2.0-webclient' into feature/SHRINE2020-84-mui-concept-group
Ben CBen C
2b29572cd8cpotential solution for Material UI for QueryTermGroup
mjdiloretomjdiloreto
f43c8d95169Created methods in RetryIO for only the methods that are actually used elsewhere in SHRINE.
Marc-Danie NazaireMarc-Danie Nazaire
812e1138c37Merge pull request #710 in SHRINE/shrine from feature/SHRINE2020-54-create-lucene-index-for-the to 2.0-webclient * c...
marc-daniemarc-danie
eeea87f5da8SHRINE2020-54 - Create Lucene index for the Ontology - Updated to use lucene-version property
marc-daniemarc-danie
281ffa981a3SHRINE2020-54 - Create Lucene index for the Ontology - Added isRoot field since using hlevel will not work for \\Diag...
marc-daniemarc-danie
6a70fcc3e57Merge branch '2.0-webclient' of https://open.med.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-54-creat...
Matthew DiLoretoMatthew DiLoreto
79db363cc9fMerge pull request #714 in SHRINE/shrine from bugfix/SHRINE-3553-Clean-up-warnings-in-the-shrine-build to develop * ...
dwalenddwalend
22c1e863a3cSome more comments for SHRINE-3655
Marc-Danie NazaireMarc-Danie Nazaire
84ea9637d60Merge pull request #708 in SHRINE/shrine from feature/SHRINE2020-69-update-api-calls-for-browsing to 2.0-webclient *...
David WalendDavid Walend
6d3e45de5b9Merge pull request #715 in SHRINE/shrine from feature/SHRINE-3655-the-build-slowed-down-with-the to develop * commit...
David WalendDavid Walend
9944b83fabcMerge pull request #712 in SHRINE/shrine from feature/SHRINE-3603-fail-fast-attempts-of-the-qep to develop * commit ...
dwalenddwalend
74e428f20a0Reverting the scala-maven-plugin to 3.4.6 for some temporary relief - see SHRINE-3655
mjdiloretomjdiloreto
f237a63b736Merge branch 'develop' into bugfix/SHRINE-3553-Clean-up-warnings-in-the-shrine-build
mjdiloretomjdiloreto
b25636bb378Merge branch 'develop' into bugfix/SHRINE-3645-Gracefully-handle-shrine-startup
Matthew DiLoretoMatthew DiLoreto
66c5e9c4d22Merge pull request #706 in SHRINE/shrine from bugfix/SHRINE-640-Adapter-Mapping-errors-should-specify to develop * c...
Ben CBen C
a464d718f6fsaving work
dwalenddwalend
f58cdf6b8f1Merge remote-tracking branch 'origin/develop' into feature/SHRINE-3647-prototype-using-type-safe-config
dwalenddwalend
0071f136b8dProof example for SHRINE-3647, but likely don't want to keep all these changes
mjdiloretomjdiloreto
5c9112b13efConvert multiple unsafeRunSync to nested flatmaps.
Matthew DiLoretoMatthew DiLoreto
581bc0ab66eMerge pull request #713 in SHRINE/shrine from bugfix/SHRINE-3652-Connectivity-test-not-displaying to develop * commi...
marc-daniemarc-danie
3b3200d2a4bSHRINE2020-69 - Update api calls for browsing the hierarchy to use the Lucene index - Fixed issue with running
marc-daniemarc-danie
1f73f61632dSHRINE2020-54 - Create Lucene index for the Ontology - Added comment about the input file format
marc-daniemarc-danie
c108e473824SHRINE2020-69 - Update api calls for browsing the hierarchy to use the Lucene index - Increased default value for the...
marc-daniemarc-danie
23f3c911175SHRINE2020-54 - Create Lucene index for the Ontology - Added default value for the location of the lucene index per B...
marc-daniemarc-danie
3df66d6dc39SHRINE2020-54 - Create Lucene index for the Ontology - Updated the README
marc-daniemarc-danie
2a8eb3a0e3bSHRINE2020-54 - Create Lucene index for the Ontology - update to test
marc-daniemarc-danie
2ff6307e258SHRINE2020-54 - Create Lucene index for the Ontology - Added unit test and readme
mjdiloretomjdiloreto
29123357ff0Remove unsafeRunSync from NetworkHealthScheduler.
mjdiloretomjdiloreto
6ce7893a70aFixed network connectivity test not checking after time limit reached.
marc-daniemarc-danie
6da9e00ddc8SHRINE2020-54 - Create Lucene index for the Ontology - Added note about c_* and m_* prefix in the field names
marc-daniemarc-danie
759df1b9576SHRINE2020-69 - Update api calls for browsing the hierarchy to use the Lucene index - Removed with BeforeAndAfter
marc-daniemarc-danie
cbe1bcdad99SHRINE2020-69 - Update api calls for browsing the hierarchy to use the Lucene index - Updated to used @Test annotation