SHRINE
  1. SHRINE

shrine

Public
  1. SHRINE
  2. shrine

All Branches Graph  

        
AuthorCommitMessageCommit dateBuilds
Xavier HaurieXavier Haurie
853ee5e398aSHRINE2020-155 : merged 2.0-webclient branch; added more detailed command line error message
Xavier HaurieXavier Haurie
45f9f59595cSHRINE2020-155 : merged 2.0-webclient branch
Marc-Danie NazaireMarc-Danie Nazaire
4c52c4fd7d3Merge pull request #850 in SHRINE/shrine from feature/SHRINE2020-129-allow-a-user-to-select-any to 2.0-webclient * c...
marc-daniemarc-danie
351c0006f28Merge branch '2.0-webclient' of https://open.med.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-129-allo...
Xavier HaurieXavier Haurie
db161e99320SHRINE2020-155 : refactor some more: better variable and method names; smaller, single-purpose methods for the steps ...
Marc-Danie NazaireMarc-Danie Nazaire
b9584762547Merge pull request #853 in SHRINE/shrine from feature/SHRINE2020-156-display-the-search-results to 2.0-webclient * c...
bcarmenbcarmen
e76797d61f2Merge branch '2.0-webclient' of https://open.med.harvard.edu/stash/scm/shrine/shrine into 2.0-webclient
bcarmenbcarmen
c55af0019dcupdated for comma in occurrences number.
bcarmenbcarmen
a856a37e996saving work
Liam MoynihanLiam Moynihan
237f4b4c25eMerge pull request #849 in SHRINE/shrine from feature/SHRINE2020-166-create-the-filter-dropdown to 2.0-webclient * c...
Xavier HaurieXavier Haurie
b44391ef1c0SHRINE2020-155 : refactor the logic related to the suggestion index into its own class and companion object
marc-daniemarc-danie
50387ac837bSHRINE2020-156 - Display the search results for two or more word search concept in the same order as the browse - rem...
marc-daniemarc-danie
62fa256a202SHRINE2020-156 - Display the search results for two or more word search concept in the same order as the browse - fix...
bcarmenbcarmen
43c5d36520aMerge branch '2.0-webclient' into feature/SHRINE2020-183-load-more
marc-daniemarc-danie
69f287f127fMerge with 2.0-webclient
bcarmenbcarmen
8aeb754d40eadded suggestions from BA review
bcarmenbcarmen
0f3a72de777saving work
Xavier HaurieXavier Haurie
9ed683fcd86SHRINE2020-155 : refactor the logic related to the suggestion index into its own class and companion object
marc-daniemarc-danie
f77fe78bd6cSHRINE2020-156 - Display the search results for two or more word search concept in the same order as the browse
Xavier HaurieXavier Haurie
a09295939cbMerge branch '2.0-webclient' into feature/SHRINE2020-155-two-word-auto-suggest
Xavier HaurieXavier Haurie
325aa5b0693SHRINE2020-155 : implement code review feedback
Liam MoynihanLiam Moynihan
b01c7ded2c6Merge pull request #851 in SHRINE/shrine from bugfix/SHRINE2020-49-highlight-matching-concepts to 2.0-webclient * co...
Liam MoynihanLiam Moynihan
d1f17853bc4Made none the default code set for codeandconcept category case class
bcarmenbcarmen
c9b9bf1492asaving work
marc-daniemarc-danie
a8350179f50fixed bug with loading lab details with enum values
Xavier HaurieXavier Haurie
d5dc4528947Merge branch '2.0-webclient' into feature/SHRINE2020-155-two-word-auto-suggest
marc-daniemarc-danie
61b38e9796eMerge branch '2.0-webclient' of https://open.med.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-129-allo...
marc-daniemarc-danie
06e1bcc51dfSHRINE2020-129 - Allow a user to select any ontology term to build a query and return results. (Map the terms) - upda...
marc-daniemarc-danie
6713c3616cdMerge remote-tracking branch 'origin/2.0-webclient' into 2.0-webclient
marc-daniemarc-danie
36760969894modified to search the path field instead of nPath for the lab details
Xavier HaurieXavier Haurie
8052f0cc2afSHRINE2020-155 : clean-up indexer code
bcarmenbcarmen
447e4da428cadded labDetail service to proxy
bcarmenbcarmen
18183ee0674fix of get lab values
Liam MoynihanLiam Moynihan
6be78802a28Moved highlighted search result name into its own property
bcarmenbcarmen
cfeec0cf509saving work
Xavier HaurieXavier Haurie
f7ba6aa746cSHRINE2020-155 : fix regression due to incorrect change of search index used by the ontology service tests
marc-daniemarc-danie
6781884cd8aSHRINE2020-129 - Allow a user to select any ontology term to build a query and return results. (Map the terms) - adde...
marc-daniemarc-danie
42b2ebf4355SHRINE2020-129 - Allow a user to select any ontology term to build a query and return results. (Map the terms) - mino...
Xavier HaurieXavier Haurie
c52fc346f52SHRINE2020-155 : updated indexer unit test and test data
marc-daniemarc-danie
759c012909bSHRINE2020-129 - Allow a user to select any ontology term to build a query and return results. (Map the terms) - Adde...
Xavier HaurieXavier Haurie
12c2c11e8a3SHRINE2020-155 : updated suggester unit tests and test data
Liam MoynihanLiam Moynihan
2e82d3439f1Added new search body requirements to the web server proxy
Liam MoynihanLiam Moynihan
f760e4b74f4Merge branch 'feature/SHRINE2020-47-allow-a-user-to-specify-search' of ssh://open.catalyst.harvard.edu:7999/shrine/sh...
Liam MoynihanLiam Moynihan
3c1e416266fBeginning of implementing filtered search functionality
Liam MoynihanLiam Moynihan
d15c9df56c4Small naming clarifications in filter option route
Xavier HaurieXavier Haurie
a80e60f786bSHRINE2020-155 : store and make available the number of occurrences of a suggestion as payload of the lookup result
Xavier HaurieXavier Haurie
ff68000b396SHRINE2020-155 : generate "composite" weight for auto-suggest entries, based on (1) the number of occurrences and (2)...
marc-daniemarc-danie
08e5f175f00SHRINE2020-129 - Allow a user to select any ontology term to build a query and return results. (Map the terms) - Adde...
Liam MoynihanLiam Moynihan
09beb0dfb2eBeginning of implementing filtered search functionality
Liam MoynihanLiam Moynihan
8cb05192672Moved filter options into part of the ontology redux store and changed the return type of get options api call
bcarmenbcarmen
9ba06e41161saving work
Liam MoynihanLiam Moynihan
4d5eab602e5Removed unused code block and made var names clearer
Liam MoynihanLiam Moynihan
ae3ab32e92bAdded ontology route for filterable dropdown and added code sets to lucene indexing
Xavier HaurieXavier Haurie
d986568618aMerge branch '2.0-webclient' into feature/SHRINE2020-155-two-word-auto-suggest
Xavier HaurieXavier Haurie
3ccc85930b4SHRINE2020-155 : Generate the map of tied number of occurrences, i.e. number of occurrences => count of suggestions w...
marc-daniemarc-danie
c6aafc51e34Merge branch '2.0-webclient' of https://open.med.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-133-Merg...
Marc-Danie NazaireMarc-Danie Nazaire
61a4b177e6eMerge pull request #842 in SHRINE/shrine from feature/SHRINE2020-184-server-side-work-for-loading to 2.0-webclient *...
marc-daniemarc-danie
e3f82a861d1SHRINE2020-184 - Server side work for loading more medical concepts - made the max search results to return configura...
dwalenddwalend
8a08f48f52dProgress on extracting metrics for SHRINE-3704
marc-daniemarc-danie
e440f26f8eeMerge branch '2.0-webclient' of https://open.med.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-184-serv...
bcarmenbcarmen
50ad71481f2quick fix
bcarmenbcarmen
65f906053aeuse -p flag in compile
bcarmenbcarmen
a7090db8a42removed carets from package.json
bcarmenbcarmen
d4dd4fd2039chaned actions
marc-daniemarc-danie
f0c7db61395Merge branch '2.0-webclient' of https://open.med.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-184-serv...
marc-daniemarc-danie
e8a26312e18Merge branch '2.0-webclient' of https://open.med.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-184-serv...
bcarmenbcarmen
9172f4b5c59update of reducer and it's unit test.
bcarmenbcarmen
0447b9d2750updated unit tests to accomodate new model structure.
Marc-Danie NazaireMarc-Danie Nazaire
63d7d4ef051Merge pull request #840 in SHRINE/shrine from feature/SHRINE2020-129-allow-a-user-to-select-any to 2.0-webclient * c...
bcarmenbcarmen
861f147861asaving latest work
David WalendDavid Walend
768fbec9822Merge pull request #844 in SHRINE/shrine from feature/SHRINE-3461-get-rid-of-broadcasterserviceendpoint to develop *...
marc-daniemarc-danie
41c4cde2c51Changes from merge of 2.0-webclient branch
marc-daniemarc-danie
d73a631ae55Merge of 2.0-webclient branch
dwalenddwalend
d531ab22dbfMerge remote-tracking branch 'origin/develop' into feature/SHRINE-3704-write-command-line-tool-to-extract
dwalenddwalend
fd0833e21b7Get the full history of a query and result database work for SHRINE-3704
David WalendDavid Walend
99c4b401345Merge pull request #843 in SHRINE/shrine from feature/SHRINE-3540-serve-act-aim-3-plugin-api-from to develop * commi...
marc-daniemarc-danie
0ff5023b8a5Merge branch 'release/2.1.0-M4' of https://open.med.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-133-M...
marc-daniemarc-danie
bbd50ff117aMerge branch 'release/2.1.0-M4' of https://open.med.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-133-M...
dwalenddwalend
1517dec3fc4started prototyping a command-line tool to extract audit data for SHRINE-3704
Xavier HaurieXavier Haurie
cdb00dfe2f4SHRINE2020-155 : Fix a bug in how the command line arguments are handled; minor improvement to logging
dwalenddwalend
1ee048f6acdmerging and review comments for SHRINE-3540 and friends
David WalendDavid Walend
46a52c49cf8Merge pull request #847 in SHRINE/shrine from feature/SHRINE-3291-remove-use-of-squeryladapter to develop * commit '...
Xavier HaurieXavier Haurie
e721fb54b6fSHRINE2020-155 : added option to generate a CSV dump of the suggestions that were fed to the suggester, in alphabetic...
marc-daniemarc-danie
3ee3fe233e7Merge branch '2.0-webclient' of https://open.med.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-129-allo...
marc-daniemarc-danie
5946aca89fbMerge branch '2.0-webclient' of https://open.med.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-129-allo...
David WalendDavid Walend
653ae522a75Merge pull request #845 in SHRINE/shrine from feature/SHRINE-3625-use-a-released-version-of-circe to develop * commi...
David WalendDavid Walend
1f9fe0ac91bMerge pull request #846 in SHRINE/shrine from feature/SHRINE-3596-move-hub-service-to-services-hub to develop * comm...
bcarmenbcarmen
1f362fae27fMerge branch '2.0-webclient' into feature/SHRINE2020-183-load-more
bcarmenbcarmen
84058574b55saving work
Liam MoynihanLiam Moynihan
aa613cf496cMerge pull request #841 in SHRINE/shrine from feature/SHRINE2020-49-highlight-matching-concepts to 2.0-webclient * c...
dwalenddwalend
7ee7ff34cdcConsolidated the ResultOutputType and s for SHRINE-3698
dwalenddwalend
1191b7994cfMade a single source for breakdowns in ResultOutputTypes.scala for SHRINE-3698
Xavier HaurieXavier Haurie
f0292172c1bSHRINE2020-155 : Improve indexer to use a command line argument to set the maximum number of words in each auto-sugge...
dwalenddwalend
424a05715e7Got rid of ShrineConfiguration for SHRINE-3291
Ben CarmenBen Carmen
553483c4639Merge pull request #839 in SHRINE/shrine from feature/SHRINE2020-181-lab-service to 2.0-webclient * commit '799e175d...
dwalenddwalend
869d3d57610Bigger cleanup of ShrineConfiguration than I'd hoped for for SHRINE-3291
Ben CarmenBen Carmen
2531a49a0deMerge pull request #838 in SHRINE/shrine from feature/SHRINE2020-45-display-occurrences to 2.0-webclient * commit '5...
dwalenddwalend
7fc48d99e21Moved the hub service from hub/hub-service to services/hub for SHRINE-3596
dwalenddwalend
23124c528fdUpgraded circe to 0.12.2 for SHRINE-3625
dwalenddwalend
205075e4871Some cleanup for SHRIEN-3461
Liam MoynihanLiam Moynihan
21ef9c818f9Moved highlighting css from tree to branch file
dwalenddwalend
bfc1d53451dRemoved broadcasterServiceEndpoint for SHRINE-3461
dwalenddwalend
4160866b03dNow that the test code is sane it's OK to change to the right execution context for the aim3 webservice in SHRINE-3540
bcarmenbcarmen
5ed8ec5837dupdated text from occurrences to concepts
bcarmenbcarmen
b821774ae58removed occurrences per code review
bcarmenbcarmen
56014032092Merge branch '2.0-webclient' into feature/SHRINE2020-45-display-occurrences
bcarmenbcarmen
1986cefc5basaving work
dwalenddwalend
5812fab8286Cleanup before finishing SHRINE-3540
Liam MoynihanLiam Moynihan
4e20e852f59Changed highlight styling to background and added backend unit test
dwalenddwalend
710d23125eeGet the users test case for SHRINE-3542
dwalenddwalend
13f258a2b09Merge branch 'develop' into feature/SHRINE-3540-serve-act-aim-3-plugin-api-from
dwalenddwalend
0e00f70f254This code never searched for queries that had no flag. There is no aim 3 case 3 different from searching for the most...
marc-daniemarc-danie
4c9c6757ff7Merge branch '2.0-webclient' of https://open.med.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-129-allo...
marc-daniemarc-danie
e8b48474fd3SHRINE2020-184 - Server side work for loading more medical concepts - code cleanup
marc-daniemarc-danie
b1e91be7e00SHRINE2020-184 - Server side work for loading more medical concepts - cleaned up unused imports
marc-daniemarc-danie
543c9028915SHRINE2020-184 - Server side work for loading more medical concepts - fixed display of the search results and cleanup...
dwalenddwalend
9ed4c4d262aAIM3 tests for SHRINE-3542 except for one case
dwalenddwalend
211bdaa8200Last of the tests I ported last week for SHRINE-3542
dwalenddwalend
dd1ccb2501cFinally got more than one test working for SHRINE-3542
marc-daniemarc-danie
d6dd876b38dMerge from 2.0-webclient branch
Liam MoynihanLiam Moynihan
ce144142f3eMerge branch '2.0-webclient' into feature/SHRINE2020-49-highlight-matching-concepts
marc-daniemarc-danie
9d0f7f16fbbSHRINE2020-184 - Server side work for loading more medical concepts
Liam MoynihanLiam Moynihan
f9544a30a12Added search result bold highlighting of matched terms
Marc-Danie NazaireMarc-Danie Nazaire
a16963c0a38Merge pull request #837 in SHRINE/shrine from feature/SHRINE2020-178-add-api-call-to-get-the-lab to 2.0-webclient * ...
Xavier HaurieXavier Haurie
4b36373212eSHRINE2020-155 : store a larger, 2-word suggestion index to be used by the LuceneSuggesterTest
marc-daniemarc-danie
afb4b456b27SHRINE2020-129 - Allow a user to select any ontology term to build a query and return results. (Map the terms)
Xavier HaurieXavier Haurie
9d3905b404bSHRINE2020-155 : store the suggest index to be used by the LuceneSuggesterTest
Xavier HaurieXavier Haurie
e958001cc7fSHRINE2020-155 : create combined 1- and 2-word suggestion index
Xavier HaurieXavier Haurie
4b087edd8d1SHRINE2020-46 : do not return suggestions if the input contains fewer than 3 non-blank characters
bcarmenbcarmen
799e175d95aPotential solution for fetching lab value details when dragged into query
Xavier HaurieXavier Haurie
0a4fcce0a18SHRINE2020-46 : do not filter stop-words out of suggestion query phrase. Returned suggestions are limited to a single...
bcarmenbcarmen
be45974dcf5added freeSolo setting
Liam MoynihanLiam Moynihan
eff8669e1d2Merge pull request #836 in SHRINE/shrine from bugfix/SHRINE-3679-add-domain-to-the-adapterauditdb to develop * commi...
Liam MoynihanLiam Moynihan
7523ad33aa8Merge branch 'feature/SHRINE2020-49-highlight-matching-concepts' of ssh://open.catalyst.harvard.edu:7999/shrine/shrin...
Liam MoynihanLiam Moynihan
27ae8b1b3bcFirst iteration of lucene code highlighting
Xavier HaurieXavier Haurie
0ced3e91a0aSHRINE2020-46 : return an empty list of suggestions when the user's input contains a double-quote (")
bcarmenbcarmen
59ab7f4e774potential solution for showing occurrences with autosuggest.
bcarmenbcarmen
5f43ad02023potential solution for occurrences
marc-daniemarc-danie
0b7b7ec1dc9SHRINE2020-178 - Add api call to get the lab information - removed unused function in the unit tests
marc-daniemarc-danie
c371c9e2184SHRINE2020-178 - Add api call to get the lab information - reverting change
marc-daniemarc-danie
4079345d85cSHRINE2020-178 - Add api call to get the lab information - renamed lab test resource json files
bcarmenbcarmen
7c78d45201bfix of missing suggestions
marc-daniemarc-danie
77ce0efd7c2SHRINE2020-178 - Add api call to get the lab information - removed LabOntologyTerm
marc-daniemarc-danie
137ddcbea09SHRINE2020-178 - Add api call to get the lab information - updated unit tests
marc-daniemarc-danie
c66b3598d44SHRINE2020-178 - Add api call to get the lab information
dwalenddwalend
4333f4afd97Can only run one database test at a time for SHRINE-3542, but each of them works by itself
bcarmenbcarmen
0a24ce66459added config for proxy
dwalenddwalend
78f491155afAdded test of reading previous queries for SHRINE-3542
dwalenddwalend
e0a7577b155Repairing the selelct all test for SHRIEN-3542
Liam MoynihanLiam Moynihan
99a8d3d83e8Merge branch 'feature/SHRINE2020-163-implement-material-ui-components' into 2.0-webclient
Liam MoynihanLiam Moynihan
c850f4783feChanged wrapping behavior of query result panel
dwalenddwalend
b2c331c463fFinally got a real test working for SHRINE-3542
bcarmenbcarmen
61b9d183c66Merge branch '2.0-webclient' of https://open.med.harvard.edu/stash/scm/shrine/shrine into 2.0-webclient
bcarmenbcarmen
be83ed4e4abchanged suggest route to hit actual server.
Marc-Danie NazaireMarc-Danie Nazaire
2e3ce278d6fMerge pull request #834 in SHRINE/shrine from feature/SHRINE2020-153-update-existing-index-to-order to 2.0-webclient ...
marc-daniemarc-danie
c59d4c2696eSHRINE2020-153 - Update existing index to order the medical concept list search results in the same order as the brow...
Liam MoynihanLiam Moynihan
77c39ba2b17Added userdomain to queries recieved table in adapter audit db
marc-daniemarc-danie
2285f8559cfMerge branches '2.0-webclient' and 'feature/SHRINE2020-153-update-existing-index-to-order' of https://open.med.harvar...
bcarmenbcarmen
13c6289dc11potential fix of failing build
marc-daniemarc-danie
90f35c4170bMerge branches '2.0-webclient' and 'feature/SHRINE2020-153-update-existing-index-to-order' of https://open.med.harvar...
marc-daniemarc-danie
a30fc0ee236Changes during merge forom 2.0-webclient branch
bcarmenbcarmen
cd1d31365ecfixed broken snapshot
bcarmenbcarmen
2ca091e482fupdated package-lock and failing snapshot
bcarmenbcarmen
2b2ffcd4573fixed failing snapshot test
marc-daniemarc-danie
28078c1fad6Merge forom 2.0-webclient branch
dwalenddwalend
ea90300ee46Found a test that's been broken for 7 years while trying to wade through the work for SHRINE-3542
Ben CarmenBen Carmen
d142f23b58dMerge pull request #826 in SHRINE/shrine from SHRINE2020-161-add-autosuggest to 2.0-webclient * commit '4daa57dedfa4...
bcarmenbcarmen
4daa57dedfamerge of 2.0-webclient and update of service call
bcarmenbcarmen
5af50dd6826merge of 2.0-webclient
Xavier HaurieXavier Haurie
c721bfa9c57Merge branch '2.0-webclient' into SHRINE2020-46-auto-suggest-3
Xavier HaurieXavier Haurie
2578d3f29d6SHRINE2020-46 : code review feedback - minor code improvements
Liam MoynihanLiam Moynihan
262869c0d47Merge pull request #835 in SHRINE/shrine from feature/SHRINE2020-163-implement-material-ui-components to 2.0-webclien...
dwalenddwalend
d00db691d32An actual test for SHRIEN-3542
Liam MoynihanLiam Moynihan
78b085836d5Removed commented out styling code
marc-daniemarc-danie
410e01b277fSHRINE2020-105 - Default laboratory value units to the "preferred" value defined in the ontology data - removed unuse...
dwalenddwalend
07244ebe7bcNow building all the way for SHRINE-3540
marc-daniemarc-danie
9a1187a4214SHRINE2020-153 - Update existing index to order the medical concept list search results in the same order as the brow...
dwalenddwalend
d196e0e83ecGetting an xml response from the server code for SHRINE-3542
marc-daniemarc-danie
4a7f7f85d0aSHRINE2020-105 - Default laboratory value units to the "preferred" value defined in the ontology data - index directo...
marc-daniemarc-danie
867a4aaa18bSHRINE2020-153 - Update existing index to order the medical concept list search results in the same order as the brow...
marc-daniemarc-danie
0bedde05915SHRINE2020-153 - Update existing index to order the medical concept list search results in the same order as the brow...
Xavier HaurieXavier Haurie
5fefcf373cfMerge branch 'SHRINE2020-46-auto-suggest-3' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into SHRINE2...
Xavier HaurieXavier Haurie
bbd540eb056SHRINE2020-46 : added missing index for LuceneSuggesterTest
Xavier HaurieXavier Haurie
9863b92cae0SHRINE2020-46 : remove printlns from test class
Xavier HaurieXavier Haurie
298a1e1801fSHRINE2020-46 : code review feedback: re-generate index for suggester test so the suggest index directories start wit...
Liam MoynihanLiam Moynihan
5568c2b52a8Incorporated suggestions from query result panel design session
Xavier HaurieXavier Haurie
572f3aaf2ddMerge branch '2.0-webclient' into SHRINE2020-46-auto-suggest-3
bcarmenbcarmen
f03d89b9ce6updated snapshot test