 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 | | |
Ben C | ac4503f43a8 | edited readme | | |
Ben Carmen | 31ce95ccbfc | Merge pull request #476 in SHRINE/shrine from bugfix/SHRINE-3270-fix-missing-flagged-message to release/1.26.6
* com... | | |
Ben Carmen | f811bc212e3 | Merge pull request #477 in SHRINE/shrine from bugfix/SHRINE-3347-fix-highlighting to release/1.26.6
* commit '8ae1ab... | | |
Ben C | 682b7142439 | added readme, tweaked scripts and linter | | |
David Walend | 7da4290e2af | Updated http4s to the latest (M7) for SHRINE-3346 | | |
marc-danie | bb8478506c1 | SHRINE-3344 - Replace blocking unsafeRunSync calls in QepService.scala with proper IOs - switched to using Log instea... | | |
Ben C | 8ae1ab223e2 | possible fix of highlighting issue | | |
marc-danie | 023952c4e57 | SHRINE-3344 - Replace blocking unsafeRunSync calls in QepService.scala with proper IOs - removed commented out code | | |
Ben C | 9f1aab79cd7 | message field is now flagMessage | | |
Ben C | 7021c09fb22 | Fixed version numbers in POMs | | |
marc-danie | 20fd16afc51 | SHRINE-3344 - Replace blocking unsafeRunSync calls in QepService.scala with proper IOs - removed unused function | | |
Ben C | 48c978ebc25 | Update of starter snapshot test | | |
Ben C | 4714829ad03 | Updated shrine-api-war POM to execute against version 2 of the Webclient | | |
marc-danie | 26957843139 | Merge branch 'release/1.26.6' of https://open.med.harvard.edu/stash/scm/shrine/shrine into bugfix/SHRINE-3344-replace... | | |
marc-danie | a0122a5035c | SHRINE-3339 - Add missing result status HUB_WILL_SUBMIT - moved status to correct place | | |
Ben C | 8923e83f4c6 | created local dev environment | | |
David Walend | 465be7303c9 | Updated pom.xml version to 1.26.6.2-SNAPSHOT | | |
David Walend | b9f2f9046ec | Updated pom.xml versions to 1.26.7.1-SNAPSHOT | | |
Ben C | 2464fdaab18 | Added transforms for testing with Jest. | | |
Ben C | 41e43fc5d18 | pushing changes for production build | | |
Ben C | 1974e573e3f | Merge branch 'develop' into 2.0-webclient | | |
David Walend | 44adbf827a5 | Merge pull request #474 in SHRINE/shrine from bugfix/SHRINE-3345-lost-fork-join-pool-thread-envelope to develop
* co... | | |
David Walend | 7f38618834e | Unused import for SHRINE-3345 | | |
David Walend | 2e0b8db0e57 | Added lots of blocking for SHRINE-3345 | | |
Ben Carmen | 9342f66af66 | Merge pull request #473 in SHRINE/shrine from swap-long-polling2 to develop
* commit 'd5cda38ecb474821e3ba0bcb0eb635... | | |
bendcarmen | d5cda38ecb4 | swapped polling API | | |
bendcarmen | 1d83a63e476 | removal of test comment | | |
bendcarmen | 0b989b18a2e | Revert "Swap of polling api call"
This reverts commit fef0571ef0273226af5945490688495b8524b730. | | |
bendcarmen | fef0571ef02 | Swap of polling api call | | |
bendcarmen | bbf9b6caafc | refactor | | |
bendcarmen | 7998caaa9e6 | Merge branch 'develop' into 2.0-webclient-SNAPSHOT | | |
bendcarmen | 24344cb7408 | testing git mapping between 1.0 and 2.0 | | |
bendcarmen | beeac04ee17 | refactor | | |
bendcarmen | 1603a02bdc6 | refactor | | |
bendcarmen | c012099a2c7 | changed deprecated to version1 | | |
bendcarmen | 54ccb902ace | moved deprecated items | | |
bendcarmen | 00da619b28c | changed directory name of 1.0 shrine-webclient from shrine-webclient to shrine-webclient-1.0 | | |
bendcarmen | 71139385646 | Merge branch 'develop' into 2.0-webclient-SNAPSHOT | | |
bendcarmen | 7569dfbda0a | Changed pom to 2.0-webclient-SNAPSHOT | | |
David Walend | 6de4fa95554 | Merge pull request #471 in SHRINE/shrine from bugfix/SHRINE-3343-hack-to-fix-the-thread-pool-leak to develop
* commi... | | |
dwalend | 4a3a72c7ed9 | Hack to fix a thread pool leak in SHRINE-3343 | | |
Ben Carmen | 1333fb67d9d | Merge pull request #469 in SHRINE/shrine from feature/SHRINE-3338-set-default-number to develop
* commit '8a2ceedf45... | | |
David Walend | 3c81cc7e10e | Merge pull request #470 in SHRINE/shrine from bugfix/SHRINE-3341-long-poll-not-being-triggered to develop
* commit '... | | |
bendcarmen | 8a2ceedf458 | Added the defaultNumberOfOntologyChildren to the static service. | | |
David Walend | 9dc4b01c3a3 | Trailing todo cleanup | | |
David Walend | 30ebaef8b8e | Added calls to the notification triggers for SHRINE-3341, which helps new results arrive in the UI | | |
Marc-Danie Nazaire | 8be0ffa6d5b | Merge pull request #468 in SHRINE/shrine from bugfix/SHRINE-3339-add-missing-result-status-hub_will_submit to develop... | | |
bendcarmen | 4b741c60317 | Added 10000 as a default value for the Ontology children setting. | | |
Ben Carmen | bf1d00743cd | Merge pull request #467 in SHRINE/shrine from bugfix/SHRINE-3302-flickering-flag-unflag to develop
* commit 'c5c5497... | | |
marc-danie | 6a7f2713522 | SHRINE-3339 - Add missing result status HUB_WILL_SUBMIT - moved status to correct place | | |
marc-danie | 158cdace6c4 | SHRINE-3339 - Add missing result status HUB_WILL_SUBMIT - added new status to statuses list | | |
marc-danie | 65a6a1ab9f5 | SHRINE-3339 - Add missing result status HUB_WILL_SUBMIT - minor edit | | |
marc-danie | 85e8ad1b7c6 | SHRINE-3339 - Add missing result status HUB_WILL_SUBMIT | | |
bendcarmen | c5c54974c1f | Fix for flickering of flagging and query name pencil icons when loading. | | |
Ben Carmen | 27caaa1dc66 | Merge pull request #466 in SHRINE/shrine from bugfix/SHRINE-3275-problem-summary to develop
* commit 'f136925915898a... | | |
bendcarmen | f1369259158 | Fix of broken unit tests. | | |
David Walend | 65d97dbedcc | Merge pull request #465 in SHRINE/shrine from bugfix/SHRINE-3332-on-shrine-qa2-query-6284097453461604792 to develop
... | | |
David Walend | 5ed357d8c2d | Merge pull request #464 in SHRINE/shrine from bugfix/SHRINE-3333-on-shrine-qa3-8929854896815858575 to develop
* comm... | | |
David Walend | 5d756edc405 | Merge pull request #463 in SHRINE/shrine from feature/SHRINE-3336-try-an-isolated-scale-up-test to develop
* commit ... | | |
bendcarmen | 9deea2ee6da | Use the summary and description text of the problem digest. | | |
David Walend | 0827631d412 | Smoothing out some extra calls to the CRC for SHRINE-3332, and making sure the CRC always gets asked about QUEUED que... | | |
Marc-Danie Nazaire | d1ec18253fe | Merge pull request #433 in SHRINE/shrine from feature/SHRINE-3305-remove-the-shrine-proxy-project to develop
* commi... | | |
David Walend | d4aa0839fac | Handling some unrecorded errors for QUEUED queries for SHRINE-3333 | | |
David Walend | 5efa74d07d5 | Some testing jigs I made for SHRINE-3336 that I'd like to keep around | | |
David Walend | 45f4c0170b3 | Merge pull request #461 in SHRINE/shrine from bugfix/SHRINE-2926-check-for-xml-injection-in-shrine-s to develop
* co... | | |
David Walend | 3da9407c994 | Merge pull request #460 in SHRINE/shrine from feature/SHRINE-3149-interpret-reinterpret-status to develop
* commit '... | | |
Ben Carmen | 3c6b91f04fc | Merge pull request #462 in SHRINE/shrine from feature/SHRINE-3174-bold-updated-queries to develop
* commit '3696b05b... | | |
Ben Carmen | 2bb45aace1b | Merge pull request #458 in SHRINE/shrine from feature/SHRINE-2929-bock-ie-access to develop
* commit 'aba20b2e8e1bde... | | |
bendcarmen | 3696b05b903 | Bold updated queries per SHRINE-3174 | | |
bendcarmen | aba20b2e8e1 | Add edge to the restricted browser agents. | | |
Ben Carmen | 66536687507 | Merge pull request #459 in SHRINE/shrine from bugfix/SHRINE-3330-fix-problem-digest-parsing to develop
* commit 'bf8... | | |
David Walend | cba0bcc6cc2 | Got the build working with the new XML library for SHRINE-2926 | | |
David Walend | ffb5616beec | Last pass for SHRINE-3149 . I also fixed SHRINE-3285 on the way | | |
bendcarmen | bf88032820c | Fix of broken unit test. | | |
bendcarmen | 6181c5e95d8 | Fix of missing problemDigest for Query level status. | | |
David Walend | 20e3252f86a | Wrapping up SHRINE-1619 breakdown handling, and smoothing some error handling in MessageQueueWebClient. | | |
bendcarmen | 3090c0357e1 | Disallow access from an IE browser, notify the researcher to use another. | | |
David Walend | fa47218de08 | Wrapping up SHRINE-3149 | | |
David Walend | d99b3180301 | Handled some errors in the hub for SHRINE-3149 | | |
dwalend | 59f5015e964 | Merge remote-tracking branch 'origin/develop' into feature/SHRINE-3149-interpret-reinterpret-status | | |
dwalend | 1188b61bdbd | Updating a comment about a future ticket | | |
Ben Carmen | b5798a45693 | Merge pull request #455 in SHRINE/shrine from bugfix/SHRINE-3317-apply-temporal-constraing-to-all-groups to develop
... | | |
dwalend | 5053d736eef | Almost done with the QueuedQueryPoller's error handling for SHRINE-3149 | | |
dwalend | c3d305f589d | Merge remote-tracking branch 'origin/develop' into feature/SHRINE-3149-interpret-reinterpret-status | | |
dwalend | 98036c2425d | Record errors found with QUEUED queries as errors in the database when a query is crazy old for SHRINE-3149 and SHRIN... | | |
dwalend | 932d267d06a | Tomcat can reply with a 404 during start-up, so a 404 is OK to retry for SHRINE-3323 | | |
Marc-Danie Nazaire | 72fb95f35cc | Merge pull request #457 in SHRINE/shrine from bugfix/SHRINE-3053-change-the-check-for-dsa-authorization to develop
*... | | |
marc-danie | 865628cdb01 | SHRINE-3053 - Change the check for DSA authorization from hard-coded success to a database call - removed unused test... | | |
Marc-Danie Nazaire | 5d607325d1d | Merge pull request #456 in SHRINE/shrine from bugfix/SHRINE-3053-change-the-check-for-dsa-authorization to develop
*... | | |
marc-danie | 3a788757bcf | SHRINE-3053 - Change the check for DSA authorization from hard-coded success to a database call - added shrine.conf f... | | |
Marc-Danie Nazaire | cfe7b98422f | Merge pull request #454 in SHRINE/shrine from bugfix/SHRINE-3053-change-the-check-for-dsa-authorization to develop
*... | | |
marc-danie | 326a997f6ed | SHRINE-3053 - Change the check for DSA authorization from hard-coded success to a database call - fixed the path to t... | | |
marc-danie | 641397bfd7c | SHRINE-3053 - Change the check for DSA authorization from hard-coded success to a database call - moved the package.s... | | |
marc-danie | 8ad68e30db8 | SHRINE-3053 - Change the check for DSA authorization from hard-coded success to a database call - Added reference.con... | | |
bendcarmen | c0f8fa6c69d | Make sure that the timing for a panel is always in sync with what is selected by the temporal drop down stored in i2b... | | |
Ben Carmen | f96b2ab56c3 | Merge pull request #452 in SHRINE/shrine from fix-breakdown-parsing to develop
* commit 'a19dd7a4140596ea975e11709be... | | |
bendcarmen | a19dd7a4140 | Added pre 1.26 error statuses. | | |
bendcarmen | 005d06c8b89 | xit of test until I figure out what's happening...allow build to proceed. | | |
bendcarmen | 2f56b4f3930 | fixed a failing snapshot test. | | |
Ben Carmen | 7fb25b396d0 | Merge pull request #453 in SHRINE/shrine from bugfix/SHRINE-3284-fix-email to develop
* commit '8a5f5ef0894fe7034731... | | |
bendcarmen | 6820e90d140 | Change of Instution Result component to use internal status. | | |
| Next → |
