 marc-danie | f97ed34fb94 | Merge branches '2.0-webclient' and 'feature/SHRINE2020-29-setup-stub-ontology-service' of https://open.med.harvard.ed... | | |
marc-danie | 2d2795ba7c8 | SHRINE2020-29 - Setup stub Ontology service - Finalized JSON structure and added more unit tests | | |
 Ben C | 5e787c04749 | saving work for adding and removing the highlight | | |
 Matthew DiLoreto | 392ae2acffe | Merge pull request #641 in SHRINE/shrine from bugfix/SHRINE-3530-add-unit-tests-for-reading-in to develop
* commit '... | | |
marc-danie | dfc33a407f1 | SHRINE2020-29 - Setup stub Ontology service - Added procedures to Mock data | | |
 dwalend | c05c5e07d79 | Moving version to 2.0.0-RC2-SNAPSHOT | | |
Ben C | a82191f1080 | Potential solution for deleting a query term | | |
Ben C | 61db4bab0a6 | Merge branch 'feature/SHRINE2020-16-first-group' into 2.0-webclient | | |
Ben C | 77c245d5400 | Fix of feedback from UAT | | |
 Ansible Deploy | c0a8524583f | Merge release branch release/1.26.7 into master. | | |
Ansible Deploy | 574b4dbcee1 | Update POMs with release version 2.0.0-RC1. | | |
marc-danie | a4e23649842 | SHRINE2020-29 - Setup stub Ontology service - Adding POM file | | |
Ben C | 72b28c2e4b6 | saving work | | |
marc-danie | 3d68c3725f6 | SHRINE2020-29 - Setup stub Ontology service - Added some lab details | | |
 mjdiloreto | d60d1c0d875 | Changed test address from localhost to 0.0.0.0 to remove any chance of failure. | | |
mjdiloreto | 643530c4595 | remove test dependency on Matt's laptop... | | |
 Marc-Danie Nazaire | ae30b3eed43 | Merge pull request #639 in SHRINE/shrine from feature/SHRINE-3571-error-parsing-breakdowns-which to release/1.26.7
*... | | |
marc-danie | 12b4d171e10 | Merge branch 'release/1.26.7' of https://open.med.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE-3571-error-... | | |
marc-danie | 75074fd5009 | SHRINE-3571 - Error parsing Breakdowns which contain < in the value - Moved fixed to I2B2Workarounds and commented ou... | | |
 David Walend | 4c779c3cb75 | Merge pull request #638 in SHRINE/shrine from bugfix/SHRINE-3327-after-scale-up-testing to release/1.26.7
* commit '... | | |
Ben C | 9ef5cf619d7 | saving work | | |
 Ben Carmen | 8a5fc71e452 | Merge pull request #634 in SHRINE/shrine from SHRINE-3574-replace-help-guide to release/1.26.7
* commit '673c487c752... | | |
David Walend | b483ff8e86d | Merge pull request #637 in SHRINE/shrine from bugfix/SHRINE-3576-survive-java.nio.channels.closedchannelexception to ... | | |
Ben C | fa5b35ace11 | call remote service for ontology for now | | |
dwalend | e2904d242db | Go ahead and store an error asking about a QUEUED query as an error for SHRINE-3327 | | |
Ben C | 30ebf961c70 | fixed failing test | | |
Ben C | 673c487c752 | updated help guide | | |
dwalend | ced1cf551aa | Handle ClosedChannelException observed at UCSD behind the proxy for SHRINE-3576 | | |
Ben C | b9233db5b76 | removed and replaced it with apropriate padding and margin css. | | |
Ben C | 440fd59cc63 | set NODE_PATH to simplify imports | | |
Ben C | 8d3dac68a25 | SHRINE2020-16 Allow a user to create an inlcusion / exclusion criteria with one or more concepts. | | |
marc-danie | 63fa07c43e9 | SHRINE-3571 - Error parsing Breakdowns which contain < in the value - removed replacing < with < and no longer cal... | | |
marc-danie | 1e1240177f9 | SHRINE2020-29 - Setup stub Ontology service | | |
Matthew DiLoreto | 3648867e903 | Merge pull request #631 in SHRINE/shrine from bugfix/SHRINE-1862-upgrade-scalatest to develop
* commit '18ed6a741f3a... | | |
Matthew DiLoreto | 67bcc701f2d | Merge pull request #625 in SHRINE/shrine from bugfix/SHRINE-3530-add-unit-tests-for-reading-in to develop
* commit '... | | |
Ben C | f43dfa4019f | updated the help guide | | |
Ben C | 1c3ad9950e0 | saving up dates to styles and structure. | | |
Marc-Danie Nazaire | 685172201d3 | Merge pull request #633 in SHRINE/shrine from feature/SHRINE-3571-error-parsing-breakdowns-which to release/1.26.7
*... | | |
marc-danie | 430945ade90 | SHRINE-3571 - Error parsing Breakdowns which contain < in the value | | |
Ben Carmen | c5333a96e94 | Merge pull request #632 in SHRINE/shrine from bugfix/SHRINE-3529-fixed-with-paging to release/1.26.7
merge of paging... | | |
Ben C | 13eb6221015 | updated unit tests to reflect limit of 34 | | |
dwalend | 8db3aa48750 | Merged from release/1.26.7 | | |
Ben C | fd1203d1ce7 | Set the limit to 34 results in order to avoid scrollbar. | | |
mjdiloreto | 4f55fc0235d | refactored protocol JSON tests to not inherit a base test. | | |
dwalend | 744b13e135e | Merge branch 'release/1.26.7' into develop | | |
dwalend | 58daebe2047 | Before merging | | |
Ben C | 20515c5a4ba | clean up of styles | | |
Ben C | 6ab5a39a685 | Potential Solution for paging through query history | | |
Ben C | ff7aa540241 | accidentally checked in config | | |
Ben C | d869007b2c2 | Make sure new paging controls fit | | |
Ben C | f23b1e0557e | saving work | | |
Ben C | d8162e32196 | saving work | | |
Ben C | 4f6d0586f6b | saving what I have. | | |
Ben C | 66b113e3bd4 | saving work | | |
Ben C | 590eb9d4224 | saving work | | |
Marc-Danie Nazaire | a94754865e2 | Merge pull request #630 in SHRINE/shrine from feature/SHRINE-3518-index-date-created-for-previousqueries to develop
... | | |
marc-danie | 1d20c095954 | SHRINE-3518 - Index date created for previousQueries | | |
mjdiloreto | 18ed6a741f3 | removed references to all deprecated scalatest traits, and import the equivalent | | |
mjdiloreto | 00670e8caf6 | moved flatten plugin to proper place. update .gitignore to ignore flattened poms | | |
mjdiloreto | d8e21b696e0 | trying to NOT use Resource | | |
Marc-Danie Nazaire | 4410abf0cc5 | Merge pull request #629 in SHRINE/shrine from feature/SHRINE-3570-add-api-call-to-get-status-of to release/1.26.7
* ... | | |
marc-danie | f64b68b6ade | SHRINE-3570 - Add api call to get status of a subset of queries | | |
mjdiloreto | af5efe69e58 | upgraded scalatest version. No fixes to tests needed upgrading to 3.0.8 | | |
mjdiloreto | fb2b3457d5b | removed redundant child pom version tags. Minor formatting fix | | |
mjdiloreto | aa91fe578dc | changed revision to reflect old revision | | |
mjdiloreto | 641b1c10e30 | removed weird second SNAPSHOT from pom | | |
mjdiloreto | a0924c254da | added pom flattening to all projects and removed all hardcoded 2.1.0-M1-SNAPSHOT instances | | |
mjdiloreto | 700c9e04753 | fixed method names in protocol json tests | | |
Marc-Danie Nazaire | e3c4dd5879d | Merge pull request #624 in SHRINE/shrine from feature/SHRINE-3565-modify-messagequeuewebclien-to to release/1.26.7
*... | | |
Ben C | df84e5e69be | minor tweak of reduer. | | |
mjdiloreto | 3051b7b7edf | Created tests for all v1 protocol case classes, ensuring conversion between objects and JSON and vice versa. | | |
marc-danie | 490d235a6f7 | SHRINE-3565- Modify MessageQueueWebClient to retry after java.util.concurrent.TimeoutException | | |
Ben Carmen | c40325d6372 | Merge pull request #622 in SHRINE/shrine from bugfix/SHRINE-3548-fix-infinite-scroll to release/1.26.7
* commit '9ef... | | |
Ben Carmen | 57222aebd87 | Merge pull request #623 in SHRINE/shrine from bugfix/safari-crash to release/1.26.7
* commit '3aaac3f0b70f41cd73a37c... | | |
Ben C | 3aaac3f0b70 | Make sure the style element on queryTimeingButton exists before accessing it. | | |
Ben C | 9ef23dd4a1d | Fix of failing snapshot test | | |
Ben C | f6e66dd035a | Saving work. | | |
dwalend | 7868c1f7aad | Changing pom.xml versions back after the merge | | |
dwalend | 18b84dac5a9 | Merged from release/1.26.7 | | |
dwalend | 4b2819c5648 | Setting up an easy merge from release/1.26.7 | | |
Matthew DiLoreto | b9d5afcc794 | Merge pull request #619 in SHRINE/shrine from bugfix/SHRINE-3484-unanticipated-error-when-the to develop
* commit 'c... | | |
Ben C | ef9d3c53a36 | Breaking apart demo code into components (unit tests and prop types to come) | | |
David Walend | f6185d1b628 | Merge pull request #621 in SHRINE/shrine from bugfix/SHRINE-3534-webclient-audit-emails-are-not to release/1.26.7
* ... | | |
dwalend | 7bde47ce66c | Merge remote-tracking branch 'origin/release/1.26.7' into bugfix/SHRINE-3534-webclient-audit-emails-are-not | | |
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 | | |
| Next → |
