SHRINE
  1. SHRINE

shrine

Public
  1. SHRINE
  2. shrine

All Branches Graph  

        
AuthorCommitMessageCommit dateBuilds
marc-daniemarc-danie
a46d82e9f8aSHRINE-3619 - Move the steward javascript to the steward service back-end code
Marc-Danie NazaireMarc-Danie Nazaire
f44d9023c2dMerge pull request #765 in SHRINE/shrine from bugfix/SHRINE2020-102-move-query-definition-structure to 2.0-webclient ...
dwalenddwalend
872cb524c66Database repair scripts for SHRIEN-3677
mjdiloretomjdiloreto
5a33c9ea461Change test to use Map instead of array to support old versions of node.
mjdiloretomjdiloreto
3a323b2bce1Merge branch '2.0-webclient' with bugfix/SHRINE2020-102-move-query-definition-structure
dwalenddwalend
826344dece2Fix SHRINE-3677 by getting the username and domain alligned.
marc-daniemarc-danie
b29fb64e7faMerge remote-tracking branch 'origin/2.0-webclient' into 2.0-webclient
marc-daniemarc-danie
d19c19dbf7drenamed runQuery to startQuery
mjdiloretomjdiloreto
78e1f57bf72Merge 2.0-webclient with bugfix/SHRINE2020-102-move-query-definition-structure
bcarmenbcarmen
6827c699a8dincreased font size of title
bcarmenbcarmen
22afc44e932suggested color changes from Griffin
bcarmenbcarmen
3f90b1299ebMerge branch '2.0-webclient' of https://open.med.harvard.edu/stash/scm/shrine/shrine into 2.0-webclient
bcarmenbcarmen
13ae9bf8e5dfixed prop types
Marc-Danie NazaireMarc-Danie Nazaire
dc24b5a251fMerge pull request #767 in SHRINE/shrine from feature/SHRINE2020-83-client-side-extract-query-id to 2.0-webclient * ...
marc-daniemarc-danie
77c33c9c54aMapped ontology terms with Multiple visual attribute to the Leaf concept type
marc-daniemarc-danie
ac7f82329bfSHRINE-3618 - Move dashboard javascript to the dashboard service back-end code - removed the build file
marc-daniemarc-danie
3545817735aSHRINE-3618 - Move dashboard javascript to the dashboard service back-end code
mjdiloretomjdiloreto
55041abc13fMerge branch '2.0-webclient' of https://open.med.harvard.edu/stash/scm/shrine/shrine into 2.0-webclient
mjdiloretomjdiloreto
1278a3f2871Change npm build to isntall dev dependencies before testing.
bcarmenbcarmen
cc42eb09152Merge branch '2.0-webclient' of https://open.med.harvard.edu/stash/scm/shrine/shrine into 2.0-webclient
bcarmenbcarmen
c56980a257fchanges per style session w Anupama and Matt
mjdiloretomjdiloreto
ddb54cf5acdAdd polyfill for array.prototype.flatMap as dev dependency so tests don't break.
mjdiloretomjdiloreto
4cbe85dcf96Hardcode ontology search filters for demo.
marc-daniemarc-danie
b2556068414SHRINE2020-83 - Client side: Extract query ID from JSON (instead of XML) - renamed runQuery api call to startQuery an...
mjdiloretomjdiloreto
b743ef505b9Previous help text change added to new help text.
mjdiloretomjdiloreto
1f2ab24fb70Merge branch '2.0-webclient' of https://open.med.harvard.edu/stash/scm/shrine/shrine into 2.0-webclient
bcarmenbcarmen
7c191b63e9efixed snapshots
bcarmenbcarmen
f840eb1e4fdui changes per story grooming
mjdiloretomjdiloreto
49c592424b3Added Help text back to root document for demo.
bcarmenbcarmen
44ef85365c0Merge branch '2.0-webclient' of https://open.med.harvard.edu/stash/scm/shrine/shrine into 2.0-webclient
bcarmenbcarmen
dee92febb53made header text consistent
mjdiloretomjdiloreto
bea665c2f3fAdd png ACT logo.
marc-daniemarc-danie
d9598308ebcremoved commented out lines
marc-daniemarc-danie
fb7d0e91c3aMerge branch '2.0-webclient' of https://open.med.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-83-clien...
marc-daniemarc-danie
e06bd88da6fSHRINE2020-83 - Client side: Extract query ID from JSON (instead of XML) - Added unit tests
marc-daniemarc-danie
aff1badb5baMerging changes from 2.0-webclient branch
mjdiloretomjdiloreto
c93c4550929Merge branch '2.0-webclient' with bugfix/SHRINE2020-102-move-query-definition-structure
bcarmenbcarmen
2dacc003ec4merge
bcarmenbcarmen
0cc853c1086merge of 2.0-webclient
marc-daniemarc-danie
c35ccd018c2SHRINE2020-83 - Client side: Extract query ID from JSON (instead of XML) - made networkId a string in the response to...
Ben CarmenBen Carmen
a2411b87e32Merge pull request #764 in SHRINE/shrine from task/SHRINE2020-111-global-ontology-state to 2.0-webclient * commit '1...
bcarmenbcarmen
1bae76ba024merge of 2.0-webclient
marc-daniemarc-danie
505fc96b925made the order of the root folder alphabetic and fixed naming of the root folder Laboratory Test
mjdiloretomjdiloreto
ab8ae4d4dacChange action creators to declare argument names and use payload attribute.
marc-daniemarc-danie
c1fb08e2b04Merge remote-tracking branch 'origin/2.0-webclient' into 2.0-webclient
marc-daniemarc-danie
915fe03a4barenamed concept_category to codeCategory
bcarmenbcarmen
52be5cb8506updated snapshot test.
bcarmenbcarmen
6565e249ac9text change.
bcarmenbcarmen
3028317d794saving merge of 2.0-webclient
bcarmenbcarmen
8c8388c8bf2fixed unit test
bcarmenbcarmen
9da124cec9bfixed styles.
bcarmenbcarmen
085298e7cc5Merge branch '2.0-webclient' of https://open.med.harvard.edu/stash/scm/shrine/shrine into 2.0-webclient
bcarmenbcarmen
a375ba15dbbui tweaks and update of snapshot tests
bcarmenbcarmen
258bb9b2774Merge branch 'UI-Tweaks' into 2.0-webclient
bcarmenbcarmen
49b6618ea36saving work
Marc-Danie NazaireMarc-Danie Nazaire
5d89f2133b6Merge pull request #763 in SHRINE/shrine from feature/SHRINE2020-110-modify-structure-of-json-response to 2.0-webclie...
Ben CarmenBen Carmen
0b6dd88ef72Merge pull request #766 in SHRINE/shrine from feature/SHRINE2020-75-category-folders to 2.0-webclient * commit '15ee...
mjdiloretomjdiloreto
b767e0560a8Styling changes from BA review.
bcarmenbcarmen
9572d166de7saving work
bcarmenbcarmen
203806b47f6saving work
marc-daniemarc-danie
9b96890c2d9SHRINE2020-83 - Client side: Extract query ID from JSON (instead of XML)
mjdiloretomjdiloreto
e41e18ed534Changes to queryDefinitionView from BA review.
mjdiloretomjdiloreto
9247e84e2fbChanges to ACT logo from BA review.
bcarmenbcarmen
15ee07a2493Added Concept Categories
bcarmenbcarmen
9c9bc44e77csaving work
mjdiloretomjdiloreto
7899c08ed47Changes from code review.
David WalendDavid Walend
de575213a83Merge pull request #761 in SHRINE/shrine from feature/SHRINE-3423-with-scala-2.12-use-eithers-in to develop * commit...
mjdiloretomjdiloreto
090f6334c15Updated tests with the state of progress.
bcarmenbcarmen
1ad61af3622added prop types
bcarmenbcarmen
53cad4a3e26added unit tests for saga and reducer
marc-daniemarc-danie
e8058ad0700SHRINE2020-110 - Modify structure of JSON response ontology/root and ontology/children apis calls - code review changes
David WalendDavid Walend
8c15abf86baMerge pull request #762 in SHRINE/shrine from feature/SHRINE-3378-remove-jerseyclientexecutioncontext to develop * c...
bcarmenbcarmen
5aadf8d8d8dsaving work
Ben CarmenBen Carmen
3088fc41e60Merge pull request #758 in SHRINE/shrine from feature/SHRINE2020-93-mui-concepts-panel to 2.0-webclient * commit '19...
marc-daniemarc-danie
073de5bab94SHRINE2020-110 - Modify structure of JSON response ontology/root and ontology/children apis calls
mjdiloretomjdiloreto
f355adacaf4Added unit test for queryDefinitionReducer.
David WalendDavid Walend
04baafb03c3Merge pull request #756 in SHRINE/shrine from feature/SHRINE-3575-remove-i2b2workarounds-object to develop * commit ...
dwalenddwalend
3091346d7a4Removed the jersey client context now that the jersey client is gone for SHRINE-3378
dwalenddwalend
2ae2cced176Using 2.12 for-comprehension for Either for SHRINE-3423
mjdiloretomjdiloreto
43522b55ecfFinish hooking up QueryDefinitionContainer to redux.
dwalenddwalend
6ca4300b83aPR recommendations for SHRINE-3575
bcarmenbcarmen
dd3788cc330saving work
dwalenddwalend
edd2c368d32Merge branch 'develop' into feature/SHRINE-3575-remove-i2b2workarounds-object
mjdiloretomjdiloreto
e24b7c4a92fHooked up QueryDefinitionContainer to queryDefinition reducer.
mjdiloretomjdiloreto
78c75369542Created reducer and actions for query definition.
bcarmenbcarmen
3b4c0c12982Merge branch '2.0-webclient' of https://open.med.harvard.edu/stash/scm/shrine/shrine into 2.0-webclient
bcarmenbcarmen
952000e2f15fixed prop type
bcarmenbcarmen
525a63afdb7update of background color of the header
David WalendDavid Walend
e9fb670e6e5Merge pull request #759 in SHRINE/shrine from bugfix/SHRINE-3424-remove-remotesites-in-the-cert to develop * commit ...
Ben CarmenBen Carmen
7742652ea39Merge pull request #757 in SHRINE/shrine from add-polling-back-in to 2.0-webclient * commit '4d7ba13a6593cba60957a06...
dwalenddwalend
dc1fc665b07Removed the unused remoteSites structures for SHRINE-3424
Matthew DiLoretoMatthew DiLoreto
b1efc1d8a75Merge pull request #755 in SHRINE/shrine from feature/SHRINE2020-103-replace-the-harvard-catalyst to 2.0-webclient *...
bcarmenbcarmen
1975cd4c7d2removed ^ from package dependencies
mjdiloretomjdiloreto
7d2c7da9559Modified query definition help text to fit BA requirements (with Tooltip component).
bcarmenbcarmen
0e2526d48f7added mui lab dependencu
bcarmenbcarmen
cd27993113bMerge branch '2.0-webclient' into feature/SHRINE2020-93-mui-concepts-panel
bcarmenbcarmen
1fd3b7ee709updated snapshot
bcarmenbcarmen
9711aeb2c18Potential solution for moving ontology view into MUI
bcarmenbcarmen
4d7ba13a659removing unused files
bcarmenbcarmen
0378e319071Fix of query polling
dwalenddwalend
726fd342311Merge remote-tracking branch 'origin/develop' into feature/SHRINE-3575-remove-i2b2workarounds-object
dwalenddwalend
d83dda1be26Removed the I2b2Workarounds class for SHRINE-3575
David WalendDavid Walend
caa6469fdb0Merge pull request #753 in SHRINE/shrine from bugfix/SHRINE-3636-drop-shrine_query_history-hub to develop * commit '...
mjdiloretomjdiloreto
05f7eadc40aSHRINE2020-103 changed Harvard Catalyst Logo to ACT logo.
David WalendDavid Walend
630796326d6Merge pull request #749 in SHRINE/shrine from bugfix/SHRINE-3662-clean-out-most-top-level-dependencies to develop * ...
bcarmenbcarmen
9b3a5cddbc9saving work
Matthew DiLoretoMatthew DiLoreto
01b19dba312Merge pull request #752 in SHRINE/shrine from bugfix/SHRINE2020-104-or-text-is-missing to 2.0-webclient * commit '74...
dwalenddwalend
5b1cc89cfbfReview changes for SHRINE-3636
dwalenddwalend
4995ed36534Merge branch 'develop' into bugfix/SHRINE-3636-drop-shrine_query_history-hub
dwalenddwalend
b79732aafe9Had to reopen SHRINE-3622. That new database driver needs some more settings.
dwalenddwalend
1ee836739dcMerge branch 'develop' into bugfix/SHRINE-3662-clean-out-most-top-level-dependencies
David WalendDavid Walend
4b2d24ade68Merge pull request #750 in SHRINE/shrine from feature/SHRINE-3640-remove-dashboard-app-and-steward-app to develop * ...
dwalenddwalend
24619c897b3Moved pom.xml version to 2.1.0-M4
bcarmenbcarmen
50e24a2657echanged tab header
bcarmenbcarmen
5a18bac9151saving work
dwalenddwalend
1031b406da4Looks like there's no love for if exists clauses in mssql and oracle - for SHRINE-3636
mjdiloretomjdiloreto
74f681d5bb8SHRINE2020-104 fix QueryTermViews to display or when they are not the first in the list.
dwalenddwalend
80bb7a5e32eDropped the unused HUB tables for SHRINE-3636 - also makes SHRINE-2711 irrelevant
Matthew DiLoretoMatthew DiLoreto
a7ff72eb65eMerge pull request #748 in SHRINE/shrine from feature/SHRINE2020-92-implement-material-ui-framework to 2.0-webclient ...
marc-daniemarc-danie
28e272ee2e8SHRINE2020-80 - Client side representation of query in JSON - Updated category definition file path names to start wi...
Marc-Danie NazaireMarc-Danie Nazaire
dc5db00267dMerge pull request #747 in SHRINE/shrine from feature/SHRINE2020-80-client-side-representation to 2.0-webclient * co...
marc-daniemarc-danie
ac6b63ff35dSHRINE2020-80 - Client side representation of query in JSON - Minor change to log message
marc-daniemarc-danie
ac229c8da02SHRINE2020-80 - Client side representation of query in JSON - Modified to return Bad Request response when there was ...
dwalenddwalend
8176890156cDeleted all the non-javscript stuff in the soon-to-be-abandoned dashboard and steward app directories for SHRINE-3640
dwalenddwalend
6c263c6f18bRemoved some more old cruft from the top-level pom.xml for SHRINE-3662
marc-daniemarc-danie
02b021c7c1eSHRINE2020-80 - Client side representation of query in JSON - Added ticket numbers in comments for temporary code
marc-daniemarc-danie
cf726ccc74aSHRINE2020-80 - Client side representation of query in JSON - Added ticket numbers in comments for temporary code
dwalenddwalend
b033680870aRemoved a lot of top-level maven boilerplate and made dependencies more precise for SHRINE-3662
mjdiloretomjdiloreto
7ad00ac6b53SHRINE2020-92 changes based on review.
bcarmenbcarmen
433295e811csaving work
marc-daniemarc-danie
4937aa5ff5fSHRINE2020-80 - Client side representation of query in JSON - minor code cleanup
marc-daniemarc-danie
433a10db8e2SHRINE2020-80 - Client side representation of query in JSON - Updated topic name to match what is on 2020 servers
mjdiloretomjdiloreto
d0ff07aaa17SHRINE2020-92 refactored inclusion/exclusion panel to use material ui.
marc-daniemarc-danie
2f8ef304d21Merge branches '2.0-webclient' and 'feature/SHRINE2020-80-client-side-representation' of https://open.med.harvard.edu...
bcarmenbcarmen
4f5323ef25afix of failing snapshot test.
Matthew DiLoretoMatthew DiLoreto
cf77776333fMerge pull request #743 in SHRINE/shrine from bugfix/SHRINE-2650-Alpha-sort-breakdown to develop * commit 'df19613d5...
marc-daniemarc-danie
c120e7fcab8Merge branches '2.0-webclient' and 'feature/SHRINE2020-80-client-side-representation' of https://open.med.harvard.edu...
David WalendDavid Walend
8ab4a4edbcaMerge pull request #746 in SHRINE/shrine from bugfix/SHRINE-3648-request-to-run-a-query-never to develop * commit '7...
bcarmenbcarmen
f2a1c038412Merge branch '2.0-webclient' into feature/SHRINE2020-93-mui-concepts-panel
bcarmenbcarmen
52f4435465bsaving work
Ben CBen C
f06cb38f1dacommit of .gitfile
marc-daniemarc-danie
59ff253653eSHRINE2020-80 - Client side representation of query in JSON
Ben CarmenBen Carmen
6b8394d1847Merge pull request #745 in SHRINE/shrine from feature/SHRINE2020-71-mui-header to 2.0-webclient * commit '03505bc1f6...
dwalenddwalend
738d50f9459Better log message and upgrade to http4s for SHRINE-3676
bcarmenbcarmen
03505bc1f6eincorporated changes from code review
dwalenddwalend
80cac869073Merge remote-tracking branch 'origin/develop' into bugfix/SHRINE-3648-request-to-run-a-query-never
Matthew DiLoretoMatthew DiLoreto
0ee542e6591Merge pull request #742 in SHRINE/shrine from bugfix/SHRINE-3606-Add-unit-test-to-adapterMappingsDbTest-to-test-selec...
David WalendDavid Walend
69bd74cedf0Merge pull request #741 in SHRINE/shrine from bugfix/SHRINE-3650-don-t-write-the-sent-to-adapters to develop * commi...
bcarmenbcarmen
a07a5da8a1eadded header.
dwalenddwalend
9e2dd8d0855Merge branch 'bugfix/SHRINE-3650-don-t-write-the-sent-to-adapters' into bugfix/SHRINE-3648-request-to-run-a-query-never
bcarmenbcarmen
9d89ae2dc06saving changes
bcarmenbcarmen
9a0a4d951f8functioning header
Matthew DiLoretoMatthew DiLoreto
8c1cd4a9cd8Merge pull request #736 in SHRINE/shrine from bugfix/SHRINE-3637-Cleanup-wildcard-import-of-duration to develop * co...
Matthew DiLoretoMatthew DiLoreto
a3dbaba6022Merge pull request #737 in SHRINE/shrine from bugfix/SHRINE-3620-Exclude-Log-as-the-source-of-a-log-entry to develop ...
bcarmenbcarmen
d0d5ba144c7Changes based on BA review
bcarmenbcarmen
835210b2e30Merge branch 'feature/SHRINE2020-31-display-validation-errors-for-group-date-ranges' into 2.0-webclient
bcarmenbcarmen
794bf9ff6b9changes based on UAT
dwalenddwalend
2d28d07f427Matt's review - comment fixes for SHRINE-3650
Matthew DiLoretoMatthew DiLoreto
8f694329ba0Merge pull request #744 in SHRINE/shrine from bugfix/SHRINE-1471-Incorrect-spelling-of-occurrence to develop * commi...
dwalenddwalend
efdf87feb94Merge branch 'bugfix/SHRINE-3650-don-t-write-the-sent-to-adapters' of https://open.med.harvard.edu/stash/scm/shrine/s...
bcarmenbcarmen
f7f125c12bfalmost working/refactor
mjdiloretomjdiloreto
88aa4eade34Fix typo in web client.
Ben CarmenBen Carmen
cde7f3dd19fMerge pull request #740 in SHRINE/shrine from feature/SHRINE2020-31-display-validation-errors-for-group-date-ranges t...
Matthew DiLoretoMatthew DiLoreto
124baea74d5Merge pull request #735 in SHRINE/shrine from bugfix/SHRINE-3580-Store-Shrine-Ontology-Metadata to develop * commit ...
dwalenddwalend
995df8b0eacMaking a few attempts to send a message to the adapters before giving up. SHRINE-3650
Marc-Danie NazaireMarc-Danie Nazaire
5c8e98f76f9Merge pull request #739 in SHRINE/shrine from feature/SHRINE2020-89-ontology-terms-should-be-displayed to 2.0-webclie...
mjdiloretomjdiloreto
d4eed4cff30Added ignored unit test for testing adapter mappings with real ontology terms.
mjdiloretomjdiloreto
df19613d5abUse alphanumeric sort to sort QEP breakdown names and type names.
mjdiloretomjdiloreto
459a1ea22d4Rename update sql script names to make automation easier.
bcarmenbcarmen
ffb25d306c1updated snapshot
bcarmenbcarmen
c3bcff2b3c3potential solution for date range validation
marc-daniemarc-danie
6ffe9cb1c90Fixed broken test
mjdiloretomjdiloreto
8db5100965eChanged confusing variable name.
bcarmenbcarmen
a375607ddf8potential solution for date range validation
marc-daniemarc-danie
f84b760e890Merge branches '2.0-webclient' and 'feature/SHRINE2020-89-ontology-terms-should-be-displayed' of https://open.med.har...
marc-daniemarc-danie
184d86ee77cSHRINE2020-89 - Ontology terms should be displayed in the same order as ACT 2.0 prod (alphabetically)
mjdiloretomjdiloreto
53739e7fa12Created unit test for alphanumeric sort.
mjdiloretomjdiloreto
ed1d6240881Create sort function for alpha-numeric strings
Ben CarmenBen Carmen
bc50a757ffeMerge pull request #738 in SHRINE/shrine from feature/SHRINE2020-80-query-object to 2.0-webclient * commit '90f02386...
dwalenddwalend
0d325699249Merge remote-tracking branch 'origin/develop' into bugfix/SHRINE-3650-don-t-write-the-sent-to-adapters
bcarmenbcarmen
90f0238694fremoved unwanted spaces
bcarmenbcarmen
129093a3a8bsaving updated snapshot
bcarmenbcarmen
7a2f6fcb571saving work
bcarmenbcarmen
5496547a609Unblock Marc Danie
dwalenddwalend
9098a300af5Merge branch 'develop' into bugfix/SHRINE-3650-don-t-write-the-sent-to-adapters
dwalenddwalend
296deb5ac77Chaser - missed pom.xml dependencies on the deleted shrine-client
dwalenddwalend
4263400f3fbMerge remote-tracking branch 'origin/develop' into bugfix/SHRINE-3650-don-t-write-the-sent-to-adapters
mjdiloretomjdiloreto
069ff8741e1Add unit test for every possibility to reload mappings. Rename adapterAuditDb update sql scripts.