 Ben C | b37949e0039 | A simpler way to hanle this. | | |
Ben C | 16168a8e33b | Fix of misleading query status message on query level error | | |
Ben C | ecd8d0a317b | Saving unit tests. | | |
 dwalend | 73f6b827dd3 | afterVersion parameter is now optional for SHRINE-3388 | | |
 Ben Carmen | cecfd150277 | Merge pull request #514 in SHRINE/shrine from bugfix/remove-10-sec-poll-delay to develop
* commit '95eaf2bfd20389883... | | |
dwalend | 0e5a0a5a8af | Merged from develop | | |
dwalend | 0b002014276 | Stray ugly comment | | |
 David Walend | 3edf1ff1b10 | Merge pull request #510 in SHRINE/shrine from feature/SHRINE-3068-improve-how-the-realm-is-retrieved to develop
* co... | | |
dwalend | 21528bb5e1e | Quick review of SHRINE-3350 | | |
dwalend | 8ece6822ab2 | Cleanup for SHRINE-3350 | | |
 marc-danie | 5a909ee7320 | SHRINE-3184 - Port the DSA authenticated routes to http4s - added return of response to include json when asJson is t... | | |
dwalend | b44330ec5e8 | Merge remote-tracking branch 'origin/bugfix/remove-10-sec-poll-delay' into bugfix/SHRINE-3350-replace-uses-of-the-mon... | | |
Ben C | 95eaf2bfd20 | removed 10 secons before restarting poll | | |
dwalend | f30632ee768 | Merge remote-tracking branch 'origin/develop' into bugfix/SHRINE-3350-replace-uses-of-the-monix-scheduler | | |
dwalend | a9be97cb176 | Pulling the triggers for SHRINE-3350 | | |
marc-danie | 386e4450dad | SHRINE-3184 - Port the DSA authenticated routes to http4s - added retrieval of topics for a researcher | | |
Ben Carmen | ee082f5cfb1 | Merge pull request #512 in SHRINE/shrine from feature/SHRINE-3308-swap-out-long-polling to develop
* commit 'c294e7d... | | |
marc-danie | 0b7ced4634a | SHRINE-3184 - Port the DSA authenticated routes to http4s - added all the authorized steward api calls | | |
dwalend | f6a880ea4f3 | Merge remote-tracking branch 'origin/feature/SHRINE-3308-swap-out-long-polling' into bugfix/SHRINE-3350-replace-uses-... | | |
Ben Carmen | 726accb5c03 | Merge pull request #513 in SHRINE/shrine from feature/SHRINE-3174-show-bold-unread-queries to develop
* commit 'e7eb... | | |
dwalend | 4da6beeb2a7 | Long polling with an update test passes for SHRINE-3350 | | |
dwalend | efb8f51d63e | Polling with no changes works for SHRINE-3350 | | |
Ben C | d83c44e375b | merge of develop | | |
Ben C | e7eb0b1bdc7 | Bold unobserved queries. | | |
dwalend | 5b6d47176ea | Start of tests for SHRINE-3350 - testing just getting the datastructure back. | | |
Ben C | c294e7d5fa7 | add long polling back in | | |
Ben Carmen | 9db4daa5ee7 | Merge pull request #511 in SHRINE/shrine from bugfix/SHRINE-3373-fix-delay-for-query-history to develop
* commit '18... | | |
marc-danie | 38c9c92e677 | SHRINE-3184 - Port the DSA authenticated routes to http4s | | |
marc-danie | 27b05dce523 | SHRINE-2900 - Connect the network health emailer to the connectivity test - Fixed the term extraction for the email a... | | |
dwalend | ae11ef1305c | Put a more IO-centric version of the QueryChangeNotifier into the works for SHRINE-3350 | | |
Ben C | 1880dbe8ac6 | Fix of delay showing a previous query. | | |
Ben C | 48ebfd68dc8 | replaced Enzyme with react-test-renderer for Snapshot and integration tests. | | |
marc-danie | 80a4eedbfd1 | SHRINE-2900 - Connect the network health emailer to the connectivity test - Reorganized the code a bit, added more er... | | |
marc-danie | 553f24ba67f | SHRINE-2900 - Connect the network health emailer to the connectivity test - Made the delay for the connectivity test ... | | |
dwalend | aedb318e939 | Merging from develop | | |
David Walend | e338e6806c4 | Merge pull request #507 in SHRINE/shrine from bugfix/SHRINE-3384-admin-dashboard-problem-log-the to develop
* commit... | | |
marc-danie | 68b56a08eeb | SHRINE-2900 - Connect the network health emailer to the connectivity test - Replaced Timer with ScheduledExecutorServ... | | |
dwalend | c559a093b71 | Removed BearerAuthentiation for SHRINE-3068 | | |
marc-danie | 8ac928781fb | SHRINE-2900 - Connect the network health emailer to the connectivity test - Removed try in return type of selectMostR... | | |
marc-danie | 638f5a5b037 | Merge branches 'develop' and 'feature/SHRINE-2900-connect-the-network-health-emailer' of https://open.med.harvard.edu... | | |
marc-danie | e12e84cac71 | SHRINE-2900 - Connect the network health emailer to the connectivity test - made the adminEmail required | | |
Ben C | bd038c5dd7c | Functioning Export to CSV. | | |
dwalend | e24376d42ae | Removed the shrine.authenticate.usersource.domain for SHRINE-3068 | | |
dwalend | 9a436ce2df2 | Removed shrine.authenticate.realm for SHRINE-3068 | | |
marc-danie | 11d86a731d4 | SHRINE-2900 - Connect the network health emailer to the connectivity test - removed comment | | |
marc-danie | b1cf3a73c65 | SHRINE-2900 - Connect the network health emailer to the connectivity test - removed the api calls to test the sening ... | | |
dwalend | c77a0bebae1 | Missed a test somehow. Fixing with the right magic string. | | |
David Walend | a09582681e9 | Merge pull request #508 in SHRINE/shrine from feature/SHRINE-3342-create-default-values-for-static-data-src-main to d... | | |
marc-danie | d3a312fd0a0 | SHRINE-2900 - Connect the network health emailer to the connectivity test - code cleanup | | |
marc-danie | ed53e1f1230 | SHRINE-2900 - Connect the network health emailer to the connectivity test - more merge remnants | | |
marc-danie | ee6dfff9254 | SHRINE-2900 - Connect the network health emailer to the connectivity test - merge with develop | | |
marc-danie | 5c265719e8d | SHRINE-2900 - Connect the network health emailer to the connectivity test - modified to send email to adapter node | | |
marc-danie | 58186fe00f2 | SHRINE-2900 - Connect the network health emailer to the connectivity test - replaced Monix scheduler with Java TimerTask | | |
dwalend | 3b0c27ee136 | Added default properties for the web client. SHRINE-3342 | | |
Ben C | 18c5564a431 | Refactor and tweak of bar spacing. | | |
Ben C | 63e32ac8bb7 | Functioning Breakdowns | | |
dwalend | 44b075899cf | Merge remote-tracking branch 'origin/develop' into bugfix/SHRINE-3384-admin-dashboard-problem-log-the | | |
dwalend | 6b4f625781f | Partial removal of downstream nodes for SHRINE-3384 | | |
David Walend | bdaf4cc7aef | Merge pull request #505 in SHRINE/shrine from feature/SHRINE-3357-create-a-specialized-execution to develop
* commit... | | |
David Walend | 45ea5f93bcf | Merge pull request #506 in SHRINE/shrine from feature/SHRINE-3010-ship-with-latest-http4s-milestone to develop
* com... | | |
dwalend | b6726478024 | Upgraded to a real release of http4s! (and fixed some dependency purgatory) for SHRINE-3010 | | |
marc-danie | d3756148b2d | Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE-2900-connect-the-n... | | |
David Walend | 317f0c383ec | Merge pull request #504 in SHRINE/shrine from feature/SHRINE-3366-search-and-clear-up-all-uses to develop
* commit '... | | |
dwalend | 1d482ecdd46 | Removed and replaced a lot of global context, and added a long-running-work context for SHRINE-3357 | | |
dwalend | 2ba18f456be | Merge remote-tracking branch 'origin/develop' into feature/SHRINE-3366-search-and-clear-up-all-uses | | |
dwalend | 1eb93dab8a4 | Cleared out some warnings and stray bits while going through SHRINE-3366 | | |
dwalend | 318ef12953d | Cleared out some unsafeRunSync()s from inside AbstractQepService for SHRINE-3366 | | |
David Walend | 280acd372de | Merge pull request #503 in SHRINE/shrine from feature/SHRINE-3340-ponder-is-hub_will_submit-an to develop
* commit '... | | |
David Walend | d4ce66ed684 | Merge pull request #502 in SHRINE/shrine from feature/SHRINE-3356-create-a-specialized-execution to develop
* commit... | | |
dwalend | 026eb1e5e4a | Broader error handling for SHRINE-3340 | | |
dwalend | c66694ca918 | Remaning attempts available to the dispatcher for SHRINE-3340 | | |
dwalend | 78ce0489399 | HUB_WILL_SUBMIT is an error state - no need to check for new results ever. SHRINE-3340 | | |
dwalend | dbe852d72c9 | Added a jersey client execution context to isolate calls the old code makes to i2b2 services for SHRINE-3356 | | |
Ben C | 7615babde41 | Cleaned up Unit Tests. | | |
Ben C | e39e56fd69e | Displaying Results now. | | |
Ben C | cfdfeef95fb | Cleanup up styles (still some work to do) | | |
 Marc-Danie Nazaire | e7e09df71c3 | Merge pull request #500 in SHRINE/shrine from bugfix/SHRINE-3370-connectivity-test-scheduler-should to develop
* com... | | |
Marc-Danie Nazaire | 8abc4f7cdec | Merge pull request #501 in SHRINE/shrine from feature/SHRINE-2862-update-servlet-api-version-in to develop
* commit ... | | |
Ben C | 555eabfc6e8 | added selected query. | | |
marc-danie | 2cafe41368b | SHRINE-2862 - Update servlet-api-version in pom from 3.0.1 to latest version | | |
Ben C | 2127257f0b8 | latest and greatest. | | |
marc-danie | 72b08b2c59b | SHRINE-3370 - Connectivity test scheduler should fail with better error when the query Id is missing. | | |
marc-danie | 7c346b20829 | SHRINE-2900 - Connect the network health emailer to the connectivity test- sends email when there are errors | | |
marc-danie | 5186b33af1f | SHRINE-2900 - Connect the network health emailer to the connectivity test- fixed typo in email template | | |
Ben C | 350fd9ea332 | merge of 1.26.6.3 | | |
Ben C | 2cfedd8c20c | css overflow settings. | | |
Ben C | e88ecb98098 | Refactored components | | |
Marc-Danie Nazaire | d9688d867d2 | Merge pull request #498 in SHRINE/shrine from bugfix/SHRINE-3372-be-able-to-handle-exception-seen to develop
* commi... | | |
marc-danie | fb753b499f6 | fixed broken test after merge | | |
marc-danie | 6e14d81de17 | Merge branch 'release/1.26.6' of https://open.med.harvard.edu/stash/scm/shrine/shrine into develop
# Conflicts:
# ad... | | |
Ben Carmen | 1b2aeb271e0 | Merge pull request #490 in SHRINE/shrine from bugfix/SHRINE-3367-add-config-to-setup to release/1.26.6
* commit '377... | | |
Ben C | 3721798fb0a | saving work | | |
Marc-Danie Nazaire | 48a54f552c6 | Merge pull request #499 in SHRINE/shrine from feature/SHRINE-3355-create-a-specialized-execution to develop
* commit... | | |
marc-danie | c9c786e4442 | SHRINE-3355 create a specialized execution - added missing import | | |
Marc-Danie Nazaire | 8d20793e886 | Merge pull request #497 in SHRINE/shrine from feature/SHRINE-3355-create-a-specialized-execution to develop
* commit... | | |
marc-danie | cbcc192036a | Merge branches 'develop' and 'feature/SHRINE-3355-create-a-specialized-execution' of https://open.med.harvard.edu/sta... | | |
Ben C | 9520519cdb2 | saving work on branch | | |
Ben C | de756a21770 | Saving progress | | |
David Walend | 867104320d3 | Some better exceptions fo SHRINE-3372 | | |
David Walend | 5c1ddf95285 | Merge pull request #495 in SHRINE/shrine from feature/SHRINE-3354-create-a-specialized-execution to develop
* commit... | | |
David Walend | cf1dad528d1 | Merge pull request #494 in SHRINE/shrine from feature/SHRINE-3353-create-a-specialized-execution to develop
* commit... | | |
Marc-Danie Nazaire | bb7bec55d6c | Merge pull request #493 in SHRINE/shrine from bugfix/SHRINE-3331-results_observed-table-odd-bits to develop
* commit... | | |
Marc-Danie Nazaire | 95fa443baf2 | Merge pull request #496 in SHRINE/shrine from bugfix/SHRINE-3325-add-the-observed-flag-to-the to release/1.26.6
* co... | | |
Ben C | 377e344a146 | Removed urlCellPM from config service and shrine.conf files. | | |
David Walend | ed20e943aa6 | Updated pom.xml files to 1.26.6.3-SNAPSHOT | | |
Ben C | 7d6ad591ba6 | Merge branch 'release/1.26.6' into bugfix/SHRINE-3367-add-config-to-setup | | |
Ben C | b25c63ac876 | saving ui work | | |
Ben C | a960c576d4e | Sending 404s as default error. | | |
Ben C | 229e0cf6f1d | Merge of Bill's changes with conflict. | | |
Ben C | 2653eb2c23d | Merge branch '2.0-webclient' of https://open.med.harvard.edu/stash/scm/shrine/shrine into 2.0-webclient | | |
Ben C | 1c26d05afd6 | Added redux and connected Researcher Component | | |
 Bill Simons | b3e7976b115 | Update dependencies for acorn and node-gyp to resolve build vulnerabilities - note that the actual version of node-gy... | | |
dwalend | dd66dd8ab58 | Merging from release/1.26.6 | | |
Ben C | b08acbcc625 | use dev | | |
Ben C | 8052fa4f314 | fixed test. | | |
Ben C | f4b46aaf7a6 | fetch is working | | |
dwalend | b3541af371a | Merge remote-tracking branch 'origin/develop' into feature/SHRINE-3355-create-a-specialized-execution | | |
dwalend | 5123f0568f4 | Added an execution context for http clients for SHRINE-3355 | | |
David Walend | e172d5ce592 | Merge pull request #492 in SHRINE/shrine from bugfix/SHRINE-3328-when-reporting-querystatuses.readyforadapters to dev... | | |
marc-danie | f4bc4aa172d | Merge branch 'release/1.26.6' of https://open.med.harvard.edu/stash/scm/shrine/shrine into bugfix/SHRINE-3325-add-the... | | |
marc-danie | a91ddfb9330 | SHRINE-3325 - Add the observed flag to the allQueries section of the JSON response for previous queries - replaced th... | | |
dwalend | a643828f3fc | Added execution context for the QEP's database work for SHRINE-3354 | | |
Ben C | c9b91235897 | Added infrastructure for redux. | | |
dwalend | 7b3d945ada6 | Merge branch 'develop' into feature/SHRINE-3353-create-a-specialized-execution | | |
marc-danie | 3148360c83a | SHRINE-3325 - Add the observed flag to the allQueries section of the JSON response for previous queries - code cleanup | | |
David Walend | a7e2e185c04 | Created a specialized execution context for http4s for SHRINE-3353 | | |
Marc-Danie Nazaire | 771ae56f5d8 | Merge pull request #475 in SHRINE/shrine from bugfix/SHRINE-3344-replace-blocking-unsaferunsync to release/1.26.6
* ... | | |
marc-danie | a1ce9aec728 | SHRINE-3344 - Replace blocking unsafeRunSync calls in QepService.scala with proper IOs - Removed unneeded imports and... | | |
David Walend | d155b09b7f3 | Merge remote-tracking branch 'origin/develop' into bugfix/SHRINE-3328-when-reporting-querystatuses.readyforadapters | | |
David Walend | 3fc8554b0b0 | Merge pull request #483 in SHRINE/shrine from feature/SHRINE-3351-create-a-general-purpose-execution to develop
* co... | | |
marc-danie | 6eb7cfae3aa | SHRINE-3331 - RESULTS_OBSERVED table odd bits | | |
David Walend | 81ece22f498 | Merge remote-tracking branch 'origin/develop' into feature/SHRINE-3351-create-a-general-purpose-execution | | |
David Walend | e7cb64f443e | Made CRC communications daemonic for SHRINE-3352 | | |
David Walend | 1d47135f1de | Using IO.start for CRC calls for SHRINE-3352 | | |
Ben Carmen | f889ca41581 | Merge pull request #491 in SHRINE/shrine from bugfix/SHRINE-3206-configure-flagging-placeholder-text to release/1.26.... | | |
Ben C | 70827cf3f60 | Hard coded urlCellPM | | |
Ben C | c18d1a9c3ed | Added models to project. | | |
David Walend | d6a1d682d02 | Removed blocking around CRC calls for SHRINE-3352 | | |
David Walend | e9ab5d14da1 | Swithced to evalOn() for SHRINE-3351 | | |
marc-danie | 69071a1e279 | SHRINE-3325 - Add the observed flag to the allQueries section of the JSON response for previous queries | | |
David Walend | 7a202da563b | Some clean-up for SHRINE-3328 | | |
David Walend | 2c61e5d9c0f | Some clean-up for SHRINE-3328 | | |
David Walend | 6c17d2e311b | Added the update-query-and-results-at-the-same-time command from the hub to the QEP for SHRINE-3328 | | |
Ben C | 0340f6d4744 | Merge branch 'develop' into 2.0-webclient | | |
Ben C | aeafcf4ae1b | Added suggested default e-mail address to configurations | | |
David Walend | 6a63d0315c7 | Database and API call cleanup for SHRINE-3328 | | |
marc-danie | 0f4eacecfda | SHRINE-3344 - Replace blocking unsafeRunSync calls in QepService.scala with proper IOs - Modified selectPreviousQueri... | | |
Ben C | 1156810aaac | Updated dev service to use query params | | |
Ben C | 83df97746fd | Added the ability to configure the placeholder text from shrine.conf. | | |
dwalend | 10283009287 | More use of UpdateQueryAtQepWith something for SHRINE-3328 | | |
Ben C | ecd6d15aef1 | Added webclient configuration to shrine setup | | |
dwalend | e91fa4cf9f8 | Removed the researcher for SHRINE-3328 | | |
dwalend | 062dc5d7858 | Pulling things appart for SHRINE-3328 | | |
Ben Carmen | f8cbad7f7f2 | Merge pull request #486 in SHRINE/shrine from bugfix/SHRINE-3364-fix-button-nm to release/1.26.6
* commit 'fcee529af... | | |
Ben Carmen | a7bde7c0363 | Merge pull request #487 in SHRINE/shrine from bugfix/SHRINE-3338-max-ontology-children to release/1.26.6
* commit 'd... | | |
Ben Carmen | 354b571660a | Merge pull request #488 in SHRINE/shrine from bugfix/SHRINE-3363-allow-unflag-query to release/1.26.6
* commit 'fbe7... | | |
Ben Carmen | 2a2d7b8eac5 | Merge pull request #489 in SHRINE/shrine from bugfix/SHRINE-3349-hide-content-when-loading to release/1.26.6
* commi... | | |
Ben C | 5478105335c | Hide the query builder content until it's resize has been calculated. | | |
Ben C | fbe70832924 | Allow user to unflag a query if there is no flag message text. | | |
Ben C | d2c31ad9308 | Fix of default number of Ontology Children | | |
Ben C | fcee529af32 | Fix of query run text to 'Run Query' | | |
David Walend | c7f09e7ad2e | I'd rather use a fork-join pool for the CRC for SHRINE-3352 | | |
David Walend | 15edded57ea | I'd rather use a fork-join pool for the CRC for SHRINE-3352 | | |
Ben Carmen | b64cb9db6c6 | Merge pull request #482 in SHRINE/shrine from bugfix/SHRINE-3203-add-expand-collapse-icons to release/1.26.6
* commi... | | |
Ben Carmen | 69d931e1016 | Merge pull request #481 in SHRINE/shrine from Fix-Of-Unable-to-Delete-Query-Term to release/1.26.6
* commit '99dc836... | | |
dwalend | 58edd2eab0b | Turning query updates into commands to update the query for SHRINE-3328 | | |
David Walend | 521feaefebf | Merge pull request #478 in SHRINE/shrine from feature/SHRINE-3346-upgrade-to-the-latest-http4s to develop
* commit '... | | |
dwalend | 4cb8ff5194b | Config properties for crcClientThreadPoolSize for SHRINE-3352 | | |
dwalend | 9d2b994ae49 | Rearranged things for SHRINE-3351 and did a first pass at SHRINE-3352 - using the new fixed thread pool for the CRC | | |
Ben Carmen | dad414c1938 | Merge pull request #480 in SHRINE/shrine from bugfix/SHRINE-3348-truncated-breakdown-text to release/1.26.6
* commit... | | |
dwalend | 1e0829c0469 | Merge remote-tracking branch 'origin/develop' into feature/SHRINE-3351-create-a-general-purpose-execution | | |
dwalend | 354f1199889 | Able to make a fixed thread pool for SHRINE-3351 | | |
Ben C | 0f102f0f640 | Added missing merge back in. | | |
Ben C | da1607ff839 | changed from padding-right to margin-right. | | |
Ben C | 99dc836bdc2 | Removed premature history refresh. | | |
marc-danie | 44b6edd7d10 | SHRINE-3344 - Replace blocking unsafeRunSync calls in QepService.scala with proper IOs - Change UUID to Long and refa... | | |
Ben C | 554d73697ea | Updated the readme | | |
marc-danie | 57f69d8825c | SHRINE-3344 - Replace blocking unsafeRunSync calls in QepService.scala with proper IOs - fixed broken test | | |
marc-danie | 08d90a5a9c0 | SHRINE-3344 - Replace blocking unsafeRunSync calls in QepService.scala with proper IOs - replace for comprehension wi... | | |
marc-danie | d9db894abfa | SHRINE-3344 - Replace blocking unsafeRunSync calls in QepService.scala with proper IOs - moved the code related to cr... | | |
Ben Carmen | 4b845a81795 | Merge pull request #479 in SHRINE/shrine from bugfix/SHRINE-3298-postback-on-rename-query-cancel to release/1.26.6
*... | | |
Ben C | 84091418ce0 | Fix of breakdown text getting cut off. | | |
David Walend | c1bdfbfeb45 | Changes to npm tests for the merge | | |
David Walend | 709a26c69de | Bumped pom.xml files as part of the merge from release/1.26.6 | | |
Ben C | 7d3bc349d1c | Prevent default instead of stopPropagation prevents the browser postback behavior. | | |
Ben C | 7381e493eb7 | edit | | |
Ben C | 8738b0868b1 | edit of readme | | |
Ben C | 16b1aceae3b | updated readme | | |
| Next → |
