SHRINE
  1. SHRINE

shrine

Public
  1. SHRINE
  2. shrine

All Branches Graph  

        
AuthorCommitMessageCommit dateBuilds
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
Ben CarmenBen Carmen
3dbc4fb3a32Merge pull request #699 in SHRINE/shrine from feature/SHRINE2020-64-new-design to 2.0-webclient * commit '2a1b8edb31...
mjdiloretomjdiloreto
d6704a672c6Changes suggested by review, except those shirked until SHRINE-3608.
dwalenddwalend
3f6cd1756faMatt spotted some wildcard imports in SHRINE-3644
Ben CBen C
f101189faa2saving work
dwalenddwalend
56661ec938bBetter comment for SHRINE-3644
Ben CBen C
17c13f5b65dsaving work
dwalenddwalend
b3e61be0204Removed json4s from dashboard and steward for SHRINE-3644
Ben CBen C
2a1b8edb316moved text-shadow to mixin
Ben CBen C
523afed4f68Made changes recommended by UAT
mjdiloretomjdiloreto
06c22370d53Added call-by-name parameter to adapter mappings to not instantiate db unless really needed. Simplify adapter mapping...
mjdiloretomjdiloreto
2fd95b8ea38refactored expressions to use transactional lookup of local terms.
mjdiloretomjdiloreto
131dae3c8fdAllow adapter mappings to look up many mappings at once.
Ben CBen C
bc164d024fcmerge of 2.0-webclient
Ben CBen C
ef498d511c7Update of app styles to new base look
dwalenddwalend
f5c20262c0cMerge branch 'develop' into feature/SHRINE-3644-remove-json4s-dependency-from
Ben CBen C
6d467d59036saving work
Ben CBen C
7ee40e8c586saving work
Matthew DiLoretoMatthew DiLoreto
51e099eb7cdMerge pull request #697 in SHRINE/shrine from bugfix/SHRINE-3623-upgrade-opencsv to develop * commit '75da1b4eb9bdd3...
David WalendDavid Walend
056811f83b3Merge pull request #696 in SHRINE/shrine from feature/SHRINE-3643-replace-shrine-util-s-use-of to develop * commit '...
Ben CBen C
812de4d4172saving work
mjdiloretomjdiloreto
1637da0bef9Merge branch 'develop' into bugfix/SHRINE-3634-refactor-networkhealthscheduler
mjdiloretomjdiloreto
b0909f53514Remove bug where network health scheduler wouldn't check query status after time limit.
dwalenddwalend
0a861e3d6b3Got rid of json4s dependency in steward, but foudn a new one in dashboard for SHRINE-3644
Ben CBen C
f759624f4c8saving work
marc-daniemarc-danie
25c7cff750cSHRINE2020-27 - Create the ability for a user to click a "Run" button to execute the query - modified so that the Get...
mjdiloretomjdiloreto
75da1b4eb9bUpgrade opencsv.
mjdiloretomjdiloreto
68c2fe7c4daRename method suggested in review.
Ben CBen C
a6ae8aaae30merge
Ben CBen C
f65655334ccmerge of latest develop
Ben CBen C
d92c16249ccsaving work
Ben CBen C
81593d0db19saving work
Ben CBen C
634467a4230saving work
mjdiloretomjdiloreto
ce6a7137d1dRevert "Upgrade opencsv." This reverts commit 88590bb723c8e625e3d3df25e63533628398d84b.
mjdiloretomjdiloreto
88590bb723cUpgrade opencsv.
Ben CBen C
60c784643a2saving work
marc-daniemarc-danie
81fd6f11b70Merge branches '2.0-webclient' and 'feature/SHRINE2020-54-create-lucene-index-for-the' of https://open.med.harvard.ed...
marc-daniemarc-danie
b7c0ada9ddbneed to manually remove empty broadcaster-service module
marc-daniemarc-danie
e2667bc35b7Merge remote-tracking branch 'origin/2.0-webclient' into 2.0-webclient
marc-daniemarc-danie
60ac2d9f112Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine into 2.0-webclient # Conflicts: # app...
Ben CarmenBen Carmen
65f5e1592f8Merge pull request #694 in SHRINE/shrine from feature/SHRINE2020-43-ontology-layout to 2.0-webclient * commit 'eba53...
Ben CBen C
8e7980a0b9bsaving work
dwalenddwalend
af275405056Removed dependencies on json4s for SHRINE-3642 and SHRINE-3641
dwalenddwalend
fadfb4b2ed4Removed json4s dependency from util for SHRINE-3643
Ben CBen C
4812f816d68saving work
marc-daniemarc-danie
c18809e3e10removed unused ShouldMatchersForJUnit
David WalendDavid Walend
cbc7e9dfa9fMerge pull request #691 in SHRINE/shrine from bugfix/SHRINE-3624-jawn-is-only-used-by-integration to develop * commi...
dwalenddwalend
ca6df775f52Merge branch 'develop' into bugfix/SHRINE-3624-jawn-is-only-used-by-integration
mjdiloretomjdiloreto
c6ded89b743Merge branch 'develop' into bugfix/SHRINE-3419-refactor-selectTheNetworkIO
Matthew DiLoretoMatthew DiLoreto
f4b03fc9db7Merge pull request #627 in SHRINE/shrine from bugfix/SHRINE-3533-one-version-in-the-top-level to develop * commit '5...
mjdiloretomjdiloreto
57d7d3b85d8remove deleted directories remaining after merge.
mjdiloretomjdiloreto
8768596885aMerge branch develop into bugfix/SHRINE-3533-one-version-in-the-top-level
David WalendDavid Walend
db5850b3727Merge pull request #693 in SHRINE/shrine from bugfix/SHRINE-1518-upgrade-jjwt-library-and-drop to develop * commit '...
mjdiloretomjdiloreto
79009df235eMerge branch 'develop' into bugfix/SHRINE-3419-refactor-selectTheNetworkIO
mjdiloretomjdiloreto
83dfd344b15Merge branch develop into bugfix/SHRINE-3634-refactor-networkhealthscheduler
David WalendDavid Walend
b71d43a2670Merge pull request #689 in SHRINE/shrine from bugfix/SHRINE-3543-remove-old-qep-hub-adapter-and to develop * commit ...
Ben CBen C
eba53da17a4merge of 2.0-webclient
Ben CBen C
d11e4698188added test for Search Component
Ben CBen C
f54831045e6Potential solution to Medical Concepts Layout.
mjdiloretomjdiloreto
d4e41bff150removed unnecessary formatting.
dwalenddwalend
665de35e610Back to the 2.1.0-M1-SNAPSHOT pom.xml
dwalenddwalend
8d86e6b2aebMerge 2.0.0
dwalenddwalend
af79aa700c7Preparing to merge 2.0.0 into develop
dwalenddwalend
80b2a173c22Removing jjwt for SHRINE-1518
dwalenddwalend
9216b824aedMoving the pom.xml version to the safe 2.0.1-PR1-SNAPSHOT
Ansible DeployAnsible Deploy
c6a9c2b678bMerge release branch release/1.26.7 into master.
Ansible DeployAnsible Deploy
6b1e9273165Update POMs with release version 2.0.0.
dwalenddwalend
c703abc0134Trying to sweet-talk Bamboo into making the 2.0.0 release
Ben CarmenBen Carmen
4615e9b515bMerge pull request #686 in SHRINE/shrine from SHRINE2020-28-validate-lab-values to 2.0-webclient * commit '5ea773cf5...
Ben CBen C
5ea773cf516Changes based on code review.
marc-daniemarc-danie
2cc0b4aa0b5Add the new ontology data to the expected JSON response
Marc-Danie NazaireMarc-Danie Nazaire
161834b8c2aMerge pull request #690 in SHRINE/shrine from feature/SHRINE2020-27-create-the-ability-for-a-user to 2.0-webclient *...
marc-daniemarc-danie
76458ba0f58SHRINE2020-27 - Create the ability for a user to click a "Run" button to execute the query - changed the reduce funct...
marc-daniemarc-danie
05d71f6bdffMerge branch '2.0-webclient' of https://open.med.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-27-creat...
mjdiloretomjdiloreto
b57b0a0403fProvide name param in NetworkHealthScheduler to work with IOScheduler.
mjdiloretomjdiloreto
cee0a8d38e4Changed NetworkHealthScheduler api to match other scheduler apis and fixed callers.
mjdiloretomjdiloreto
ec82a1ed6c8Slightly simplified data validation and email sending in NetworkHealthScheduler.
mjdiloretomjdiloreto
abb1e65cb6bupdated networkHealthScheduler to use IOScheduler under the hood.
Matthew DiLoretoMatthew DiLoreto
137dc2e9287Merge pull request #688 in SHRINE/shrine from bugfix/SHRINE-3536-create-standard-abstraction-for-the to develop * co...
Ben CBen C
0cc94bf64c5Merge branch '2.0-webclient' into SHRINE2020-28-validate-lab-values
mjdiloretomjdiloreto
80bbaaba1ebForce client of IOScheduler to provide a name.
dwalenddwalend
7094f8e8ab2Remove jawn library for SHRINE-3624
marc-daniemarc-danie
145137e2b7cAdded more data to the mock ontology to help test out auto suggest
dwalenddwalend
ab273739528Merging develop and Marc-Danie found a stray println
dwalenddwalend
7f8eb39a563End of merge from release/1.26.7
marc-daniemarc-danie
3a3fc314962SHRINE2020-27 - Create the ability for a user to click a "Run" button to execute the query - small css change
marc-daniemarc-danie
e1b45520871SHRINE2020-27 - Create the ability for a user to click a "Run" button to execute the query
dwalenddwalend
07dcb3602d1Merging release/1.26.7
dwalenddwalend
6f9ccc4be11Making way for merging release/1.26.7
mjdiloretomjdiloreto
3afc0afa3f3refactored selectTheNetworkIO to throw an exception when no Network is found.
dwalenddwalend
48f171cba78Merge branch 'develop' into bugfix/SHRINE-3543-remove-old-qep-hub-adapter-and
dwalenddwalend
ce717d9eee1Stray SHRINE-3379 comment
dwalenddwalend
c2bd7dbefcbFound and cleaned out some stray pom.xml dependencies for SHRINE-3543
dwalenddwalend
40cf92b9e7cFound some problems we no longer have for SHRINE-3543
dwalenddwalend
d98ce4cff82Chasers for SHRINE-3543
dwalenddwalend
34b843db676Updating comments for SHRINE-3543 before wrapping it up
dwalenddwalend
d92c14360f3Deleted the hub broadcaster sub project for SHRINE-3543
dwalenddwalend
8cfc7ed70e4Deleted most of the hub/broadcaster-aggregator/src/test/scala/net/shrine/broadcaster package for SHRINE-3543
dwalenddwalend
09fd600a2b5Deleted delete commands and that touched all kinds of things for SHRINE-3543
dwalenddwalend
0c5cd4dcb9cDeleted adapter/adapter-api for SHRINE-3543
dwalenddwalend
fb40f1415abPunting some actual consolidation work to a future ticket
Next →