SHRINE
  1. SHRINE

shrine

Public
  1. SHRINE
  2. shrine

All Branches Graph  

        
AuthorCommitMessageCommit dateBuilds
David WalendDavid Walend
25b6f241bedMerge pull request #615 in SHRINE/shrine from bugfix/SHRINE-3526-shrine-s-queryresultpolling-web to release/1.26.7 *...
dwalenddwalend
97356b95690Marc-Danie's suggestion for SHRINE-3526
dwalenddwalend
c289b66e4a2Merge remote-tracking branch 'origin/release/1.26.7' into bugfix/SHRINE-3526-shrine-s-queryresultpolling-web
David WalendDavid Walend
7308edaaa25Merge pull request #612 in SHRINE/shrine from bugfix/SHRINE-3524-out-of-memory-because-too-many to release/1.26.7 * ...
mjdiloretomjdiloreto
a0b3facd09cMerge branch 'feature/SHRINE-3419-selectthenetworkio-call-should' of https://open.med.harvard.edu/stash/scm/shrine/sh...
mjdiloretomjdiloreto
36b81dbcfb3Refactor hubDb to throw an exception if no network found
mjdiloretomjdiloreto
580ae3f2660removed unnecessary change
mjdiloretomjdiloreto
89a099836c4remove web build which was accidentally added
Matthew DiLoretoMatthew DiLoreto
b425e803593Merge pull request #614 in SHRINE/shrine from bugfix/SHRINE-3273-add-custom-text-to-the-401-reply to develop * commi...
mjdiloretomjdiloreto
44b186b5539fixed the broken hub service
dwalenddwalend
83242b8e8f7Added limit on the number of queries returned for SHRINE-3526
dwalenddwalend
059c226e0f2Merge branch 'bugfix/SHRINE-3524-out-of-memory-because-too-many' into bugfix/SHRINE-3526-shrine-s-queryresultpolling-web
dwalenddwalend
68feccd390bI want to keep these, but get them to my new branch...
mjdiloretomjdiloreto
5f67b0af4efbroken tests
mjdiloretomjdiloreto
7e34c53f068refactor to throw an exception if no network found
Ben CBen C
10d350ed219Saving work.
mjdiloretomjdiloreto
183703755a8Changed 401 message and removed hardcoded test values.
Ben CBen C
dc7d58c89d6Merge branch '2.0-webclient' into feature/query-builder-2020
Ben CBen C
7d28f7d4c58Merge branch 'release/1.26.7' into 2.0-webclient
Ben CBen C
628cb93c0c3Fix of unit tests
David WalendDavid Walend
cc859478700Merge pull request #613 in SHRINE/shrine from bugfix/SHRINE-3525-log-on-shrine-scaleup-01-is-filling to release/1.26....
mjdiloretomjdiloreto
242ee87e5b8added custom message when BasicAuth returns 401 Unauthorized
Ben CBen C
c6a6c705ef6Saving updated snapshot tests
Ben CBen C
c66a02ba73eSaving Work
dwalenddwalend
e41105811d8A lot less logging for SHRINE-3525
dwalenddwalend
f0d522009d5A more efficient query for SHRINE-3524
Matthew DiLoretoMatthew DiLoreto
0b23b18e03fMerge pull request #611 in SHRINE/shrine from bugfix/SHRINE-3003-unify-the-http4s-bootstrap-code to develop * commit...
mjdiloretomjdiloreto
29f1193d879relocated shared code per review suggestions. Updated pom to use global servlet version
David WalendDavid Walend
802d9e5a22aMerge pull request #610 in SHRINE/shrine from bugfix/SHRINE-3517-response-to-a-list-of-queries to release/1.26.7 * c...
mjdiloretomjdiloreto
0c4d8f900farefactored shrine-api and mockcrc to use shared code
mjdiloretomjdiloreto
0f31a11b487Moved shared bootstrap code to commons
dwalenddwalend
2b3c4b8f952Optimized the results database call to take advantage of the finite set for SHRINE-3517
mjdiloretomjdiloreto
113346ef788added commons as dependency for mockcrc and shrine-api and pointed code to shared files.
mjdiloretomjdiloreto
ecd192b9b6bcreated new common directory for shared servlet code and added duplicated code there.
Ben CBen C
2edef94713bsaving work
Marc-Danie NazaireMarc-Danie Nazaire
7a4567c0a5aMerge pull request #609 in SHRINE/shrine from feature/SHRINE-3500-add-jmeter-shrine-scaleup-test to release/1.26.7 *...
Marc-Danie NazaireMarc-Danie Nazaire
314d73536a3Merge pull request #608 in SHRINE/shrine from feature/SHRINE-3499-modify-the-webclient-to-retry to release/1.26.7 * ...
marc-daniemarc-danie
1b92e92417fSHRINE-3500 - Add JMeter SHRINE scaleup test to the source code
Ben CBen C
b663bef23bbMerge of release/1.26.7
marc-daniemarc-danie
1e2517d2b71SHRINE-3499 - Modify the webclient to retry when polling for results if there is a 503 response code
Marc-Danie NazaireMarc-Danie Nazaire
154db47c57cMerge pull request #607 in SHRINE/shrine from bugfix/SHRINE-3495-network-health-empty-message to release/1.26.7 * co...
marc-daniemarc-danie
27c5efb1cc7SHRINE-3495 - Empty message field is appearing in the received Network Heath email - hide the empty strings a bit
marc-daniemarc-danie
33ae3eff6d1Merge branch 'release/1.26.7' of https://open.med.harvard.edu/stash/scm/shrine/shrine into bugfix/SHRINE-3495-network...
marc-daniemarc-danie
4d4dea64f84SHRINE-3495 - Empty message field is appearing in the received Network Heath email - fixed codec email
Ben CarmenBen Carmen
56e33a6d923Merge pull request #606 in SHRINE/shrine from change-network-health-js-build to release/1.26.7 * commit '16b1f9a1bdf...
marc-daniemarc-danie
a7c99fc56c1Merge branch 'release/1.26.7' of https://open.med.harvard.edu/stash/scm/shrine/shrine into bugfix/SHRINE-3495-network...
marc-daniemarc-danie
82d8e92efb9SHRINE-3495 - Empty message field is appearing in the received Network Heath email
David WalendDavid Walend
bb02bac7d50Merge pull request #605 in SHRINE/shrine from feature/SHRINE-3490-ok-to-try-to-keep-asking-for to release/1.26.7 * c...
Ben CBen C
16b1f9a1bdfChanged npm install to npm ci
dwalenddwalend
fe5a72bccd3Merge branch 'release/1.26.7' into feature/SHRINE-3490-ok-to-try-to-keep-asking-for
dwalenddwalend
748df8e6bd1Moved the release branch to 2.0.0-RC1-SNAPSHOT
Mike CherryMike Cherry
7f2aee327a3Post release of PR1, increment version number for next dev version
Ansible DeployAnsible Deploy
51b892ea5cbMerge release branch release/1.26.7 into master.
Ansible DeployAnsible Deploy
afc130c878fUpdate POMs with release version 2.0.0-PR1.
Marc-Danie NazaireMarc-Danie Nazaire
df685b8e3c2Merge pull request #604 in SHRINE/shrine from bugfix/SHRINE-2886-make-the-network-health-page to release/1.26.7 * co...
dwalenddwalend
53603ff166eMoved develop to 2.1.0-M1-SNAPSHOT
dwalenddwalend
eb5c260e835Merge branch 'release/1.26.7' into develop
dwalenddwalend
ec9bc53de5bDodging the pom.xml merge
dwalenddwalend
f36bb174da8Added retries for 500 and 503 response codes for SHRINE-3490
Mike CherryMike Cherry
0ae08b83bfaFrom the CI build logs in Bamboo it appears this is no longer getting built, but updating the version for consistency...
marc-daniemarc-danie
bf39f869e6cMerge branches 'bugfix/SHRINE-2886-make-the-network-health-page' and 'release/1.26.7' of https://open.med.harvard.edu...
marc-daniemarc-danie
8998d45eed7SHRINE-2886 - Make the network health page downloadable - fix issue with API call not working
Ben CarmenBen Carmen
0685ea3ee14Merge pull request #603 in SHRINE/shrine from fix-timeout-issue to release/1.26.7 * commit '09c6c484002c2d73867b8cd5...
Ben CBen C
09c6c484002incorporated suggestion from marc danie
Ben CBen C
3be8761c889Type cast it to a number when reading the timeout via getAttribute
Ben CBen C
f835382861aFix of timeout issue
Ben CarmenBen Carmen
0752010dfbeMerge pull request #601 in SHRINE/shrine from bugfix/SHRINE-3489-highlighting-issue to release/1.26.7 * commit '5e08...
Ben CarmenBen Carmen
1f728aac111Merge pull request #602 in SHRINE/shrine from remove-ability-to-configure-ontology-from-webclient to release/1.26.7 ...
Ben CBen C
379ca0457dbRemoved ability for user to configure ontology children
Ben CBen C
5e082916eaePreserve highlighted previous query on ifinite scroll
Ben CarmenBen Carmen
d94d9b7bdabMerge pull request #600 in SHRINE/shrine from bugfix/SHRINE-3488-handle-misconfifigured-breakdown to release/1.26.7 ...
Ben CBen C
5198a6b1744If no breakdown results...show 'no results' message
Ben CarmenBen Carmen
356f6112352Merge pull request #599 in SHRINE/shrine from bugfix/rename to release/1.26.7 * commit '735369a7ad881b43fcf2e263549d...
Ben CBen C
735369a7ad8Fix for renamed previous query not showing the query name properly in the query definition panel.
Ben CarmenBen Carmen
82dc7128e47Merge pull request #598 in SHRINE/shrine from bugfix/show-login-error to release/1.26.7 * commit 'dba4434c29925e3b81...
Ben CarmenBen Carmen
7350f257ccdMerge pull request #597 in SHRINE/shrine from feature/logout-on-timeout to release/1.26.7 * commit '368e896c8d3b07b6...
Ben CBen C
dba4434c299Fix of login issues
Ben CBen C
368e896c8d3Log the user out after being idle for 30 minutes.
Ben CBen C
1ac6dd64c8asaving work
dwalenddwalend
8509ba85d2bMoved pom.xml versions to 2.0.0-PR1-SNAPSHOT
dwalenddwalend
b4271cd91efMerged from release/1.26.7
dwalenddwalend
b44efceec04Merge branch 'release/1.26.7' into develop
dwalenddwalend
b8d9a1c85aeSmoothing the path for a merge
David WalendDavid Walend
f2ee3161043Merge pull request #596 in SHRINE/shrine from bugfix/SHRINE-3481-adding-a-node-via-a-curl-command to release/1.26.7 ...
Ben CBen C
d97efb7f3dfsaving work
Ben CBen C
8ded9e886c0Merge branch '2.0-webclient' into 2.0-webclient-sandbox2
Ben CBen C
c3fa58a2dc2merge of realease/1.26.7
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 * ...
Next →