marc-danie | a46d82e9f8a | SHRINE-3619 - Move the steward javascript to the steward service back-end code |  |  | 
 Marc-Danie Nazaire | f44d9023c2d | Merge pull request #765 in SHRINE/shrine from bugfix/SHRINE2020-102-move-query-definition-structure to 2.0-webclient
... |  |  | 
 dwalend | 872cb524c66 | Database repair scripts for SHRIEN-3677 |  |  | 
 mjdiloreto | 5a33c9ea461 | Change test to use Map instead of array to support old versions of node. |  |  | 
 mjdiloreto | 3a323b2bce1 | Merge branch '2.0-webclient' with bugfix/SHRINE2020-102-move-query-definition-structure |  |  | 
 dwalend | 826344dece2 | Fix SHRINE-3677 by getting the username and domain alligned. |  |  | 
 marc-danie | b29fb64e7fa | Merge remote-tracking branch 'origin/2.0-webclient' into 2.0-webclient |  |  | 
 marc-danie | d19c19dbf7d | renamed runQuery to startQuery |  |  | 
 mjdiloreto | 78e1f57bf72 | Merge 2.0-webclient with bugfix/SHRINE2020-102-move-query-definition-structure |  |  | 
 bcarmen | 6827c699a8d | increased font size of title |  |  | 
 bcarmen | 22afc44e932 | suggested color changes from Griffin |  |  | 
 bcarmen | 3f90b1299eb | Merge branch '2.0-webclient' of https://open.med.harvard.edu/stash/scm/shrine/shrine into 2.0-webclient |  |  | 
 bcarmen | 13ae9bf8e5d | fixed prop types |  |  | 
 Marc-Danie Nazaire | dc24b5a251f | Merge pull request #767 in SHRINE/shrine from feature/SHRINE2020-83-client-side-extract-query-id to 2.0-webclient
* ... |  |  | 
 marc-danie | 77c33c9c54a | Mapped ontology terms with Multiple visual attribute to the Leaf concept type |  |  | 
 marc-danie | ac7f82329bf | SHRINE-3618 - Move dashboard javascript to the dashboard service back-end code - removed the build file |  |  | 
 marc-danie | 3545817735a | SHRINE-3618 - Move dashboard javascript to the dashboard service back-end code |  |  | 
 mjdiloreto | 55041abc13f | Merge branch '2.0-webclient' of https://open.med.harvard.edu/stash/scm/shrine/shrine into 2.0-webclient |  |  | 
 mjdiloreto | 1278a3f2871 | Change npm build to isntall dev dependencies before testing. |  |  | 
 bcarmen | cc42eb09152 | Merge branch '2.0-webclient' of https://open.med.harvard.edu/stash/scm/shrine/shrine into 2.0-webclient |  |  | 
 bcarmen | c56980a257f | changes per style session w Anupama and Matt |  |  | 
 mjdiloreto | ddb54cf5acd | Add polyfill for array.prototype.flatMap as dev dependency so tests don't break. |  |  | 
 mjdiloreto | 4cbe85dcf96 | Hardcode ontology search filters for demo. |  |  | 
 marc-danie | b2556068414 | SHRINE2020-83 - Client side: Extract query ID from JSON (instead of XML) - renamed runQuery api call to startQuery an... |  |  | 
 mjdiloreto | b743ef505b9 | Previous help text change added to new help text. |  |  | 
 mjdiloreto | 1f2ab24fb70 | Merge branch '2.0-webclient' of https://open.med.harvard.edu/stash/scm/shrine/shrine into 2.0-webclient |  |  | 
 bcarmen | 7c191b63e9e | fixed snapshots |  |  | 
 bcarmen | f840eb1e4fd | ui changes per story grooming |  |  | 
 mjdiloreto | 49c592424b3 | Added Help text back to root document for demo. |  |  | 
 bcarmen | 44ef85365c0 | Merge branch '2.0-webclient' of https://open.med.harvard.edu/stash/scm/shrine/shrine into 2.0-webclient |  |  | 
 bcarmen | dee92febb53 | made header text consistent |  |  | 
 mjdiloreto | bea665c2f3f | Add png ACT logo. |  |  | 
 marc-danie | d9598308ebc | removed commented out lines |  |  | 
 marc-danie | fb7d0e91c3a | Merge branch '2.0-webclient' of https://open.med.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-83-clien... |  |  | 
 marc-danie | e06bd88da6f | SHRINE2020-83 - Client side: Extract query ID from JSON (instead of XML) - Added unit tests |  |  | 
 marc-danie | aff1badb5ba | Merging changes from 2.0-webclient branch |  |  | 
 mjdiloreto | c93c4550929 | Merge branch '2.0-webclient' with bugfix/SHRINE2020-102-move-query-definition-structure |  |  | 
 bcarmen | 2dacc003ec4 | merge |  |  | 
 bcarmen | 0cc853c1086 | merge of 2.0-webclient |  |  | 
 marc-danie | c35ccd018c2 | SHRINE2020-83 - Client side: Extract query ID from JSON (instead of XML) - made networkId a string in the response to... |  |  | 
 Ben Carmen | a2411b87e32 | Merge pull request #764 in SHRINE/shrine from task/SHRINE2020-111-global-ontology-state to 2.0-webclient
* commit '1... |  |  | 
 bcarmen | 1bae76ba024 | merge of 2.0-webclient |  |  | 
 marc-danie | 505fc96b925 | made the order of the root folder alphabetic and fixed naming of the root folder Laboratory Test |  |  | 
 mjdiloreto | ab8ae4d4dac | Change action creators to declare argument names and use payload attribute. |  |  | 
 marc-danie | c1fb08e2b04 | Merge remote-tracking branch 'origin/2.0-webclient' into 2.0-webclient |  |  | 
 marc-danie | 915fe03a4ba | renamed concept_category to codeCategory |  |  | 
 bcarmen | 52be5cb8506 | updated snapshot test. |  |  | 
 bcarmen | 6565e249ac9 | text change. |  |  | 
 bcarmen | 3028317d794 | saving merge of 2.0-webclient |  |  | 
 bcarmen | 8c8388c8bf2 | fixed unit test |  |  | 
 bcarmen | 9da124cec9b | fixed styles. |  |  | 
 bcarmen | 085298e7cc5 | Merge branch '2.0-webclient' of https://open.med.harvard.edu/stash/scm/shrine/shrine into 2.0-webclient |  |  | 
 bcarmen | a375ba15dbb | ui tweaks and update of snapshot tests |  |  | 
 bcarmen | 258bb9b2774 | Merge branch 'UI-Tweaks' into 2.0-webclient |  |  | 
 bcarmen | 49b6618ea36 | saving work |  |  | 
 Marc-Danie Nazaire | 5d89f2133b6 | Merge pull request #763 in SHRINE/shrine from feature/SHRINE2020-110-modify-structure-of-json-response to 2.0-webclie... |  |  | 
 Ben Carmen | 0b6dd88ef72 | Merge pull request #766 in SHRINE/shrine from feature/SHRINE2020-75-category-folders to 2.0-webclient
* commit '15ee... |  |  | 
 mjdiloreto | b767e0560a8 | Styling changes from BA review. |  |  | 
 bcarmen | 9572d166de7 | saving work |  |  | 
 bcarmen | 203806b47f6 | saving work |  |  | 
 marc-danie | 9b96890c2d9 | SHRINE2020-83 - Client side: Extract query ID from JSON (instead of XML) |  |  | 
 mjdiloreto | e41e18ed534 | Changes to queryDefinitionView from BA review. |  |  | 
 mjdiloreto | 9247e84e2fb | Changes to ACT logo from BA review. |  |  | 
 bcarmen | 15ee07a2493 | Added Concept Categories |  |  | 
 bcarmen | 9c9bc44e77c | saving work |  |  | 
 mjdiloreto | 7899c08ed47 | Changes from code review. |  |  | 
 David Walend | de575213a83 | Merge pull request #761 in SHRINE/shrine from feature/SHRINE-3423-with-scala-2.12-use-eithers-in to develop
* commit... |  |  | 
 mjdiloreto | 090f6334c15 | Updated tests with the state of progress. |  |  | 
 bcarmen | 1ad61af3622 | added prop types |  |  | 
 bcarmen | 53cad4a3e26 | added unit tests for saga and reducer |  |  | 
 marc-danie | e8058ad0700 | SHRINE2020-110 - Modify structure of JSON response ontology/root and ontology/children apis calls - code review changes |  |  | 
 David Walend | 8c15abf86ba | Merge pull request #762 in SHRINE/shrine from feature/SHRINE-3378-remove-jerseyclientexecutioncontext to develop
* c... |  |  | 
 bcarmen | 5aadf8d8d8d | saving work |  |  | 
 Ben Carmen | 3088fc41e60 | Merge pull request #758 in SHRINE/shrine from feature/SHRINE2020-93-mui-concepts-panel to 2.0-webclient
* commit '19... |  |  | 
 marc-danie | 073de5bab94 | SHRINE2020-110 - Modify structure of JSON response ontology/root and ontology/children apis calls |  |  | 
 mjdiloreto | f355adacaf4 | Added unit test for queryDefinitionReducer. |  |  | 
 David Walend | 04baafb03c3 | Merge pull request #756 in SHRINE/shrine from feature/SHRINE-3575-remove-i2b2workarounds-object to develop
* commit ... |  |  | 
 dwalend | 3091346d7a4 | Removed the jersey client context now that the jersey client is gone for SHRINE-3378 |  |  | 
 dwalend | 2ae2cced176 | Using 2.12 for-comprehension for Either for SHRINE-3423 |  |  | 
 mjdiloreto | 43522b55ecf | Finish hooking up QueryDefinitionContainer to redux. |  |  | 
 dwalend | 6ca4300b83a | PR recommendations for SHRINE-3575 |  |  | 
 bcarmen | dd3788cc330 | saving work |  |  | 
 dwalend | edd2c368d32 | Merge branch 'develop' into feature/SHRINE-3575-remove-i2b2workarounds-object |  |  | 
 mjdiloreto | e24b7c4a92f | Hooked up QueryDefinitionContainer to queryDefinition reducer. |  |  | 
 mjdiloreto | 78c75369542 | Created reducer and actions for query definition. |  |  | 
 bcarmen | 3b4c0c12982 | Merge branch '2.0-webclient' of https://open.med.harvard.edu/stash/scm/shrine/shrine into 2.0-webclient |  |  | 
 bcarmen | 952000e2f15 | fixed prop type |  |  | 
 bcarmen | 525a63afdb7 | update of background color of the header |  |  | 
 David Walend | e9fb670e6e5 | Merge pull request #759 in SHRINE/shrine from bugfix/SHRINE-3424-remove-remotesites-in-the-cert to develop
* commit ... |  |  | 
 Ben Carmen | 7742652ea39 | Merge pull request #757 in SHRINE/shrine from add-polling-back-in to 2.0-webclient
* commit '4d7ba13a6593cba60957a06... |  |  | 
 dwalend | dc1fc665b07 | Removed the unused remoteSites structures for SHRINE-3424 |  |  | 
 Matthew DiLoreto | b1efc1d8a75 | Merge pull request #755 in SHRINE/shrine from feature/SHRINE2020-103-replace-the-harvard-catalyst to 2.0-webclient
*... |  |  | 
 bcarmen | 1975cd4c7d2 | removed ^ from package dependencies |  |  | 
 mjdiloreto | 7d2c7da9559 | Modified query definition help text to fit BA requirements (with Tooltip component). |  |  | 
 bcarmen | 0e2526d48f7 | added mui lab dependencu |  |  | 
 bcarmen | cd27993113b | Merge branch '2.0-webclient' into feature/SHRINE2020-93-mui-concepts-panel |  |  | 
 bcarmen | 1fd3b7ee709 | updated snapshot |  |  | 
 bcarmen | 9711aeb2c18 | Potential solution for moving ontology view into MUI |  |  | 
 bcarmen | 4d7ba13a659 | removing unused files |  |  | 
 bcarmen | 0378e319071 | Fix of query polling |  |  | 
 dwalend | 726fd342311 | Merge remote-tracking branch 'origin/develop' into feature/SHRINE-3575-remove-i2b2workarounds-object |  |  | 
 dwalend | d83dda1be26 | Removed the I2b2Workarounds class for SHRINE-3575 |  |  | 
 David Walend | caa6469fdb0 | Merge pull request #753 in SHRINE/shrine from bugfix/SHRINE-3636-drop-shrine_query_history-hub to develop
* commit '... |  |  | 
 mjdiloreto | 05f7eadc40a | SHRINE2020-103 changed Harvard Catalyst Logo to ACT logo. |  |  | 
 David Walend | 630796326d6 | Merge pull request #749 in SHRINE/shrine from bugfix/SHRINE-3662-clean-out-most-top-level-dependencies to develop
* ... |  |  | 
 bcarmen | 9b3a5cddbc9 | saving work |  |  | 
 Matthew DiLoreto | 01b19dba312 | Merge pull request #752 in SHRINE/shrine from bugfix/SHRINE2020-104-or-text-is-missing to 2.0-webclient
* commit '74... |  |  | 
 dwalend | 5b1cc89cfbf | Review changes for SHRINE-3636 |  |  | 
 dwalend | 4995ed36534 | Merge branch 'develop' into bugfix/SHRINE-3636-drop-shrine_query_history-hub |  |  | 
 dwalend | b79732aafe9 | Had to reopen SHRINE-3622. That new database driver needs some more settings. |  |  | 
 dwalend | 1ee836739dc | Merge branch 'develop' into bugfix/SHRINE-3662-clean-out-most-top-level-dependencies |  |  | 
 David Walend | 4b2d24ade68 | Merge pull request #750 in SHRINE/shrine from feature/SHRINE-3640-remove-dashboard-app-and-steward-app to develop
* ... |  |  | 
 dwalend | 24619c897b3 | Moved pom.xml version to 2.1.0-M4 |  |  | 
 bcarmen | 50e24a2657e | changed tab header |  |  | 
 bcarmen | 5a18bac9151 | saving work |  |  | 
 dwalend | 1031b406da4 | Looks like there's no love for if exists clauses in mssql and oracle - for SHRINE-3636 |  |  | 
 mjdiloreto | 74f681d5bb8 | SHRINE2020-104 fix QueryTermViews to display or when they are not the first in the list. |  |  | 
 dwalend | 80bb7a5e32e | Dropped the unused HUB tables for SHRINE-3636 - also makes SHRINE-2711 irrelevant |  |  | 
 Matthew DiLoreto | a7ff72eb65e | Merge pull request #748 in SHRINE/shrine from feature/SHRINE2020-92-implement-material-ui-framework to 2.0-webclient
... |  |  | 
 marc-danie | 28e272ee2e8 | SHRINE2020-80 - Client side representation of query in JSON - Updated category definition file path names to start wi... |  |  | 
 Marc-Danie Nazaire | dc5db00267d | Merge pull request #747 in SHRINE/shrine from feature/SHRINE2020-80-client-side-representation to 2.0-webclient
* co... |  |  | 
 marc-danie | ac6b63ff35d | SHRINE2020-80 - Client side representation of query in JSON - Minor change to log message |  |  | 
 marc-danie | ac229c8da02 | SHRINE2020-80 - Client side representation of query in JSON - Modified to return Bad Request response when there was ... |  |  | 
 dwalend | 8176890156c | Deleted all the non-javscript stuff in the soon-to-be-abandoned dashboard and steward app directories for SHRINE-3640 |  |  | 
 dwalend | 6c263c6f18b | Removed some more old cruft from the top-level pom.xml for SHRINE-3662 |  |  | 
 marc-danie | 02b021c7c1e | SHRINE2020-80 - Client side representation of query in JSON - Added ticket numbers in comments for temporary code |  |  | 
 marc-danie | cf726ccc74a | SHRINE2020-80 - Client side representation of query in JSON - Added ticket numbers in comments for temporary code |  |  | 
 dwalend | b033680870a | Removed a lot of top-level maven boilerplate and made dependencies more precise for SHRINE-3662 |  |  | 
 mjdiloreto | 7ad00ac6b53 | SHRINE2020-92 changes based on review. |  |  | 
 bcarmen | 433295e811c | saving work |  |  | 
 marc-danie | 4937aa5ff5f | SHRINE2020-80 - Client side representation of query in JSON - minor code cleanup |  |  | 
 marc-danie | 433a10db8e2 | SHRINE2020-80 - Client side representation of query in JSON - Updated topic name to match what is on 2020 servers |  |  | 
 mjdiloreto | d0ff07aaa17 | SHRINE2020-92 refactored inclusion/exclusion panel to use material ui. |  |  | 
 marc-danie | 2f8ef304d21 | Merge branches '2.0-webclient' and 'feature/SHRINE2020-80-client-side-representation' of https://open.med.harvard.edu... |  |  | 
 bcarmen | 4f5323ef25a | fix of failing snapshot test. |  |  | 
 Matthew DiLoreto | cf77776333f | Merge pull request #743 in SHRINE/shrine from bugfix/SHRINE-2650-Alpha-sort-breakdown to develop
* commit 'df19613d5... |  |  | 
 marc-danie | c120e7fcab8 | Merge branches '2.0-webclient' and 'feature/SHRINE2020-80-client-side-representation' of https://open.med.harvard.edu... |  |  | 
 David Walend | 8ab4a4edbca | Merge pull request #746 in SHRINE/shrine from bugfix/SHRINE-3648-request-to-run-a-query-never to develop
* commit '7... |  |  | 
 bcarmen | f2a1c038412 | Merge branch '2.0-webclient' into feature/SHRINE2020-93-mui-concepts-panel |  |  | 
 bcarmen | 52f4435465b | saving work |  |  | 
 Ben C | f06cb38f1da | commit of .gitfile |  |  | 
 marc-danie | 59ff253653e | SHRINE2020-80 - Client side representation of query in JSON |  |  | 
 Ben Carmen | 6b8394d1847 | Merge pull request #745 in SHRINE/shrine from feature/SHRINE2020-71-mui-header to 2.0-webclient
* commit '03505bc1f6... |  |  | 
 dwalend | 738d50f9459 | Better log message and upgrade to http4s for SHRINE-3676 |  |  | 
 bcarmen | 03505bc1f6e | incorporated changes from code review |  |  | 
 dwalend | 80cac869073 | Merge remote-tracking branch 'origin/develop' into bugfix/SHRINE-3648-request-to-run-a-query-never |  |  | 
 Matthew DiLoreto | 0ee542e6591 | Merge pull request #742 in SHRINE/shrine from bugfix/SHRINE-3606-Add-unit-test-to-adapterMappingsDbTest-to-test-selec... |  |  | 
 David Walend | 69bd74cedf0 | Merge pull request #741 in SHRINE/shrine from bugfix/SHRINE-3650-don-t-write-the-sent-to-adapters to develop
* commi... |  |  | 
 bcarmen | a07a5da8a1e | added header. |  |  | 
 dwalend | 9e2dd8d0855 | Merge branch 'bugfix/SHRINE-3650-don-t-write-the-sent-to-adapters' into bugfix/SHRINE-3648-request-to-run-a-query-never |  |  | 
 bcarmen | 9d89ae2dc06 | saving changes |  |  | 
 bcarmen | 9a0a4d951f8 | functioning header |  |  | 
 Matthew DiLoreto | 8c1cd4a9cd8 | Merge pull request #736 in SHRINE/shrine from bugfix/SHRINE-3637-Cleanup-wildcard-import-of-duration to develop
* co... |  |  | 
 Matthew DiLoreto | a3dbaba6022 | Merge pull request #737 in SHRINE/shrine from bugfix/SHRINE-3620-Exclude-Log-as-the-source-of-a-log-entry to develop
... |  |  | 
 bcarmen | d0d5ba144c7 | Changes based on BA review |  |  | 
 bcarmen | 835210b2e30 | Merge branch 'feature/SHRINE2020-31-display-validation-errors-for-group-date-ranges' into 2.0-webclient |  |  | 
 bcarmen | 794bf9ff6b9 | changes based on UAT |  |  | 
 dwalend | 2d28d07f427 | Matt's review - comment fixes for SHRINE-3650 |  |  | 
 Matthew DiLoreto | 8f694329ba0 | Merge pull request #744 in SHRINE/shrine from bugfix/SHRINE-1471-Incorrect-spelling-of-occurrence to develop
* commi... |  |  | 
 dwalend | efdf87feb94 | Merge branch 'bugfix/SHRINE-3650-don-t-write-the-sent-to-adapters' of https://open.med.harvard.edu/stash/scm/shrine/s... |  |  | 
 bcarmen | f7f125c12bf | almost working/refactor |  |  | 
 mjdiloreto | 88aa4eade34 | Fix typo in web client. |  |  | 
 Ben Carmen | cde7f3dd19f | Merge pull request #740 in SHRINE/shrine from feature/SHRINE2020-31-display-validation-errors-for-group-date-ranges t... |  |  | 
 Matthew DiLoreto | 124baea74d5 | Merge pull request #735 in SHRINE/shrine from bugfix/SHRINE-3580-Store-Shrine-Ontology-Metadata to develop
* commit ... |  |  | 
 dwalend | 995df8b0eac | Making a few attempts to send a message to the adapters before giving up. SHRINE-3650 |  |  | 
 Marc-Danie Nazaire | 5c8e98f76f9 | Merge pull request #739 in SHRINE/shrine from feature/SHRINE2020-89-ontology-terms-should-be-displayed to 2.0-webclie... |  |  | 
 mjdiloreto | d4eed4cff30 | Added ignored unit test for testing adapter mappings with real ontology terms. |  |  | 
 mjdiloreto | df19613d5ab | Use alphanumeric sort to sort QEP breakdown names and type names. |  |  | 
 mjdiloreto | 459a1ea22d4 | Rename update sql script names to make automation easier. |  |  | 
 bcarmen | ffb25d306c1 | updated snapshot |  |  | 
 bcarmen | c3bcff2b3c3 | potential solution for date range validation |  |  | 
 marc-danie | 6ffe9cb1c90 | Fixed broken test |  |  | 
 mjdiloreto | 8db5100965e | Changed confusing variable name. |  |  | 
 bcarmen | a375607ddf8 | potential solution for date range validation |  |  | 
 marc-danie | f84b760e890 | Merge branches '2.0-webclient' and 'feature/SHRINE2020-89-ontology-terms-should-be-displayed' of https://open.med.har... |  |  | 
 marc-danie | 184d86ee77c | SHRINE2020-89 - Ontology terms should be displayed in the same order as ACT 2.0 prod (alphabetically) |  |  | 
 mjdiloreto | 53739e7fa12 | Created unit test for alphanumeric sort. |  |  | 
 mjdiloreto | ed1d6240881 | Create sort function for alpha-numeric strings |  |  | 
 Ben Carmen | bc50a757ffe | Merge pull request #738 in SHRINE/shrine from feature/SHRINE2020-80-query-object to 2.0-webclient
* commit '90f02386... |  |  | 
 dwalend | 0d325699249 | Merge remote-tracking branch 'origin/develop' into bugfix/SHRINE-3650-don-t-write-the-sent-to-adapters |  |  | 
 bcarmen | 90f0238694f | removed unwanted spaces |  |  | 
 bcarmen | 129093a3a8b | saving updated snapshot |  |  | 
 bcarmen | 7a2f6fcb571 | saving work |  |  | 
 bcarmen | 5496547a609 | Unblock Marc Danie |  |  | 
 dwalend | 9098a300af5 | Merge branch 'develop' into bugfix/SHRINE-3650-don-t-write-the-sent-to-adapters |  |  | 
 dwalend | 296deb5ac77 | Chaser - missed pom.xml dependencies on the deleted shrine-client |  |  | 
 dwalend | 4263400f3fb | Merge remote-tracking branch 'origin/develop' into bugfix/SHRINE-3650-don-t-write-the-sent-to-adapters |  |  | 
 mjdiloreto | 069ff8741e1 | Add unit test for every possibility to reload mappings. Rename adapterAuditDb update sql scripts. |  |  | 
| Next → |