SHRINE
  1. SHRINE

shrine

Public
  1. SHRINE
  2. shrine

All Branches Graph  

        
AuthorCommitMessageCommit dateBuilds
dwalenddwalend
dbc273501beCreated the queue for a new node for SHRINE-3481
Ben CBen C
bec6e3e0acasaving work
Ben CBen C
cfa57055920saving latest
Ben CBen C
29c0af83c92Saving change from npm install to npm ci in readme.
marc-daniemarc-danie
d1996218005Update POM version from 1.26.7.7-SNAPSHOT to 1.26.7.8-SNAPSHOT again
Ben CBen C
ee4c561a6b8Updated package-lock.json, utilized npm ci instead of npm install in build-prod, code cleanup and updated snapshot
Ben CBen C
6c567c94630updated .gitignore, package-lock.json and replaced npm install with npm ci in the build
Bill SimonsBill Simons
c105386fb04Include shrine-webclient-legacy in the shrine-api.war build
Ben CBen C
bd623e49ec6Fix of snapshot test.
Ben CBen C
f03f49ba117Added snapshot for SelectedQuery.spec.js
marc-daniemarc-danie
2b98ff2f1d3Reverting POM version from 1.26.7.8-SNAPSHOT back to 1.26.7.7-SNAPSHOT
Ben CBen C
3aafc34a7f4added package-lock.json to test out build
Ben CBen C
e628c813d2eremoed package-lock.json, it should be git ignored.
Ben CBen C
d8e27db3cb0saving work
marc-daniemarc-danie
cca8574d957Update POM version from 1.26.7.7-SNAPSHOT 1.26.7.8-SNAPSHOT
Marc-Danie NazaireMarc-Danie Nazaire
f7b4b794630Merge pull request #594 in SHRINE/shrine from bugfix/SHRINE-3468-log-more-details-about-problems to release/1.26.7 *...
marc-daniemarc-danie
6dc90fc28f4SHRINE-3468 - Log more details about problems in the keystore - fixed assignment of problem
David WalendDavid Walend
534a0f6356dMerge pull request #595 in SHRINE/shrine from bugfix/SHRINE-3472-stack-trace-on-shrine-qa3-stops to release/1.26.7 *...
Ben CBen C
8457ed8dee6saving work
dwalenddwalend
6d2d9c431a8OK to retry some Api tasks, too for SHRINE-3472
marc-daniemarc-danie
a7181ba60a3SHRINE-3468 - Log more details about problems in the keystore - removed unused problem
marc-daniemarc-danie
3747883b72fSHRINE-3468 - Log more details about problems in the keystore - replaced for comprehension with folds and renamed Cou...
marc-daniemarc-danie
3eaa0d93a65SHRINE-3468 - Log more details about problems in the keystore
Marc-Danie NazaireMarc-Danie Nazaire
9c560f87486Merge pull request #592 in SHRINE/shrine from feature/SHRINE-3371-use-net.shrine.problem.jsonproblemdigest to release...
Marc-Danie NazaireMarc-Danie Nazaire
28ab4729d6eMerge pull request #593 in SHRINE/shrine from feature/SHRINE-3097-serve-shrine-webclient-from-root-shrine-webclient t...
marc-daniemarc-danie
cec323441f1SHRINE-3097 - examples of setting up Tomcat Rewrite Rules - changed the key alias to match what is in the installati...
marc-daniemarc-danie
5b44241b6fcSHRINE-3097 - examples of setting up Tomcat Rewrite Rules
marc-daniemarc-danie
1c173762a02SHRINE-3371 - Use net.shrine.problem.JsonProblemDigest in QepService instead of ProblemDigestForJson - minor edit to ...
marc-daniemarc-danie
f23bbef0a5bSHRINE-3371 - Use net.shrine.problem.JsonProblemDigest in QepService instead of ProblemDigestForJson
David WalendDavid Walend
09381e579abMerge pull request #589 in SHRINE/shrine from bugfix/SHRINE-3474-key-off-of-the-shrinedatabasetype to release/1.26.7 ...
David WalendDavid Walend
f9a17b78ecaMerge pull request #591 in SHRINE/shrine from bugfix/SHRINE-3076-remove-rapture-dependencies to release/1.26.7 * com...
Ben CBen C
fdbdd0ed687Fixed a failing snapshot test
Ben CBen C
a0ea5d611a1Merge of release/ 1.26.7
Ben CBen C
f6d918a1c99saving work
dwalenddwalend
600aa28c5d6Removed rapture dependencies for SHRINE-3076
Marc-Danie NazaireMarc-Danie Nazaire
0e003343713Merge pull request #590 in SHRINE/shrine from feature/SHRINE-3475-create-defaults-for-the-connectivity to release/1.2...
Marc-Danie NazaireMarc-Danie Nazaire
d157fd23684Merge pull request #587 in SHRINE/shrine from bugfix/SHRINE-3467-if-a-response-from-the-i2b2-pass-through to release/...
marc-daniemarc-danie
bb8a3f83220SHRINE-3475 - Create defaults for the connectivity test config properties
marc-daniemarc-danie
a350c092814SHRINE-3475 - Create defaults for the connectivity test config properties
marc-daniemarc-danie
cef2ae12676SHRINE-3467 - If a response from the i2b2 pass-through service contains an ERROR anywhere, log it in shrine-api.log
dwalenddwalend
bf8f1d875f7Better handling of the slick driver for SHRINE-3474
Ben CBen C
555d2f7fdceDeleted all yarn and npm lock files and made sure they are .gitignored.
Ben CBen C
33c65b7ce60saving changes to branch
marc-daniemarc-danie
f028296a021Merge branch 'release/1.26.7' of https://open.med.harvard.edu/stash/scm/shrine/shrine into bugfix/SHRINE-3467-if-a-re...
Marc-Danie NazaireMarc-Danie Nazaire
c5ebbf91bcdMerge pull request #588 in SHRINE/shrine from bugfix/SHRINE-3473-webclient-previous-queries-burns to release/1.26.7 ...
marc-daniemarc-danie
dd34bd8f302SHRINE-3473 - Webclient: Previous Queries: Burns query: Previous query entry is getting bold in every 15sec even when...
Ben CBen C
944e155b2e4Saving css work
dwalenddwalend
45e540a5eb1Moved configObject to ConfigExtensions for SHRINE-3474
marc-daniemarc-danie
9bcd848a1e7SHRINE-3467 - If a response from the i2b2 pass-through service contains an ERROR anywhere, log it in shrine-api.log
Ben CBen C
7e12382e198Merge branch '2.0-webclient' into 2.0-webclient-sandbox
dwalenddwalend
3279981a975Merged the lastest QA pass to develop
Ben CBen C
c307eb1a959cleanup of spec
dwalenddwalend
64736d446bdMerge branch 'release/1.26.7' into develop
dwalenddwalend
3d16c7c75dfDodging conflict before merge
Ben CBen C
8a9ba95df16finished unit tests for fetchQueryUpdateSaga
dwalenddwalend
c91a7bea31bMoved to 1.26.7.7-SNAPSHOT
dwalenddwalend
82f5aeac9adComment planning for SHRINE-3468
Ben CBen C
449d668164cUpdate of fetch sagas
Ben CarmenBen Carmen
f72cfc7d90bMerge pull request #586 in SHRINE/shrine from bugfix/SHRINE-3469-status-spacing to release/1.26.7 * commit '22cd1da1...
Ben CBen C
22cd1da16f7Fix of CSS to spacing
Ben CBen C
8f45ff1d306merge local changes
Ben CBen C
a72e1db449cMerge of release/1.26.7 into v1
Ben CarmenBen Carmen
64c0e8893d6Merge pull request #585 in SHRINE/shrine from SHRINE-3466/show-modified-terms to release/1.26.7 * commit 'b9cde25359...
Ben CBen C
b9cde253594Potential fix for modifier icon.
Ben CarmenBen Carmen
30f21521b35Merge pull request #584 in SHRINE/shrine from bugfix/SHRINE-3268-drop-the-dashboard-to-dashboard to release/1.26.7 *...
Ben CBen C
2f47d689176Changed to speciic version of http-server
Ben CBen C
a0b9b5a15d1Swapped out http-server for gulp.
David WalendDavid Walend
13f0e7537b0Merge pull request #582 in SHRINE/shrine from bugfix/SHRINE-3460-remove-put-in-default-values to release/1.26.7 * co...
Ben CBen C
189d4effc6fSave change to sidebar to remove Dashboard to Dashboard.
dwalenddwalend
a68969c6a8dMarc-Danie is a steely-eyed missileer and I tried to fix this too fast.
dwalenddwalend
f213bb1f59dMarc-Danie is a steely-eyed missileer.
Marc-Danie NazaireMarc-Danie Nazaire
415d768f1f8Merge pull request #583 in SHRINE/shrine from bugfix/SHRINE-3303-off-by-millisecond-comparison to release/1.26.7 * c...
Marc-Danie NazaireMarc-Danie Nazaire
1ebdaab27cbMerge pull request #581 in SHRINE/shrine from bugfix/SHRINE-3464-webclient-previous-queries-the to release/1.26.7 * ...
dwalenddwalend
c6165e5583dAfter merging 1.26.7.6-SNAPSHOT
dwalenddwalend
e6c93b39697Merge remote-tracking branch 'origin/release/1.26.7' into develop
dwalenddwalend
b144585f1f8Before merging 1.26.7.6-SNAPSHOT
marc-daniemarc-danie
7f75eb88052SHRINE-3303 - off-by-millisecond comparison in a QEP database test
dwalenddwalend
f2aa56e571fVastly simplified the hub node example config file for SHRINE-3460
marc-daniemarc-danie
923ed8ef2bcSHRINE-3464 - Webclient: Previous Queries: The completed and checked previous queries are getting bold again on editi...
dwalenddwalend
c2e15282511Vastly simplified the downstream node example file for SHRINE-3460
Ben CBen C
d56f72dcd13Selected Query Reducer unit test.
Marc-Danie NazaireMarc-Danie Nazaire
d497dc99ee0Merge pull request #577 in SHRINE/shrine from bugfix/SHRINE-3459-webclient-query-status-the-completed to release/1.26...
Marc-Danie NazaireMarc-Danie Nazaire
117bf176053Merge pull request #580 in SHRINE/shrine from bugfix/SHRINE-3453-stack-trace-if-no-network-health to release/1.26.7 ...
Marc-Danie NazaireMarc-Danie Nazaire
cf9e377d082Merge pull request #578 in SHRINE/shrine from bugfix/SHRINE-2470-pull-out-changes-for-shrine-2468 to release/1.26.7 ...
Ben CarmenBen Carmen
18e25645df7Merge pull request #579 in SHRINE/shrine from bugfix/SHRINE-3459-completed-status-showing-as-red-text to release/1.26...
marc-daniemarc-danie
5ddbfee956aSHRINE-3453 - Stack trace if no network health test is set up on the hub
Ben CBen C
fbe35b27b82Indicate error in breakdowns if isQueryError or isResults error are true.
Ben CBen C
23c1c191985removed accidental auto import
Ben CBen C
50ba1294f7aReplace isError with isQueryError and isResultsError
marc-daniemarc-danie
e97b750c9e3SHRINE-2470 - Pull out changes for SHRINE-2468 when the adapter can push QUEUED results from the CRC
marc-daniemarc-danie
b78cf61722eSHRINE-3459 - Webclient: Query Status: The "Completed" status is appearing in red color when all the nodes are coming...
marc-daniemarc-danie
3dccdfc4b37Merge with 1.26.7 branch
marc-daniemarc-danie
6a7f88896b2SHRINE-3459 - Webclient: Query Status: The "Completed" status is appearing in red color when all the nodes are coming...
Marc-Danie NazaireMarc-Danie Nazaire
3fe92459de1Merge pull request #576 in SHRINE/shrine from feature/SHRINE-3457-keep-polling-if-any-queries-visible to release/1.26...
marc-daniemarc-danie
af479f7ca1eSHRINE-3459 - Webclient: Query Status: The "Completed" status is appearing in red color when all the nodes are coming...
Ben CBen C
8ab58240353saving work to finish up selectedQueryReducer
marc-daniemarc-danie
2a190a42ffaSHRINE-3457 - Keep polling if any queries visible in previous queries are not yet completed - removed old comment
marc-daniemarc-danie
d860e2e67b9SHRINE-3457 - Keep polling if any queries visible in previous queries are not yet completed
Ben CBen C
8faa6784280Unit tests for allQueriesReducer
Ben CBen C
31fecf80483Saving work.
Marc-Danie NazaireMarc-Danie Nazaire
afb0a386326Merge pull request #575 in SHRINE/shrine from bugfix/SHRINE-3458-queries-in-submitted-state-are to release/1.26.7 * ...
marc-daniemarc-danie
c98d7e296c2SHRINE-3458 - Queries in submitted state are returning isError= true in response
dwalenddwalend
55bc26dd4c7Moved version number to 1.26.7.6-SNAPSHOT
Marc-Danie NazaireMarc-Danie Nazaire
f5a0e0c00ceMerge pull request #574 in SHRINE/shrine from bugfix/SHRINE-3455-misleading-error-details-for to release/1.26.7 * co...
Ben CarmenBen Carmen
0e88a6cfec7Merge pull request #573 in SHRINE/shrine from bugfix/SHRINE-3399-show-updated-date-in-query-viewer to release/1.26.7 ...
marc-daniemarc-danie
a41b87b489cSHRINE-3455 - Misleading error details for the query when all results are errors.
Ben CBen C
986d26ee9adPotential fix of 'updated' field in Query Viewer.
Ben CBen C
8857c112bfdsaving progress
David WalendDavid Walend
1124685a486Merge pull request #572 in SHRINE/shrine from bugfix/SHRINE-3191-be-sure-shrine-can-shut-down to release/1.26.7 * co...
Marc-Danie NazaireMarc-Danie Nazaire
0631e11e7beMerge pull request #571 in SHRINE/shrine from bugfix/SHRINE-3435-bolding-previously-observed-queries to release/1.26....
Ben CBen C
cfada21db2aCompleted unit tests of status components
dwalenddwalend
d0d50cc22d4Merge remote-tracking branch 'origin/release/1.26.7' into bugfix/SHRINE-3191-be-sure-shrine-can-shut-down
dwalenddwalend
8868bb938cdDidn't solve the mystery of SHRINE-3191, but did a lot of other good things.
marc-daniemarc-danie
edc30c61890SHRINE-3435 - Bolding previously observed queries is inconsistent - fix issue with differences in ordering of query r...
Ben CBen C
905e472d665fix of misspelled unit test.
Ben CarmenBen Carmen
8eb05dc9343Merge pull request #569 in SHRINE/shrine from bugfix/SHRINE-3452--breakdown-text-on-network-error to release/1.26.7 ...
Ben CarmenBen Carmen
cf988f6468dMerge pull request #570 in SHRINE/shrine from bugfix/SHRINE-3450-webclient-query-status-network to release/1.26.7 * ...
Ben CBen C
bf1f4701a7eFix of spelling error
Ben CBen C
877d1f9eaffPotential fix of isError issue when a network error occurs.
marc-daniemarc-danie
0ee5e0a04bcSHRINE-3450 - Webclient: Query Status: 'Network Error' text is not appearing in red font color and also the link to c...
Ben CBen C
923390ff224Potential fix for breakdown message on network error.
Ben CarmenBen Carmen
8ae3072450eMerge pull request #568 in SHRINE/shrine from bugfix/red-dots-not-showing-up to release/1.26.7 * commit '333f37164d6...
Ben CBen C
1fb328d22acUnit tests for Status components
David WalendDavid Walend
66bcf887c2bMerge pull request #567 in SHRINE/shrine from feature/SHRINE-3099-rethink-delayresponse-testing to release/1.26.7 * ...
David WalendDavid Walend
00417dd47faMerge pull request #566 in SHRINE/shrine from feature/SHRINE-3283-sort-nodes-by-name-in-json-for to release/1.26.7 *...
Ben CBen C
333f37164d6Fix of missing isError value
David WalendDavid Walend
91685318b95Merge pull request #564 in SHRINE/shrine from feature/SHRINE-2791-put-more-thoughts-on-envelopes to release/1.26.7 *...
David WalendDavid Walend
aa052153591Merge pull request #565 in SHRINE/shrine from feature/SHRINE-3289-remove-humanreadablenodename to release/1.26.7 * c...
dwalenddwalend
49b1c4d7b45Removed delayResponse property for SHRINE-3099
dwalenddwalend
2145eedd81fSorting nodes by name for the web API call from the hub for SHRINE-3283
dwalenddwalend
57ceee4fff9Removed humanReadableNodeName property for SHRINE-3289
David WalendDavid Walend
07ff1a33fd5Merge pull request #563 in SHRINE/shrine from feature/SHRINE-3312-have-the-qep-receive-updateresults to release/1.26....
dwalenddwalend
e13f63228eaAdded an understandsProtocol version to Node for future-proofing. Future code can provide a work-around for some hope...
dwalenddwalend
d88ed3feaabReset the version numbers for being on the wrong branch, should be all reverted
dwalenddwalend
030098bab78Revert "Added an understandsProtocol version to Node for future-proofing. Future code can provide a work-around for s...
dwalenddwalend
351c8332d33Revert "Moving release/1.26.7 to 1.26.7.5-SNAPSHOT" This reverts commit e081cc191f02adcd458fcadc3d22477935964abb.
dwalenddwalend
d6f2c475f5bAdded an understandsProtocol version to Node for future-proofing. Future code can provide a work-around for some hope...
dwalenddwalend
38d2d32c44aStray todo for SHRINE-3312
dwalenddwalend
edfe311a06dDecided to let results be the thing for SHRINE-3312, but cleaned out some todos.
dwalenddwalend
73b4bab84e9Setting the version to 1.27.1.1-SNAPSHOT
Ben CBen C
c91b093914fSaving work
dwalenddwalend
e081cc191f0Moving release/1.26.7 to 1.26.7.5-SNAPSHOT
dwalenddwalend
6ffe395b6dbSetting to the right version in the pom.xml files (1.26.7.4)
David WalendDavid Walend
a1139d98438Merge pull request #562 in SHRINE/shrine from feature/SHRINE-3446-attempts-to-run-queries-older to release/1.26.7 * ...
dwalenddwalend
e2fa7ffbc1aPolling for overdue results for SHRINE-3446
Ben CBen C
9af474db7e2Moved the POMs back to 1.26.7.4-SNAPSHOT
Ben CBen C
6f0326676e9Bumped POMs to 1.26.7.5-SNAPSHOT
Ben CBen C
22d3daf9e9asaving changes
Ben CarmenBen Carmen
d40fa1c89f0Merge pull request #560 in SHRINE/shrine from feature/SHRINE-3427-red-dot-for-isError to release/1.26.7 * commit 'ef...
David WalendDavid Walend
f12e9dc4d44Merge pull request #561 in SHRINE/shrine from bugfix/SHRINE-3427-if-all-results-are-errors-then to release/1.26.7 * ...
David WalendDavid Walend
50a2af5d626Merge pull request #559 in SHRINE/shrine from feature/SHRINE-3444-add-an-intermediate-state-before to release/1.26.7 ...
dwalenddwalend
182704c4e28Marc-Danie's review comments for SHRINE-3444
marc-daniemarc-danie
87385aecf11SHRINE-3427 - If all results are errors then the query should show a red circle in previous queries - removed all err...
marc-daniemarc-danie
f0cd566cd43SHRINE-3427 - If all results are errors then the query should show a red circle in previous queries - added isError f...
marc-daniemarc-danie
7ba6a743441Merge branch 'feature/SHRINE-3444-add-an-intermediate-state-before' of https://open.med.harvard.edu/stash/scm/shrine/...
Ben CBen C
8cb095f5f36A bit more space clearing for Query Definition
Ben CBen C
7dbdebe8885Refactored to make room for Query Builder
Ben CarmenBen Carmen
2c7d5219af0Merge pull request #558 in SHRINE/shrine from bugfix/SHRINE-3442-set-default-value-for-flagging-info-icon to release/...
Ben CBen C
ef7321177f3Use isError instead of status hokus pokus.
Ben CBen C
042e91a704aUtilize isError prop.
marc-daniemarc-danie
e5ff8d1a5c9Merge branch 'release/1.26.7' of https://open.med.harvard.edu/stash/scm/shrine/shrine into bugfix/SHRINE-3427-if-all-...
dwalenddwalend
23f661c9835Added new UI text for SHRINE-3444, and got it to show up everywhere
Marc-Danie NazaireMarc-Danie Nazaire
c792afa97d7Merge pull request #555 in SHRINE/shrine from feature/SHRINE-2973-document-new-shrine.conf-properties to release/1.26...
Ben CBen C
c1e3e72076badded default text to flagginIconInstructions in large shrine.conf
Ben CBen C
7d28cd2efffSaving changes
David WalendDavid Walend
aeab4b74335Merge pull request #557 in SHRINE/shrine from bugfix/SHRINE-3421-test-terms-with-two-interior to release/1.26.7 * co...
Ben CBen C
732ae678377Don't overuse context API
marc-daniemarc-danie
1e57621b97dSHRINE-2973 - Document new shrine.conf properties - Updated the comments
marc-daniemarc-danie
3f4831c28a7SHRINE-2973 - Document new shrine.conf properties - Reverted commenting out of entire networkHealth section and inste...
Ben CBen C
e4053c92d76Changed the default value flagginIconInstructions to "Flag a query"
Ben CBen C
31a52d51365Refactor of useEffect
dwalenddwalend
dd43745773fSHRINE-3421 - XML eats internal spaces in terms
Ben CBen C
3c4071d6094Fixed a useRef hook
David WalendDavid Walend
456558594dcMerge pull request #556 in SHRINE/shrine from bugfix/SHRINE-3406-stop-sending-queries-to-nodes to release/1.26.7 * c...
David WalendDavid Walend
3242259dda2Merge pull request #553 in SHRINE/shrine from bugfix/SHRINE-3407-webclient-running-a-query-with to release/1.26.7 * ...
dwalenddwalend
7d789d713e8Handled the no nodes configured to get queries problem mroe directly for SHRINE-3406 so that Isha can test network er...
dwalenddwalend
5837fe092feBack to standard pom.xml versions
Marc-Danie NazaireMarc-Danie Nazaire
2c916d6e4d4Merge pull request #554 in SHRINE/shrine from bugfix/SHRINE-3435-bolding-previously-observed-queries to release/1.26....
dwalenddwalend
35bfb039896Testing a -POSTFIX-SNAPSHOT postfix
dwalenddwalend
19959b79f6bTesting a not-SNAPSHOT postfix
marc-daniemarc-danie
338e286d453SHRINE-2973 - Document new shrine.conf properties
marc-daniemarc-danie
9e9707dbc6dSHRINE-3435 - Bolding previously observed queries is inconsistent
David WalendDavid Walend
2642edb5933Merge pull request #552 in SHRINE/shrine from bugfix/SHRINE-3430-fields-in-envelope-be-value to release/1.26.7 * com...
Ben CBen C
fb27e00b09fUnit tests for SelectedQuery related components
dwalenddwalend
4c9619c68aaRicher exceptin handling in the adapter for SHRINE-3407
Ben CBen C
75a2fb762efUnit test for SelectedQuery Component.
dwalenddwalend
e388037a35cDon't use value classes for envelopes. KISS SHRINE-3430
dwalenddwalend
4e9326b3c4fReset pom.xml versions