 bcarmen | 932849ee6ff | code cleanup | | |
bcarmen | 929cf733310 | Merge branch '2.0-webclient' into feature/SHRINE2020-245 | | |
bcarmen | d6e5b2ce6a0 | updated snapshot test | | |
bcarmen | a453fc68b1c | fix of secure fetch | | |
bcarmen | 6cdb04e7122 | Merge branch '2.0-webclient' into feature/SHRINE2020-242 | | |
bcarmen | 52da429999e | added sort to query topics | | |
 Liam Moynihan | 752c2223c94 | Incorporated BA suggestions for tooltip arrow and font size | | |
bcarmen | 80816567fb6 | updated ViewModeTypes | | |
bcarmen | 52c194a5a54 | potential solution for hiding the tutorial | | |
Liam Moynihan | 333b980af77 | First pass of query result flagging before conecting to backend | | |
 Liam Moynihan | ddae8cad8cc | Merge pull request #887 in SHRINE/shrine from feature/SHRINE2020-235 to 2.0-webclient
* commit '31cba5430da9dcf16208... | | |
Liam Moynihan | a68849fecb3 | Merge branch 'dialog-boxes' into feature/SHRINE2020-226 | | |
Liam Moynihan | c018a32d337 | First iteration of dialog box pop ups for flag renaming and errors | | |
 marc-danie | 31b1b46090c | SHRINE2020-247 - Return readable query definition in queryResult api call - fixed broken unit tests | | |
marc-danie | f246045058a | SHRINE2020-247 - Return readable query definition in queryResult api call - added complex query criteria test | | |
marc-danie | 21f13d307b6 | SHRINE2020-247 - Return readable query definition in queryResult api call - modified format of the tests to Junit | | |
bcarmen | 7971cfebdcb | saving work | | |
bcarmen | f976904dcd5 | Fix of broken start query | | |
marc-danie | 3e0a8577077 | SHRINE2020-247 - Return readable query definition in queryResult api call - commented out failing tests | | |
bcarmen | f21a3e3f4a4 | potential fix of secureFetch | | |
bcarmen | 9663870b649 | saving work | | |
marc-danie | 47d7ea51488 | SHRINE2020-247 - Return readable query definition in queryResult api call - fixed criteria text when there is only on... | | |
marc-danie | d6d667f6011 | SHRINE2020-247 - Return readable query definition in queryResult api call - included front end changes | | |
Liam Moynihan | 31cba5430da | Expanded query history date timestamp | | |
marc-danie | f546812d30a | SHRINE2020-226 - Allow a user to flag a previous query, including functionality and back end work - includes working ... | | |
 dwalend | 06624b52f82 | Moving develop to version 2.1.0-M7 | | |
dwalend | 63165a5db53 | Moved the version to 2.1.0-M6QA1 for M6's QA pass | | |
bcarmen | 2c8ba7a8ec3 | saving work | | |
bcarmen | be1b27fd4cf | Merge branch '2.0-webclient' into feature/SHRINE2020-242 | | |
bcarmen | 2982764877a | saving work | | |
marc-danie | a41a95e9b7c | SHRINE2020-247 - Return readable query definition in queryResult api call - added code category to the text | | |
marc-danie | 1152ad6a1df | SHRINE2020-247 - Return readable query definition in queryResult api call - added code category to the text | | |
bcarmen | 851be6ccfa8 | Merge branch '2.0-webclient' into feature/SHRINE2020-245 | | |
bcarmen | a544405fa3d | saving work | | |
 Xavier Haurie | ed750624d25 | SHRINE2020-226 : A messy bunch of comments to try and plan out how to build the flag-query service -- this does not b... | | |
Liam Moynihan | 27191b4d5e7 | Added tool tip to show query name when name is overflowing | | |
Liam Moynihan | 07f9313b35e | Removed flatmap usage to align with node v10 | | |
bcarmen | aa008476f9d | Potential solution for Query Error Dialog and fetching the config. | | |
 David Walend | 55d5fab49a6 | Merge pull request #886 in SHRINE/shrine from feature/SHRINE-3541-realy-remove-shrine.war to develop
* commit 'c6734... | | |
Liam Moynihan | 729806b3bb4 | Bumped node js version to 12.16.1 | | |
bcarmen | a8a0d467661 | saving unit tests | | |
bcarmen | 066c2d1e17d | updated models to reflect queryDetailInfo | | |
Liam Moynihan | e0ba2e51206 | Updated tests for bolding new query results | | |
Liam Moynihan | b1d68c4cfb1 | Added enum values back to drop down for lab query terms | | |
Liam Moynihan | 6bb4c18d671 | Added bold type to queries that are unobserved | | |
bcarmen | 176143c5af1 | saving unit tests. | | |
marc-danie | d0b6621894d | Merging in most of the changes from SHRINE2020-225 - Include total number of sites and patient counts in the queryRes... | | |
marc-danie | c2d9955a606 | SHRINE2020-247 - Return readable query definition in queryResult api call | | |
bcarmen | 5044a7e9934 | pushing latest work | | |
Liam Moynihan | 2c9feb4f676 | Added snapshot test for type select | | |
Liam Moynihan | 7cd9759d22c | Merge branch '2.0-webclient' into feature/SHRINE2020-154 | | |
Liam Moynihan | f06e87f0b0f | Upgraded node version from 10.15.1 to 12.0.0 | | |
Liam Moynihan | 620c53be313 | First pass of making lab details drop down data driven | | |
dwalend | c6734f2287d | These comments are lies | | |
bcarmen | 03658b754e3 | removed empty test | | |
bcarmen | bfda821b239 | added unit tests | | |
bcarmen | 9976338ffa2 | Merge branch 'feature/SHRINE2020-245' into feature/SHRINE2020-242-client-side-work-for-loading-reloading | | |
bcarmen | c24eef903ec | added tests for query topic access fetch | | |
Liam Moynihan | 82e177b968f | Merge remote-tracking branch 'origin/2.0-webclient' into feature/SHRINE2020-172 | | |
Liam Moynihan | b8a0afcd25f | Fixed small frontend result sorting bugs | | |
Xavier Haurie | 4be4941ee0c | SHRINE2020-226 : added a REST endpoint for flagging a query | | |
Liam Moynihan | 0576cf01ffd | Fixed capitalization error in result status checking | | |
bcarmen | 55652a55ae3 | fixed unit tests | | |
bcarmen | 13f66586c7a | potential solution for loading topics | | |
Liam Moynihan | fe74fbd65a3 | Implemented institution result sorting on backend | | |
dwalend | b94aba4eebf | Removed shrine-app and shrine-war for SHRINE-3541 | | |
Liam Moynihan | d761913f163 | Added sort site by query param to query result route | | |
Liam Moynihan | bd75ea45e05 | Updated tests for query result sorting | | |
bcarmen | ce104d776c6 | saving changes | | |
bcarmen | 4a2d66b4183 | Merge branch 'feature/SHRINE2020-245-create-a-topic' into feature/SHRINE2020-245-client-side-work-for-creating | | |
bcarmen | 4d01e255ceb | Potential Solution for creating a query topic | | |
David Walend | fc772dca3cf | Merge pull request #885 in SHRINE/shrine from feature/SHRINE-3541-remove-shrine.war-war-and-shrine-app to develop
* ... | | |
dwalend | d2bc69a0d93 | merge with develop (and cleaned up some imports) | | |
David Walend | a19e7c2e687 | Merge pull request #884 in SHRINE/shrine from bugfix/SHRINE-3711-authenticate-aim-3-requests-for to develop
* commit... | | |
Liam Moynihan | 345e9135884 | Implemented frontend logic for sorting institution results | | |
marc-danie | 32f8e419160 | SHRINE2020-223 - Display an aggregate count of the number of sites returning results, and the total patient count in ... | | |
Liam Moynihan | b226069911e | Slight performance increase with query name generation logic | | |
Liam Moynihan | 0859b49dc35 | Changed query name validation to allow all ascii characters between 32 and 126 | | |
dwalend | 545c9262a2b | One chaser for SHRINE-3541 | | |
dwalend | ee41f98af2b | Last cleanup for SHRINE-3541 | | |
bcarmen | f95a5274987 | saving work | | |
marc-danie | 7e878910886 | SHRINE2020-223 - Display an aggregate count of the number of sites returning results, and the total patient count in ... | | |
marc-danie | 9f4d799ef2f | Merge branch '2.0-webclient' of https://open.med.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-223 | | |
marc-danie | fce7f44b1f2 | SHRINE2020-223 - Display an aggregate count of the number of sites returning results, and the total patient count in ... | | |
bcarmen | f4efb4aa98f | Merge branch '2.0-webclient' into feature/SHRINE2020-169-create-topic | | |
bcarmen | 42dade9c321 | make sure that "hidden" attribute is working | | |
dwalend | b0cfe14ac2d | Consolidating aim3-specific parts to the aim3 service for SHRINE-3541 | | |
bcarmen | b9f294e08bb | saving work | | |
Liam Moynihan | b7da439b1f2 | Added button to automatically generate default query name | | |
bcarmen | a0f988abab5 | saving work | | |
dwalend | 8d19cc82397 | Changed the request handler to more modern scala for SHRINE-3541 | | |
dwalend | a0c6f662136 | Deleted another layer for SHRINE-3541 | | |
dwalend | 53a3a0642c7 | Consolidated the awkward layers of the request dispatch into just one big if statement for SHRINE-3541 | | |
Xavier Haurie | d7a9fb7acaa | Merge branch '2.0-webclient' into origin/feature/SHRINE2020-219B-client-side-work-for-displaying | | |
marc-danie | eb119932c71 | Merge remote-tracking branch 'origin/2.0-webclient' into 2.0-webclient | | |
marc-danie | 432ecaf32bf | Fix concept type when getting conceptInfo | | |
Xavier Haurie | 9736c66a8c3 | Merge branch '2.0-webclient' into origin/feature/SHRINE2020-219B-client-side-work-for-displaying | | |
dwalend | e0f5e3792db | Dissolving HandleableAdminShrineRequest first step for SHRINE-3541 | | |
dwalend | 721c79e5895 | Deleted the held message business for SHRINE-3541 | | |
dwalend | c1ee8d42fdd | Deleting strange old test bits for SHRINE-3546 | | |
dwalend | 86e13dce4e0 | Stray Jersey comment for SHRINE-3541 | | |
dwalend | 4d57b132068 | Removed the last of the Jersy dependencies for SHRINE-1861 | | |
dwalend | 92b52796577 | Less jersey testing - maybe all of it gone SHRINE-3541 | | |
dwalend | 7c41cf29b9a | Cleaned out jersey testing stuff in the adapter for SHRINE-3541 | | |
dwalend | 96ecee9c79d | Got rid of the guts of shrine.war for SHRINE-3541 | | |
dwalend | 527a6d27401 | Minor XML updates while testing SHRINE-3711 | | |
dwalend | c07a70a2a89 | Merge remote-tracking branch 'origin/develop' into bugfix/SHRINE-3711-authenticate-aim-3-requests-for | | |
bcarmen | b89d0e8c235 | change text color to teal | | |
bcarmen | f49c65e2b7c | Merge branch '2.0-webclient' of https://open.med.harvard.edu/stash/scm/shrine/shrine into 2.0-webclient | | |
bcarmen | 82313556f16 | fix of whitespace when dragging a concept | | |
Xavier Haurie | 0cb111dbbf5 | SHRINE2020-219 : reset package-lock.json to be the same as the one on the 2.0-webclient branch | | |
Xavier Haurie | 3838bbcf787 | Merge branch '2.0-webclient' into origin/feature/SHRINE2020-219B-client-side-work-for-displaying | | |
 Marc-Danie Nazaire | 05fdfb14511 | Merge pull request #878 in SHRINE/shrine from feature/SHRINE2020-225-include-total-number-of-sites to 2.0-webclient
... | | |
Liam Moynihan | f9fca7c3056 | Changed styling of patient and site counts from BA feedback | | |
 Ben Carmen | cae4c81f3bc | Merge pull request #882 in SHRINE/shrine from bugfix/SHRINE2020-241-date-range-expanding to 2.0-webclient
* commit '... | | |
David Walend | 314792db9af | Merge pull request #883 in SHRINE/shrine from bugfix/SHRINE-3532-bound-memory-use-in-selectoverdueresultsio to develo... | | |
bcarmen | 58329c240f6 | Merge branch '2.0-webclient' into bugfix/SHRINE2020-241-date-range-expanding | | |
bcarmen | e5fee3f7d45 | changes per code review | | |
bcarmen | 966c7691be9 | Merge branch '2.0-webclient' of https://open.med.harvard.edu/stash/scm/shrine/shrine into 2.0-webclient | | |
bcarmen | 55b8d90ca61 | made text changes to tutorial | | |
Ben Carmen | f6fb5afb9c0 | Merge pull request #880 in SHRINE/shrine from cleanup/SHRINE2020-239-remove-bootstrap-from-dependencies to 2.0-webcli... | | |
Xavier Haurie | 435b08535a8 | SHRINE2020-219 : code clean-up as per peer review feedback | | |
Xavier Haurie | adb1bd70b2c | SHRINE2020-219 : display folders as closed when they do not contain children | | |
dwalend | 453025e00b1 | Changed the periodic check for queries that are never coming back to save memory instead of time for SHRINE-3532 | | |
marc-danie | 5b44cadfdd1 | SHRINE2020-225 - Include total number of sites and patient counts in the queryResultPolling api call - created startQ... | | |
marc-danie | 03a7d778b71 | SHRINE2020-225 - Include total number of sites and patient counts in the queryResultPolling api call - renamed refere... | | |
marc-danie | a7963957c5c | Merge remote-tracking branch 'origin/feature/SHRINE2020-225-include-total-number-of-sites' into feature/SHRINE2020-22... | | |
marc-danie | fe92d7db6eb | SHRINE2020-225 - Include total number of sites and patient counts in the queryResultPolling api call - added check of... | | |
David Walend | d32fdee3d67 | Merge pull request #875 in SHRINE/shrine from bugfix/SHRINE-3706-query-id-1389219722313541367 to develop
* commit '4... | | |
David Walend | 103a21a1f31 | Merge pull request #871 in SHRINE/shrine from feature/SHRINE-3672-deliver-the-topic-description to develop
* commit ... | | |
David Walend | 5bd56f18bdb | Merge pull request #877 in SHRINE/shrine from feature/SHRINE-3702-better-error-message-than-head to develop
* commit... | | |
bcarmen | 672215566c2 | used default props for expanded. | | |
bcarmen | 29637c84d9f | potential fix of date range and occurrences panel not expanding. | | |
bcarmen | fce8e2c244d | potential fix of query term group options panel not expanding | | |
Xavier Haurie | 749fc1203d6 | SHRINE2020-219 : merge 2.0-webclient into origin/feature/SHRINE2020-219B-client-side-work-for-displaying | | |
Liam Moynihan | c5203a74e70 | Merge branch 'feature/SHRINE2020-225-include-total-number-of-sites' of ssh://open.catalyst.harvard.edu:7999/shrine/sh... | | |
Liam Moynihan | aff1ad65bac | Added frontend logic for displaying site and patient counts of selected query | | |
Xavier Haurie | 0c47fa9449e | SHRINE2020-219 : code clean-up | | |
Xavier Haurie | 925eb9771d4 | SHRINE2020-219 : wire QueryTermLabView and QueryTermView to enable concept info popovers for lab concepts | | |
marc-danie | 88d6c527a3b | SHRINE2020-225 - Include total number of sites and patient counts in the queryResultPolling api call - removed commen... | | |
bcarmen | 94ca27ae123 | Merge branch '2.0-webclient' of https://open.med.harvard.edu/stash/scm/shrine/shrine into 2.0-webclient | | |
bcarmen | 8c79cb051f0 | incorporated changes from designer | | |
Xavier Haurie | 0fa4788232f | Revert javascript configuration to what it is in the main branch | | |
Liam Moynihan | 8f625ecfedc | Added styling changes to the query term context popover | | |
David Walend | acbda44011a | Merge pull request #879 in SHRINE/shrine from bugfix/SHRINE-3666-remove-audit_entry-table-in-shrine_query_history to ... | | |
bcarmen | e115900b4ce | remove any remaining dependency on Bootstrap | | |
Xavier Haurie | c18c7fead08 | Merge 2.0-webclient and start using real concept info data again | | |
Liam Moynihan | 29ac9d74d03 | Merge branch 'feature/SHRINE2020-225-include-total-number-of-sites' of ssh://open.catalyst.harvard.edu:7999/shrine/sh... | | |
David Walend | 347271ea655 | Merge pull request #874 in SHRINE/shrine from feature/SHRINE-3597-move-network-health-to-services-network-health to d... | | |
marc-danie | 75d8df33ace | Merge branch '2.0-webclient' of https://open.med.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-225-incl... | | |
marc-danie | 854780d8c80 | Merge remote-tracking branch 'origin/2.0-webclient' into 2.0-webclient | | |
marc-danie | fc3522974e2 | Fixed format of the JSON response for the conceptInfo api call | | |
Xavier Haurie | 752877717b8 | SHRINE2020-219 : work in progress : revert to using static data without nested arrays (i.e [[]]) for children nodes; ... | | |
Liam Moynihan | e749273adec | Merge branch 'feature/SHRINE2020-225-include-total-number-of-sites' of ssh://open.catalyst.harvard.edu:7999/shrine/sh... | | |
bcarmen | b100259a8bb | incorporated BA feedback | | |
bcarmen | 82fb390b647 | Merge branch '2.0-webclient' of https://open.med.harvard.edu/stash/scm/shrine/shrine into 2.0-webclient | | |
Liam Moynihan | 15de5b1219e | Fixed bug in empty search results logic | | |
bcarmen | af5f5cd2599 | incorporated BA review | | |
dwalend | 792bac43a68 | Remove the last reference to AUDIT_ENTRY that isn't about deleting it for SHRINE-3666 | | |
Liam Moynihan | b16e0c14f49 | Merge pull request #872 in SHRINE/shrine from feature/SHRINE2020-222-amia-demo-prep-hide-features to 2.0-webclient
*... | | |
marc-danie | f20a1707369 | SHRINE2020-225 - Include total number of sites and patient counts in the queryResultPolling api call - Modified to re... | | |
David Walend | ae289659ef2 | Merge pull request #876 in SHRINE/shrine from feature/SHRINE-3708-set-ontology-version-term-from to develop
* commit... | | |
marc-danie | 68ff5e4f10f | Merge branch '2.0-webclient' of https://open.med.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-225-incl... | | |
Marc-Danie Nazaire | 295217bb89e | Merge pull request #870 in SHRINE/shrine from bugfix/SHRINE2020-191-the-index-sort-order-needs to 2.0-webclient
* co... | | |
bcarmen | fbb8c49059e | Merge branch '2.0-webclient' of https://open.med.harvard.edu/stash/scm/shrine/shrine into 2.0-webclient | | |
bcarmen | f5f41147162 | BA review changes. | | |
Liam Moynihan | 2defd3dd12b | Fixed bug causing query groups to always say find patients | | |
marc-danie | f82b306bcbf | Merge branch '2.0-webclient' of https://open.med.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-225-incl... | | |
dwalend | ed72e47272f | One step closer to testing SHRINE-3711 | | |
marc-danie | 907e78e54b4 | SHRINE2020-225 - Include total number of sites and patient counts in the queryResultPolling api call - Add the obscur... | | |
Xavier Haurie | fe2b2232ce9 | SHRINE2020-219 : work in progress : integrates with ontology conceptInfo service | | |
dwalend | b38a7ea2735 | Found the authentication bypass for SHRINE-3711 | | |
Xavier Haurie | 17d69aae084 | SHRINE2020-219 : work in progress -- use FilteredTree and static JSON data; fixed data's conceptTyped to use all thre... | | |
David Walend | 18ea5766f10 | Merge pull request #873 in SHRINE/shrine from feature/SHRINE-3703-supply-manual-test-files-for to develop
* commit '... | | |
Xavier Haurie | fcec9d35f34 | SHRINE2020-219 : work in progress -- use FilteredTree and static JSON data | | |
Xavier Haurie | a25411bab9f | Merge branch '2.0-webclient' into feature/SHRINE2020-219-client-side-work-for-displaying | | |
marc-danie | 9460e1747e1 | SHRINE2020-191 - The index sort order needs to be case insensitive in order to display the search results in the righ... | | |
dwalend | ccb98f3e3b9 | More exception handling to try and figure out what the CRC is trying to tell shrine for SHRINE-3702 | | |
Liam Moynihan | 674e46bb64c | Modified query name validation messages | | |
marc-danie | 5874f76dd5c | SHRINE2020-225 - Include total number of sites and patient counts in the queryResultPolling api call | | |
bcarmen | 809ecabad5c | saving fix for when authenticated user reloads a page | | |
Liam Moynihan | aa109462979 | Restyled the no search results message | | |
dwalend | f834827b1ac | Added a config property for the ontology version term for SHRINE-3708 | | |
dwalend | a9e2432c629 | Better name from Marc-Danie for SHRINE-3672 | | |
dwalend | 483e467c218 | Broader interpretation of a completed query to prevent SHRINE-3706 | | |
bcarmen | ec7f3b86eaa | changed Login to Log In | | |
dwalend | efc483d4b8f | Moved network health for SHRINE-3597 | | |
Liam Moynihan | c887015e6f8 | Refactored hiding elements to use css rather than deleting html | | |
| Next → |
