SHRINE
  1. SHRINE

shrine

Public
  1. SHRINE
  2. shrine

All Branches Graph  

        
AuthorCommitMessageCommit dateBuilds
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
mjdiloretomjdiloreto
4ec63724364Fix usage of AdapterMappingException.
marc-daniemarc-danie
d1aa1c6ae87SHRINE2020-54 - Create Lucene index for the Ontology - Modified so that all paths end with
mjdiloretomjdiloreto
8af9b606c30Added clause field to AdapterMappingException.
dwalenddwalend
eefceaf4053Quickly get a response back to the researcher while taking 3 chances to talk to the hub for SHRINE-3603
mjdiloretomjdiloreto
b9e55712809Allow certain startup events to run after contextInitialized finishes.
dwalenddwalend
a1bfde36bc7Tightening up API for SHRINE-3603
Ben CBen C
122128819a3Merge branch '2.0-webclient' into spec/SHRINE2020-71-material-ui
mjdiloretomjdiloreto
340dc56e55bTest-commons packaging fix failed.
mjdiloretomjdiloreto
3818e8dd295SHRINE-3553: Fixed simple warnings in SHRINE build.
Ben CBen C
de08fe46431saving work
dwalenddwalend
6c21802531cNow store an error in the QEP's database for being unable to submit a query for SHRINE-3603
marc-daniemarc-danie
7676ae653b3SHRINE2020-54 - Create Lucene index for the Ontology - Removed code for creating Lucene index from a JSON file dump o...
marc-daniemarc-danie
ea43a715c86SHRINE2020-54 - Create Lucene index for the Ontology - Removed code for adding I2B2 ontology to the SHRINE database
marc-daniemarc-danie
7fdcf2647f3Merge branches '2.0-webclient' and 'feature/SHRINE2020-54-create-lucene-index-for-the' of https://open.med.harvard.ed...
marc-daniemarc-danie
17b6e421df7SHRINE2020-54 - Create Lucene index for the Ontology - Added POM file
marc-daniemarc-danie
fbfb2e7fe0aSHRINE2020-69 - Update api calls for browsing the hierarchy to use the Lucene index - Created new Thread for the Luce...
marc-daniemarc-danie
2db78bba828SHRINE2020-69 - Update api calls for browsing the hierarchy to use the Lucene index - added comment about the hlevel ...
dwalenddwalend
eaf06b9a2bbMore todos for SHRINE-3603
Ben CBen C
9a5e3edd35bsaving work
marc-daniemarc-danie
b12704043e0SHRINE2020-69 - Update api calls for browsing the hierarchy to use the Lucene index - code refactoring
marc-daniemarc-danie
060a660a2c8SHRINE2020-69 - Update api calls for browsing the hierarchy to use the Lucene index - replaced check for lab detail t...
dwalenddwalend
4a0b45b9a7dMerge remote-tracking branch 'origin/develop' into feature/SHRINE-3603-fail-fast-attempts-of-the-qep
marc-daniemarc-danie
a084bf55d7cSHRINE2020-69 - Update api calls for browsing the hierarchy to use the Lucene index - added lucene-version property
Ben CarmenBen Carmen
ca72ff9d6e7Merge pull request #707 in SHRINE/shrine from feature/SHINE2020-48-navigate-ontology-tree to 2.0-webclient * commit ...
mjdiloretomjdiloreto
3a91afdf52aremove cats wildcard imports
Ben CBen C
a7cec6482f1saving work
Matthew DiLoretoMatthew DiLoreto
8a5fc3f953dMerge pull request #695 in SHRINE/shrine from bugfix/SHRINE-3419-refactor-selectTheNetworkIO to develop * commit 'f7...
Matthew DiLoretoMatthew DiLoreto
31a5107a655Merge pull request #700 in SHRINE/shrine from bugfix/SHRINE-3607-update-ExpressionTranslator-to-translate-all to deve...
Ben CBen C
3e5be9ca0cdremoved extra check in if statement and unnesseary default value.
Ben CBen C
0100db2308dsaving work
mjdiloretomjdiloreto
7b73ebcb754Saving work.
mjdiloretomjdiloreto
f7976736753Merge branch develop into 'bugfix/SHRINE-3419-refactor-selectTheNetworkIO'
marc-daniemarc-danie
8d8fb09bda3SHRINE2020-69 - Update api calls for browsing the hierarchy to use the Lucene index - code cleanup
marc-daniemarc-danie
cbf63b4f9eaSHRINE2020-69 - Update api calls for browsing the hierarchy to use the Lucene index - removing code to generate the l...
mjdiloretomjdiloreto
71f5e6d62b6Moved more methods to IO, contextDestroyed conforms to IOScheduler.
marc-daniemarc-danie
018089b2f74SHRINE2020-69 - Update api calls for browsing the hierarchy to use the Lucene index - updated unit tests
Ben CBen C
85f043fb42eclean install of Material UI
mjdiloretomjdiloreto
1c1523052dbUse IO to syncronize shrine startup tasks properly
marc-daniemarc-danie
b3029272424Merge branch '2.0-webclient' of https://open.med.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-69-updat...
marc-daniemarc-danie
4266eca9196SHRINE2020-69 - Update api calls for browsing the hierarchy to use the Lucene index
Ben CBen C
ee963c9f347added unit tests.
Ben CBen C
0fdac4eafcbadded unit test for tree
Ben CBen C
87763680e16saving work
marc-daniemarc-danie
604cca86295SHRINE2020-54 - Create Lucene index for the Ontology - fixed hlevel1
Ben CBen C
9e898138caasaving work
dwalenddwalend
dd84e015c00Merge branch 'develop' into feature/SHRINE-3603-fail-fast-attempts-of-the-qep
Ben CBen C
8eaa8514cd3Merge branch '2.0-webclient' into feature/SHINE2020-48-navigate-ontology-tree
dwalenddwalend
88a9a081634Moving Shrine's version to 2.1.0-M3 to open sprint 3
Ben CBen C
9f0de43a732style tweak
Ben CBen C
813a6a5add5style changes via UAT
Ben CBen C
5c542ea6482updated margin
mjdiloretomjdiloreto
ef4d9de54e2Add exception to represent adapter mapping failure due to unmappable terms.
mjdiloretomjdiloreto
296aaea2823Moved reload mappings logic from AdapterMappings to AdapterMappingsDb.
mjdiloretomjdiloreto
3f056498063Refactored AdapterMappingsDb to return IO instead of Unit, moved adapter mapping mocking to ExpressionTranslator.
dwalenddwalend
6b3014a4462todos for SHRINE-3603
Matthew DiLoretoMatthew DiLoreto
45cbf2d5228Merge pull request #702 in SHRINE/shrine from bugfix/SHRINE-2030-A-misconfigured-mappings-file to develop * commit '...
mjdiloretomjdiloreto
606197a1b10Change to comment suggested in review.
Ben CBen C
281fd4e5900saving layout changes.
Ben CarmenBen Carmen
c24c56e5154Merge pull request #705 in SHRINE/shrine from feature/SHRINE2020-43-UAT2-ontology-layout to 2.0-webclient * commit '...
marc-daniemarc-danie
82e002804ebSHRINE2020-54 - Create Lucene index for the Ontology - minor log edit
marc-daniemarc-danie
c66dd383131SHRINE2020-54 - Create Lucene index for the Ontology - code for indexing from a delimited file
marc-daniemarc-danie
9abbb3b252fMerge branch '2.0-webclient' of https://open.med.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-54-creat...
marc-daniemarc-danie
07ef7a66557Merge remote-tracking branch 'origin/develop' into develop
marc-daniemarc-danie
3776882beeaFixed failing build by adding missing imports
Matthew DiLoretoMatthew DiLoreto
c0224fb64e3Merge pull request #692 in SHRINE/shrine from bugfix/SHRINE-3634-refactor-networkhealthscheduler to develop * commit...
Ben CBen C
2a818f551f2moved inline styles to css class.
Ben CBen C
476f7dba3cbsaving work
mjdiloretomjdiloreto
f59aeb5cb2bSimplified Expression code, added unit test for unmappable terms appearing in the thrown MappingException.
Ben CBen C
ff545cc45c7Merge branch '2.0-webclient' into feature/SHRINE2020-43-UAT2-ontology-layout
mjdiloretomjdiloreto
e1c59b52d69Changed signature of Term, translate now gives human-readable names of unmapped terms.
Ben CBen C
fbc23517c5cfix of failed unit test and tweak of style.
mjdiloretomjdiloreto
8489b6b2d9fRemove requirement that OR expressions be run even if one or more terms are unmappable.
Ben CBen C
c5acfef4de4removed unncessary browser animation styles
Ben CBen C
0bc97beadc1style fix.
Ben CBen C
2fb4c9c86b6added style back in.
Ben CBen C
afec6b4db84style cleanup
Ben CBen C
2d775fd8aecadded transition style
Ben CBen C
1b35da21bd2tweak of styles
marc-daniemarc-danie
f1bcb8d87acSHRINE2020-54 - Create Lucene index for the Ontology - code for creating the index from a JSON file
Ben CBen C
02e2680a65dput run query back to the width it was at.
marc-daniemarc-danie
de424d31baaSHRINE2020-54 - Create Lucene index for the Ontology - Db creation and access
Ben CBen C
bf33b1fd47epotential solution for feeback from UAT2
mjdiloretomjdiloreto
8eed02ccb5cAdapter Mapping Problem now reports all unmappable terms.
Marc-Danie NazaireMarc-Danie Nazaire
1d7a38ac204Merge pull request #704 in SHRINE/shrine from feature/SHRINE2020-27-create-the-ability-for-a-user to 2.0-webclient *...
marc-daniemarc-danie
f7f9a85c8c8SHRINE2020-27 - Create the ability for a user to click a "Run" button to execute the query - removed absolute position
Marc-Danie NazaireMarc-Danie Nazaire
37da4a7ee85Merge pull request #703 in SHRINE/shrine from feature/SHRINE2020-27-create-the-ability-for-a-user to 2.0-webclient *...
marc-daniemarc-danie
acc6286b944SHRINE2020-27 - Create the ability for a user to click a "Run" button to execute the query - removed top css style
Marc-Danie NazaireMarc-Danie Nazaire
eb36c958427Merge pull request #698 in SHRINE/shrine from feature/SHRINE2020-27-create-the-ability-for-a-user to 2.0-webclient *...
marc-daniemarc-danie
88b8d509201SHRINE2020-27 - Create the ability for a user to click a "Run" button to execute the query - removed top css style
mjdiloretomjdiloreto
3ecac51d564Log any fatal exceptions from Bootstrap in shrine-api.log before crashing Tomcat.
marc-daniemarc-danie
02d0efa8161Merge branches '2.0-webclient' and 'feature/SHRINE2020-27-create-the-ability-for-a-user' of https://open.med.harvard....
David WalendDavid Walend
a6ab20fe1d0Merge pull request #701 in SHRINE/shrine from feature/SHRINE-3644-remove-json4s-dependency-from to develop * commit ...
Ben CBen C
f9f8db97969saving work