 dwalend | 9ed0899eeb5 | Restored emailing audit requests to the data steward for SHRINE-3534 | | |
 David Walend | f6aeb58b7a1 | Merge pull request #620 in SHRINE/shrine from bugfix/SHRINE-3535-oracle-sql-exception-from-optimized to release/1.26.... | | |
dwalend | 76b2abfa534 | Oracle can't deal with a DISTINCT on a table with CLOBS but selecting non-CLOB columbs works around its fussiness thi... | | |
 mjdiloreto | cafd7adf67d | Changed node names to node keys in error message and rename to NoAdapterRunQueriesProblem | | |
mjdiloreto | 068e333bdcf | Added list of configured nodes to error message | | |
mjdiloreto | 491a7a131c5 | Changed error message to include the list of configured nodes. | | |
 Ben C | 94b3b0f0571 | Fix of Firefox drag and drop about:blank issue | | |
Ben C | 77a6924a7c0 | Fix of bad merge | | |
Ben C | 28705be309b | merge of branch query-builder-2020 | | |
Ben C | 5c058f56ef4 | Fix of failing unit test. | | |
 Ben Carmen | 309ab6d8e89 | Merge pull request #617 in SHRINE/shrine from bugfix/SHRINE-3529-limit-previous-queries-request to release/1.26.7
* ... | | |
Ben C | 2e72efd9c95 | change to scrollTop check at 1 instead of 0, so that refresh of history doesn't automatically trigger it. | | |
mjdiloreto | 92cf35340a0 | Added a new Problem to describe when no adapter nodes were configured to run a query. | | |
Ben C | 43de59a3b4e | Potential fix or SHRINE-3529 | | |
Ben C | a31580ea16c | Saving potential fix | | |
Ben C | 00711370f38 | saving work | | |
 Matthew DiLoreto | ba69cc28c1e | Merge pull request #616 in SHRINE/shrine from feature/SHRINE-3419-selectthenetworkio-call-should to develop
* commit... | | |
David Walend | 25b6f241bed | Merge pull request #615 in SHRINE/shrine from bugfix/SHRINE-3526-shrine-s-queryresultpolling-web to release/1.26.7
*... | | |
dwalend | 97356b95690 | Marc-Danie's suggestion for SHRINE-3526 | | |
dwalend | c289b66e4a2 | Merge remote-tracking branch 'origin/release/1.26.7' into bugfix/SHRINE-3526-shrine-s-queryresultpolling-web | | |
David Walend | 7308edaaa25 | Merge pull request #612 in SHRINE/shrine from bugfix/SHRINE-3524-out-of-memory-because-too-many to release/1.26.7
* ... | | |
mjdiloreto | a0b3facd09c | Merge branch 'feature/SHRINE-3419-selectthenetworkio-call-should' of https://open.med.harvard.edu/stash/scm/shrine/sh... | | |
mjdiloreto | 36b81dbcfb3 | Refactor hubDb to throw an exception if no network found | | |
mjdiloreto | 580ae3f2660 | removed unnecessary change | | |
mjdiloreto | 89a099836c4 | remove web build which was accidentally added | | |
Matthew DiLoreto | b425e803593 | Merge pull request #614 in SHRINE/shrine from bugfix/SHRINE-3273-add-custom-text-to-the-401-reply to develop
* commi... | | |
mjdiloreto | 44b186b5539 | fixed the broken hub service | | |
dwalend | 83242b8e8f7 | Added limit on the number of queries returned for SHRINE-3526 | | |
dwalend | 059c226e0f2 | Merge branch 'bugfix/SHRINE-3524-out-of-memory-because-too-many' into bugfix/SHRINE-3526-shrine-s-queryresultpolling-web | | |
dwalend | 68feccd390b | I want to keep these, but get them to my new branch... | | |
mjdiloreto | 5f67b0af4ef | broken tests | | |
mjdiloreto | 7e34c53f068 | refactor to throw an exception if no network found | | |
Ben C | 10d350ed219 | Saving work. | | |
mjdiloreto | 183703755a8 | Changed 401 message and removed hardcoded test values. | | |
Ben C | dc7d58c89d6 | Merge branch '2.0-webclient' into feature/query-builder-2020 | | |
Ben C | 7d28f7d4c58 | Merge branch 'release/1.26.7' into 2.0-webclient | | |
Ben C | 628cb93c0c3 | Fix of unit tests | | |
David Walend | cc859478700 | Merge pull request #613 in SHRINE/shrine from bugfix/SHRINE-3525-log-on-shrine-scaleup-01-is-filling to release/1.26.... | | |
mjdiloreto | 242ee87e5b8 | added custom message when BasicAuth returns 401 Unauthorized | | |
Ben C | c6a6c705ef6 | Saving updated snapshot tests | | |
Ben C | c66a02ba73e | Saving Work | | |
dwalend | e41105811d8 | A lot less logging for SHRINE-3525 | | |
dwalend | f0d522009d5 | A more efficient query for SHRINE-3524 | | |
Matthew DiLoreto | 0b23b18e03f | Merge pull request #611 in SHRINE/shrine from bugfix/SHRINE-3003-unify-the-http4s-bootstrap-code to develop
* commit... | | |
mjdiloreto | 29f1193d879 | relocated shared code per review suggestions. Updated pom to use global servlet version | | |
David Walend | 802d9e5a22a | Merge pull request #610 in SHRINE/shrine from bugfix/SHRINE-3517-response-to-a-list-of-queries to release/1.26.7
* c... | | |
mjdiloreto | 0c4d8f900fa | refactored shrine-api and mockcrc to use shared code | | |
mjdiloreto | 0f31a11b487 | Moved shared bootstrap code to commons | | |
dwalend | 2b3c4b8f952 | Optimized the results database call to take advantage of the finite set for SHRINE-3517 | | |
mjdiloreto | 113346ef788 | added commons as dependency for mockcrc and shrine-api and pointed code to shared files. | | |
mjdiloreto | ecd192b9b6b | created new common directory for shared servlet code and added duplicated code there. | | |
Ben C | 2edef94713b | saving work | | |
 Marc-Danie Nazaire | 7a4567c0a5a | Merge pull request #609 in SHRINE/shrine from feature/SHRINE-3500-add-jmeter-shrine-scaleup-test to release/1.26.7
*... | | |
Marc-Danie Nazaire | 314d73536a3 | Merge pull request #608 in SHRINE/shrine from feature/SHRINE-3499-modify-the-webclient-to-retry to release/1.26.7
* ... | | |
 marc-danie | 1b92e92417f | SHRINE-3500 - Add JMeter SHRINE scaleup test to the source code | | |
Ben C | b663bef23bb | Merge of release/1.26.7 | | |
marc-danie | 1e2517d2b71 | SHRINE-3499 - Modify the webclient to retry when polling for results if there is a 503 response code | | |
Marc-Danie Nazaire | 154db47c57c | Merge pull request #607 in SHRINE/shrine from bugfix/SHRINE-3495-network-health-empty-message to release/1.26.7
* co... | | |
marc-danie | 27c5efb1cc7 | SHRINE-3495 - Empty message field is appearing in the received Network Heath email - hide the empty strings a bit | | |
marc-danie | 33ae3eff6d1 | Merge branch 'release/1.26.7' of https://open.med.harvard.edu/stash/scm/shrine/shrine into bugfix/SHRINE-3495-network... | | |
marc-danie | 4d4dea64f84 | SHRINE-3495 - Empty message field is appearing in the received Network Heath email - fixed codec email | | |
Ben Carmen | 56e33a6d923 | Merge pull request #606 in SHRINE/shrine from change-network-health-js-build to release/1.26.7
* commit '16b1f9a1bdf... | | |
marc-danie | a7c99fc56c1 | Merge branch 'release/1.26.7' of https://open.med.harvard.edu/stash/scm/shrine/shrine into bugfix/SHRINE-3495-network... | | |
marc-danie | 82d8e92efb9 | SHRINE-3495 - Empty message field is appearing in the received Network Heath email | | |
David Walend | bb02bac7d50 | Merge pull request #605 in SHRINE/shrine from feature/SHRINE-3490-ok-to-try-to-keep-asking-for to release/1.26.7
* c... | | |
Ben C | 16b1f9a1bdf | Changed npm install to npm ci | | |
dwalend | fe5a72bccd3 | Merge branch 'release/1.26.7' into feature/SHRINE-3490-ok-to-try-to-keep-asking-for | | |
dwalend | 748df8e6bd1 | Moved the release branch to 2.0.0-RC1-SNAPSHOT | | |
 Mike Cherry | 7f2aee327a3 | Post release of PR1, increment version number for next dev version | | |
 Ansible Deploy | 51b892ea5cb | Merge release branch release/1.26.7 into master. | | |
Ansible Deploy | afc130c878f | Update POMs with release version 2.0.0-PR1. | | |
Marc-Danie Nazaire | df685b8e3c2 | Merge pull request #604 in SHRINE/shrine from bugfix/SHRINE-2886-make-the-network-health-page to release/1.26.7
* co... | | |
dwalend | 53603ff166e | Moved develop to 2.1.0-M1-SNAPSHOT | | |
dwalend | eb5c260e835 | Merge branch 'release/1.26.7' into develop | | |
dwalend | ec9bc53de5b | Dodging the pom.xml merge | | |
dwalend | f36bb174da8 | Added retries for 500 and 503 response codes for SHRINE-3490 | | |
Mike Cherry | 0ae08b83bfa | From the CI build logs in Bamboo it appears this is no longer getting built, but updating the version for consistency... | | |
marc-danie | bf39f869e6c | Merge branches 'bugfix/SHRINE-2886-make-the-network-health-page' and 'release/1.26.7' of https://open.med.harvard.edu... | | |
marc-danie | 8998d45eed7 | SHRINE-2886 - Make the network health page downloadable - fix issue with API call not working | | |
Ben Carmen | 0685ea3ee14 | Merge pull request #603 in SHRINE/shrine from fix-timeout-issue to release/1.26.7
* commit '09c6c484002c2d73867b8cd5... | | |
Ben C | 09c6c484002 | incorporated suggestion from marc danie | | |
Ben C | 3be8761c889 | Type cast it to a number when reading the timeout via getAttribute | | |
Ben C | f835382861a | Fix of timeout issue | | |
Ben Carmen | 0752010dfbe | Merge pull request #601 in SHRINE/shrine from bugfix/SHRINE-3489-highlighting-issue to release/1.26.7
* commit '5e08... | | |
Ben Carmen | 1f728aac111 | Merge pull request #602 in SHRINE/shrine from remove-ability-to-configure-ontology-from-webclient to release/1.26.7
... | | |
Ben C | 379ca0457db | Removed ability for user to configure ontology children | | |
Ben C | 5e082916eae | Preserve highlighted previous query on ifinite scroll | | |
Ben Carmen | d94d9b7bdab | Merge pull request #600 in SHRINE/shrine from bugfix/SHRINE-3488-handle-misconfifigured-breakdown to release/1.26.7
... | | |
Ben C | 5198a6b1744 | If no breakdown results...show 'no results' message | | |
Ben Carmen | 356f6112352 | Merge pull request #599 in SHRINE/shrine from bugfix/rename to release/1.26.7
* commit '735369a7ad881b43fcf2e263549d... | | |
Ben C | 735369a7ad8 | Fix for renamed previous query not showing the query name properly in the query definition panel. | | |
Ben Carmen | 82dc7128e47 | Merge pull request #598 in SHRINE/shrine from bugfix/show-login-error to release/1.26.7
* commit 'dba4434c29925e3b81... | | |
Ben Carmen | 7350f257ccd | Merge pull request #597 in SHRINE/shrine from feature/logout-on-timeout to release/1.26.7
* commit '368e896c8d3b07b6... | | |
Ben C | dba4434c299 | Fix of login issues | | |
Ben C | 368e896c8d3 | Log the user out after being idle for 30 minutes. | | |
Ben C | 1ac6dd64c8a | saving work | | |
dwalend | 8509ba85d2b | Moved pom.xml versions to 2.0.0-PR1-SNAPSHOT | | |
dwalend | b4271cd91ef | Merged from release/1.26.7 | | |
dwalend | b44efceec04 | Merge branch 'release/1.26.7' into develop | | |
dwalend | b8d9a1c85ae | Smoothing the path for a merge | | |
David Walend | f2ee3161043 | Merge pull request #596 in SHRINE/shrine from bugfix/SHRINE-3481-adding-a-node-via-a-curl-command to release/1.26.7
... | | |
Ben C | d97efb7f3df | saving work | | |
Ben C | 8ded9e886c0 | Merge branch '2.0-webclient' into 2.0-webclient-sandbox2 | | |
Ben C | c3fa58a2dc2 | merge of realease/1.26.7 | | |
dwalend | dbc273501be | Created the queue for a new node for SHRINE-3481 | | |
Ben C | bec6e3e0aca | saving work | | |
Ben C | cfa57055920 | saving latest | | |
Ben C | 29c0af83c92 | Saving change from npm install to npm ci in readme. | | |
marc-danie | d1996218005 | Update POM version from 1.26.7.7-SNAPSHOT to 1.26.7.8-SNAPSHOT again | | |
Ben C | ee4c561a6b8 | Updated package-lock.json, utilized npm ci instead of npm install in build-prod, code cleanup and updated snapshot | | |
Ben C | 6c567c94630 | updated .gitignore, package-lock.json and replaced npm install with npm ci in the build | | |
 Bill Simons | c105386fb04 | Include shrine-webclient-legacy in the shrine-api.war build | | |
Ben C | bd623e49ec6 | Fix of snapshot test. | | |
Ben C | f03f49ba117 | Added snapshot for SelectedQuery.spec.js | | |
marc-danie | 2b98ff2f1d3 | Reverting POM version from 1.26.7.8-SNAPSHOT back to 1.26.7.7-SNAPSHOT | | |
Ben C | 3aafc34a7f4 | added package-lock.json to test out build | | |
Ben C | e628c813d2e | remoed package-lock.json, it should be git ignored. | | |
Ben C | d8e27db3cb0 | saving work | | |
marc-danie | cca8574d957 | Update POM version from 1.26.7.7-SNAPSHOT 1.26.7.8-SNAPSHOT | | |
Marc-Danie Nazaire | f7b4b794630 | Merge pull request #594 in SHRINE/shrine from bugfix/SHRINE-3468-log-more-details-about-problems to release/1.26.7
*... | | |
marc-danie | 6dc90fc28f4 | SHRINE-3468 - Log more details about problems in the keystore - fixed assignment of problem | | |
David Walend | 534a0f6356d | Merge pull request #595 in SHRINE/shrine from bugfix/SHRINE-3472-stack-trace-on-shrine-qa3-stops to release/1.26.7
*... | | |
Ben C | 8457ed8dee6 | saving work | | |
dwalend | 6d2d9c431a8 | OK to retry some Api tasks, too for SHRINE-3472 | | |
marc-danie | a7181ba60a3 | SHRINE-3468 - Log more details about problems in the keystore - removed unused problem | | |
marc-danie | 3747883b72f | SHRINE-3468 - Log more details about problems in the keystore - replaced for comprehension with folds and renamed Cou... | | |
marc-danie | 3eaa0d93a65 | SHRINE-3468 - Log more details about problems in the keystore | | |
Marc-Danie Nazaire | 9c560f87486 | Merge pull request #592 in SHRINE/shrine from feature/SHRINE-3371-use-net.shrine.problem.jsonproblemdigest to release... | | |
Marc-Danie Nazaire | 28ab4729d6e | Merge pull request #593 in SHRINE/shrine from feature/SHRINE-3097-serve-shrine-webclient-from-root-shrine-webclient t... | | |
marc-danie | cec323441f1 | SHRINE-3097 - examples of setting up Tomcat Rewrite Rules - changed the key alias to match what is in the installati... | | |
marc-danie | 5b44241b6fc | SHRINE-3097 - examples of setting up Tomcat Rewrite Rules | | |
marc-danie | 1c173762a02 | SHRINE-3371 - Use net.shrine.problem.JsonProblemDigest in QepService instead of ProblemDigestForJson - minor edit to ... | | |
marc-danie | f23bbef0a5b | SHRINE-3371 - Use net.shrine.problem.JsonProblemDigest in QepService instead of ProblemDigestForJson | | |
David Walend | 09381e579ab | Merge pull request #589 in SHRINE/shrine from bugfix/SHRINE-3474-key-off-of-the-shrinedatabasetype to release/1.26.7
... | | |
David Walend | f9a17b78eca | Merge pull request #591 in SHRINE/shrine from bugfix/SHRINE-3076-remove-rapture-dependencies to release/1.26.7
* com... | | |
Ben C | fdbdd0ed687 | Fixed a failing snapshot test | | |
Ben C | a0ea5d611a1 | Merge of release/
1.26.7 | | |
Ben C | f6d918a1c99 | saving work | | |
dwalend | 600aa28c5d6 | Removed rapture dependencies for SHRINE-3076 | | |
Marc-Danie Nazaire | 0e003343713 | Merge pull request #590 in SHRINE/shrine from feature/SHRINE-3475-create-defaults-for-the-connectivity to release/1.2... | | |
Marc-Danie Nazaire | d157fd23684 | Merge pull request #587 in SHRINE/shrine from bugfix/SHRINE-3467-if-a-response-from-the-i2b2-pass-through to release/... | | |
marc-danie | bb8a3f83220 | SHRINE-3475 - Create defaults for the connectivity test config properties | | |
marc-danie | a350c092814 | SHRINE-3475 - Create defaults for the connectivity test config properties | | |
marc-danie | cef2ae12676 | SHRINE-3467 - If a response from the i2b2 pass-through service contains an ERROR anywhere, log it in shrine-api.log | | |
dwalend | bf8f1d875f7 | Better handling of the slick driver for SHRINE-3474 | | |
Ben C | 555d2f7fdce | Deleted all yarn and npm lock files and made sure they are .gitignored. | | |
Ben C | 33c65b7ce60 | saving changes to branch | | |
marc-danie | f028296a021 | Merge branch 'release/1.26.7' of https://open.med.harvard.edu/stash/scm/shrine/shrine into bugfix/SHRINE-3467-if-a-re... | | |
Marc-Danie Nazaire | c5ebbf91bcd | Merge pull request #588 in SHRINE/shrine from bugfix/SHRINE-3473-webclient-previous-queries-burns to release/1.26.7
... | | |
marc-danie | dd34bd8f302 | SHRINE-3473 - Webclient: Previous Queries: Burns query: Previous query entry is getting bold in every 15sec even when... | | |
Ben C | 944e155b2e4 | Saving css work | | |
dwalend | 45e540a5eb1 | Moved configObject to ConfigExtensions for SHRINE-3474 | | |
marc-danie | 9bcd848a1e7 | SHRINE-3467 - If a response from the i2b2 pass-through service contains an ERROR anywhere, log it in shrine-api.log | | |
Ben C | 7e12382e198 | Merge branch '2.0-webclient' into 2.0-webclient-sandbox | | |
dwalend | 3279981a975 | Merged the lastest QA pass to develop | | |
Ben C | c307eb1a959 | cleanup of spec | | |
dwalend | 64736d446bd | Merge branch 'release/1.26.7' into develop | | |
dwalend | 3d16c7c75df | Dodging conflict before merge | | |
Ben C | 8a9ba95df16 | finished unit tests for fetchQueryUpdateSaga | | |
dwalend | c91a7bea31b | Moved to 1.26.7.7-SNAPSHOT | | |
dwalend | 82f5aeac9ad | Comment planning for SHRINE-3468 | | |
Ben C | 449d668164c | Update of fetch sagas | | |
Ben Carmen | f72cfc7d90b | Merge pull request #586 in SHRINE/shrine from bugfix/SHRINE-3469-status-spacing to release/1.26.7
* commit '22cd1da1... | | |
Ben C | 22cd1da16f7 | Fix of CSS to spacing | | |
Ben C | 8f45ff1d306 | merge local changes | | |
Ben C | a72e1db449c | Merge of release/1.26.7 into v1 | | |
Ben Carmen | 64c0e8893d6 | Merge pull request #585 in SHRINE/shrine from SHRINE-3466/show-modified-terms to release/1.26.7
* commit 'b9cde25359... | | |
Ben C | b9cde253594 | Potential fix for modifier icon. | | |
Ben Carmen | 30f21521b35 | Merge pull request #584 in SHRINE/shrine from bugfix/SHRINE-3268-drop-the-dashboard-to-dashboard to release/1.26.7
*... | | |
Ben C | 2f47d689176 | Changed to speciic version of http-server | | |
Ben C | a0b9b5a15d1 | Swapped out http-server for gulp. | | |
David Walend | 13f0e7537b0 | Merge pull request #582 in SHRINE/shrine from bugfix/SHRINE-3460-remove-put-in-default-values to release/1.26.7
* co... | | |
Ben C | 189d4effc6f | Save change to sidebar to remove Dashboard to Dashboard. | | |
dwalend | a68969c6a8d | Marc-Danie is a steely-eyed missileer and I tried to fix this too fast. | | |
dwalend | f213bb1f59d | Marc-Danie is a steely-eyed missileer. | | |
Marc-Danie Nazaire | 415d768f1f8 | Merge pull request #583 in SHRINE/shrine from bugfix/SHRINE-3303-off-by-millisecond-comparison to release/1.26.7
* c... | | |
Marc-Danie Nazaire | 1ebdaab27cb | Merge pull request #581 in SHRINE/shrine from bugfix/SHRINE-3464-webclient-previous-queries-the to release/1.26.7
* ... | | |
dwalend | c6165e5583d | After merging 1.26.7.6-SNAPSHOT | | |
dwalend | e6c93b39697 | Merge remote-tracking branch 'origin/release/1.26.7' into develop | | |
dwalend | b144585f1f8 | Before merging 1.26.7.6-SNAPSHOT | | |
marc-danie | 7f75eb88052 | SHRINE-3303 - off-by-millisecond comparison in a QEP database test | | |
dwalend | f2aa56e571f | Vastly simplified the hub node example config file for SHRINE-3460 | | |
marc-danie | 923ed8ef2bc | SHRINE-3464 - Webclient: Previous Queries: The completed and checked previous queries are getting bold again on editi... | | |
dwalend | c2e15282511 | Vastly simplified the downstream node example file for SHRINE-3460 | | |
Ben C | d56f72dcd13 | Selected Query Reducer unit test. | | |
Marc-Danie Nazaire | d497dc99ee0 | Merge pull request #577 in SHRINE/shrine from bugfix/SHRINE-3459-webclient-query-status-the-completed to release/1.26... | | |
Marc-Danie Nazaire | 117bf176053 | Merge pull request #580 in SHRINE/shrine from bugfix/SHRINE-3453-stack-trace-if-no-network-health to release/1.26.7
... | | |
Marc-Danie Nazaire | cf9e377d082 | Merge pull request #578 in SHRINE/shrine from bugfix/SHRINE-2470-pull-out-changes-for-shrine-2468 to release/1.26.7
... | | |
| Next → |
