yifan xing | 650b8d0d96a | comment back the tests, changed maven-scala plug in back to version 3.2.2 | | |
David Walend | 3eb6fb502ab | Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine into develop | | |
David Walend | fdd1d673061 | Try commenting out dashboard app and war for the holiday break | | |
yifan xing | 5f557595291 | commented out LocalMessageQueueMiddlewareTest.scala | | |
yifan xing | 6f1c848610a | fixed the infinite recursive problem | | |
yifan xing | deb3b3f67df | make sure if one test fails, the other won't be affected | | |
David Walend | 71ae49c0ff7 | Merge pull request #90 in SHRINE/shrine from feature/SHRINE-2356-upgrade-back-end-dependencies to develop
* commit '... | | |
Yifan Xing | 1121853e6a4 | Merge pull request #83 in SHRINE/shrine from ~YXING/shrine:future to develop
* commit '7fb526a43b629c6ab625796aa397f... | | |
David Walend | 7c6de7c18d4 | Second batch of library updates for SHRINE-2356 | | |
bendcarmen | d11176c150e | Fix of multiple query topics created at once | | |
David Walend | cd9ec007606 | First block of updates | | |
bendcarmen | 8473eecee54 | Potential fix of SHRINE-2133 | | |
Ben Carmen | 4d72edd3ecc | Merge pull request #88 in SHRINE/shrine from SHRINE-2446-remove-sidebar.service.js-and to develop
* commit 'e6a3ba58... | | |
yifan xing | 35f4434c08f | merging commits | | |
marc-danie | e6a3ba58aa1 | SHRINE-2446 - Remove sidebar.service.js and sidebar.model.js since they are no longer used | | |
Marc-Danie Nazaire | 695756deea8 | Merge pull request #86 in SHRINE/shrine from bugfix/SHRINE-2296-qa1-2-3-admin-dashboard-summary to develop
* commit ... | | |
marc-danie | 51f5fb8844e | SHRINE-2296 - Split the internalstatus/summary REST call into two separate calls - removed {} | | |
marc-danie | ea739d30b37 | SHRINE-2296 - Split the internalstatus/summary REST call into two separate calls - removed TODO item | | |
marc-danie | 168c7832f59 | SHRINE-2296 - Split the internalstatus/summary REST call into two separate calls - renamed QueryAdapterTest object an... | | |
marc-danie | 9f19dbdd73d | SHRINE-2296 - Split the internalstatus/summary REST call into two separate calls - more changes related to renaming t... | | |
marc-danie | 68e92632dff | removed todo | | |
marc-danie | 8ac37baa911 | SHRINE-2296 - Split the internalstatus/summary REST call into two separate calls - renamed the rest call to internals... | | |
bendcarmen | 5c9839aa5e0 | Potential fix of user Amin role issue and query term alias=false | | |
bendcarmen | fc8261f92b2 | Added Mixin for Term Info alias = false | | |
yifan xing | 7fb526a43b6 | changed await time from 1s to 1min in localMessageLib | | |
marc-danie | a03b18491f6 | SHRINE-2296 - Split the internalstatus/summary REST call into two separate calls - removed unused import | | |
yifan xing | bd920496fda | implemented Dave's review comments | | |
marc-danie | cd018020bea | SHRINE-2296 - Split the internalstatus/summary REST call into two separate calls - minor edits | | |
marc-danie | 9f55da522a4 | Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine into bugfix/SHRINE-2296-qa1-2-3-admin-... | | |
Ansible Deploy | 8d822e49a6e | Merge release branch release/1.24.1 into master. | | |
Ansible Deploy | 4ef543f4269 | Update POMs with release version 1.24.2. | | |
David Walend | e7c49500fc6 | Updated pom.xmls for the 1.24.2 | | |
David Walend | f61b40ca155 | Merge pull request #85 in SHRINE/shrine from bugfix/SHRINE-2427-deprecate-the-shouldqueryself to develop
* commit '2... | | |
bendcarmen | c82e7c782f8 | Update of readme | | |
marc-danie | 67cf3cf1544 | SHRINE-2296 - Split the internalstatus/summary REST call into two separate calls - summary and networkHealth | | |
David Walend | 2c6e0ff39a6 | Added default value for shouldQuerySelf for SHRINE-2427 | | |
David Walend | 2425ad9371d | Found a Thread.sleep() without a blocking{}. I don't think it was breaking anything. | | |
yifan xing | 36c61ff3cf8 | fix merge conflicts | | |
yifan xing | 4965e95f0ab | added blocking back to prevent thread starvation | | |
yifan xing | 8935abef8a4 | use futures and promises in qep and adapter | | |
yifan xing | 63ed12525f1 | implemented client using futures and promises | | |
yifan xing | 63636edb14c | implemented local messagequeue lib and api using Futures | | |
bendcarmen | 1fcb547107b | Fix of readme | | |
bendcarmen | 8d5acacc3a8 | Instructions on installing and running | | |
bendcarmen | fce96bd9269 | Provide the ability to run npm start to spin up a local copy of the dashboard app with a local server | | |
Yifan Xing | 319870d6b49 | Merge pull request #84 in SHRINE/shrine from ~YXING/shrine:damap to develop
* commit 'a2c8148c07ae4074f7aaa68ae13116... | | |
yifan xing | a2c8148c07a | fix the complete bug by changing types in DAMap | | |
David Walend | 1bf6ff40f60 | Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine into develop | | |
David Walend | 74240d8140e | Couple of nodes on shouldQuerySelf for SHRINE-2427 | | |
bendcarmen | 2ca1b98bff2 | npm start to launch dev server and local client | | |
bendcarmen | b8d03824479 | Some cleanup | | |
bendcarmen | 0bd7e577fe5 | common configuration for local ports in dev | | |
bendcarmen | 6535148069d | Now using Webpack | | |
bendcarmen | 32d20bad0d7 | Fully functioning Query Viewer running on Web Pack | | |
bendcarmen | a2600f306d9 | adding webpack | | |
bendcarmen | 99bc9f7ecde | Updated version to 1.24.1.10-SNAPSHOT | | |
bendcarmen | 2be85e1748d | Added updated help guide | | |
bendcarmen | 2ada16b8490 | removed shrine-react | | |
bendcarmen | db2853e0eff | Addition of jshint and webpack for plugin build | | |
David Walend | 42673bb934f | Updated pom.xml versions to 1.24.1.9-SNAPSHOT | | |
bendcarmen | 30fd060249a | Merge branch 'release/1.24.1' into develop | | |
bendcarmen | 32b64f19274 | Clearing queries in viewer issue | | |
bendcarmen | d95473ee106 | clearing previous queries | | |
bendcarmen | c38535f00ec | Fix of clearing results in viewer | | |
bendcarmen | e2e56ba5c5e | smoothing of queries, make sure query viewer is completely cleared out with new structure | | |
yifan xing | b44fd32f325 | Merge branch 'release/1.24.1' into develop | | |
bendcarmen | 0dc2f374aa1 | Remove highlight if new query is run | | |
bendcarmen | d0b520b69ed | Fix of SHRINE-2364 | | |
bendcarmen | 47b1a5c2d18 | Hopefully a fix for SHRINE-2422 | | |
bendcarmen | 9b639fb309e | clear highlight | | |
bendcarmen | ca326d41477 | Clear selected query when hitting clear | | |
bendcarmen | 44deae0b4e5 | Possible fix of SHRINE-2405 | | |
yifan xing | 1c0d25678ce | fixed pom files version | | |
bendcarmen | 7d894c30010 | Possible fix of SHRINE-2422 | | |
yifan xing | 8f9648da10c | Merge branch 'release/1.24.1' into develop | | |
David Walend | 4bbf9eba362 | Updated version to 1.24.1.8-SNAPSHOT | | |
David Walend | f0fa0cf9ecd | Merge branch 'release/1.24.1' of https://open.med.harvard.edu/stash/scm/shrine/shrine into release/1.24.1 | | |
David Walend | ad989b8f917 | Cut-and-paste merge of SHRINE-2421 | | |
Yifan Xing | 570d699d54e | Merge pull request #80 in SHRINE/shrine from ~YXING/shrine:fixSendBug to release/1.24.1
* commit '1f3fc3f8428244136a... | | |
yifan xing | 1f3fc3f8428 | renamed a method in send | | |
yifan xing | 047f3849640 | implemented resent if encountered CouldNotCompleteMomTaskButOKToRetryException | | |
bendcarmen | a8cdb3828f9 | smoothing queries...last call. | | |
bendcarmen | 07a9a81ec92 | Merge branch 'release/1.24.1' of https://open.med.harvard.edu/stash/scm/shrine/shrine into release/1.24.1 | | |
bendcarmen | e06d1dbddec | testing out adding loader back in for Previous Queries | | |
Yifan Xing | 45e905ede49 | Merge pull request #79 in SHRINE/shrine from ~YXING/shrine:fixSendBug to release/1.24.1
* commit 'ed7d6c84fa6652b685... | | |
yifan xing | ed7d6c84fa6 | clean up comments | | |
yifan xing | c3dcbc1bd3e | implemented Dave's review | | |
David Walend | 29b9751f93d | Merge branch 'release/1.24.1' of https://open.med.harvard.edu/stash/scm/shrine/shrine into release/1.24.1 | | |
bendcarmen | 7dd5762c304 | smoothing queries | | |
yifan xing | a9aa376b634 | implemented Dave's comments: better logging message | | |
bendcarmen | 3d18f0469e4 | query smoothing back in | | |
bendcarmen | b0b4dc27883 | roll back of query smoothing | | |
yifan xing | 17c9007c3f7 | used transform instead of for-comprehension to catch the failures | | |
bendcarmen | 85522f4009d | query smoothing | | |
Sam Tsoi | 44b84b32f18 | Fixed shrine.conf syntax errors | | |
bendcarmen | f104bdf61a1 | Smoothing previous queries | | |
David Walend | 5aea0abdc09 | Comments for the next round of bug fixes | | |
bendcarmen | 6d13bdc0933 | test of smoothing previous queries | | |
bendcarmen | 47b843217ff | Test of query highlightt | | |
bendcarmen | e3b78fa9e5a | Testing query history responsiveness | | |
bendcarmen | b1161b5639b | Updated POM version to 1.24.1.7-SNAPSHOT | | |
bendcarmen | 205fd521182 | loader issue | | |
bendcarmen | c58863eb31b | potential fix of broken drag and drop for previous queries | | |
bendcarmen | ffadb22285d | Potential fix of SHRINE-2397 | | |
bendcarmen | 2b1e6b72e32 | Potential fix of previous query highlighting issue | | |
bendcarmen | c4d79124adf | Bumped POMs to 1.24.1.6-SNAPSHOT | | |
bendcarmen | 23d538799ef | Potential fix of SHRINE-2398 | | |
bendcarmen | d6b69532a70 | Potential Fix of SHRINE-2395 and SHRINE-2396 | | |
bendcarmen | 7a97113e5bc | Potential fix of loading issue | | |
yifan xing | 173243efc40 | Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine into develop | | |
yifan xing | 64833c6725b | revert change in commit 7d029b14fd9 | | |
bendcarmen | 886400cbe17 | Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine into develop | | |
bendcarmen | a421670accb | updated poms to 1.25.1.1-SNAPSHOT | | |
yifan xing | 7d029b14fd9 | fixed the wrong link to error wiki page | | |
bendcarmen | c7786d2a7f4 | Candidate for fix of SHRINE-2397 | | |
bendcarmen | 8a5850ee0b1 | Updated POMS to 1.25.1.5-SNAPSHOT | | |
bendcarmen | 1054dc251ad | update poms to 1.24.2.1-SNAPSHOT | | |
bendcarmen | 679243c2e5d | update poms to 1.24.2.1-SNAPSHOT | | |
bendcarmen | d4e2e45f337 | Fix of missing plus sign for query terms | | |
bendcarmen | 3e82e669bf1 | Removed "display" from right click menu | | |
bendcarmen | 4a5b996c5ba | Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine into develop | | |
bendcarmen | a0f4c3f9db2 | Candidate for CSS fix | | |
Yifan Xing | fc50a918f89 | Merge pull request #77 in SHRINE/shrine from bugfix/SHRINE-2328-webclient-while-running-complex to develop
* commit ... | | |
Yifan Xing | c3510eceeba | Merge pull request #78 in SHRINE/shrine from bugfix/SHRINE-2366-formatdetectingadaptermappingssource to develop
* co... | | |
bendcarmen | 76b31e3cc15 | Candidate for previous queries | | |
bendcarmen | 5e47cb989a2 | Updated the version to 1.24.1.3-SNAPSHOT | | |
bendcarmen | 4eb72444297 | reset | | |
bendcarmen | d6726237264 | Test of fix for locking previous queries | | |
bendcarmen | 15154297db3 | Test of locking previous queries fix | | |
David Walend | a6cd4fd6be4 | Now log the error in the CSV file earlier. (The old error is going to catalina.out) Fixes SHRINE-2366 | | |
David Walend | 117cb6a5474 | Merge branch 'develop' into bugfix/SHRINE-2328-webclient-while-running-complex | | |
David Walend | 17715a98094 | Change that makes SHRINE-2328 less terrible. It seems fixed on shrine-dev* | | |
David Walend | 4235fc4b2b2 | Merge pull request #75 in SHRINE/shrine from bugfix/SHRINE-2115-figure-out-what-to-do-with-text to develop
* commit ... | | |
Yifan Xing | 590c89dadee | Merge pull request #74 in SHRINE/shrine from ~YXING/shrine:downstream to develop
* commit '6bf546d1a29ceeabaf90d5015... | | |
yifan xing | 6bf546d1a29 | deleted todo | | |
Yifan Xing | 452548d04c2 | Merge pull request #76 in SHRINE/shrine from ~YXING/shrine:wireformat to develop
* commit '1c469e7313791fdb8df5a5f48... | | |
yifan xing | 1c469e73137 | moved AggregatedRunQueryResponse back to net.shrine.protocol | | |
Yifan Xing | 1bf02659a9a | Merge pull request #72 in SHRINE/shrine from ~YXING/shrine:deadline to develop
* commit '97760b785e898bd7d9ed22cef95... | | |
yifan xing | 97760b785e8 | rename problem name | | |
yifan xing | 830caef442c | combied two runners into one | | |
yifan xing | 3d76759d294 | moved wire formats into net.shrine.protocal.version.v24 | | |
yifan xing | 634908cffd6 | implemented review comments | | |
yifan xing | 0db8fa921a7 | Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine into deadline | | |
yifan xing | a2c5faad348 | clean up | | |
yifan xing | 0710a2821ef | optimize imports | | |
yifan xing | 3c2f885bcbc | clean up code | | |
yifan xing | ee078c1998a | changed HTTP response code from 404 to 422 if requesting a non-existing queue | | |
David Walend | 700d4942bea | Better bad excuse for leaving out tests for SHRINE-2115 | | |
David Walend | fc81116d066 | Cleaning up before pull request for SHRINE-2115 | | |
David Walend | 88eaaf68292 | First round of cleanup for SHRINE-2115 | | |
David Walend | ddcff6478fd | Got SHRINE-2115 with as good as the logic can be given the CRC's limitations. | | |
yifan xing | 96e5408b620 | implemented Dave's review comments | | |
David Walend | 7af619a60b2 | Found the xml.text calls that gave what looked like an unformatted error message for SHRINE-2115 | | |
David Walend | 580d5bbd5d8 | If i2b2 worked reliably as advertised then SHRINE-2115 would be done but for cleanup. Alas it is not te case. | | |
yifan xing | b7dc65d5bc5 | fixed bug in webClient | | |
David Walend | 0afa3be6c75 | Merge branch 'develop' into bugfix/SHRINE-2115-figure-out-what-to-do-with-text | | |
David Walend | a9aeb4dbfbd | Bumped version number to 1.24.1.3-SNAPSHOT | | |
yifan xing | 54dfdd193af | throw a retry exception if queue does not exist on hub | | |
David Walend | 52bc736d8fc | First steps of converting a ReadQueryInstancesResponse to a ReadInstanceResultsResponse for SHRINE-2115. Parking so I... | | |
David Walend | 7e5279cd0ff | Got the response out of the adapter and to the hub for SHRINE-2115 | | |
David Walend | 7dffa0705bb | Now getting the query instance status from the batch_mode xml element from i2b2 for SHRINE-2115 | | |
bendcarmen | 8b8a14ce245 | Potential history fix | | |
bendcarmen | 9bbab7bbc35 | Test of removing plus/minus from query history | | |
David Walend | 4569fa0244d | Merge branch 'develop' into bugfix/SHRINE-2115-figure-out-what-to-do-with-text | | |
David Walend | 8f90fa24cf8 | Checkpoint now that I know I need the batch_mode element for status, not the query instance's query_status_type - for... | | |
yifan xing | 912b99a49b0 | implement review comments | | |
yifan xing | 2f39f78b052 | combined scheduleCleanupExpiredDeliveryAttemptInMap and scheduleCleanupExpiredMessageInDeque into the same action | | |
yifan xing | ef1ab1217a5 | used dealine instead of current system time | | |
bendcarmen | 9df5bc48f6b | potential solution to unnested query history | | |
bendcarmen | 0befc97f960 | Arranging Query History Calls the way they were before | | |
bendcarmen | bad450cbf58 | Testing a different order of history refresh | | |
David Walend | 4003cdde7c6 | Added a real queryStatusType to ReadQueryInstancesResponse and QueryInstance for SHRINE-2115 | | |
bendcarmen | 62d2d698748 | Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine into develop | | |
bendcarmen | 10e5c9d4796 | Testing out new query refresh | | |
David Walend | c137872416e | Now able to read a ReadQueryInstancesResponse without an end_date for SHRINE-2115 | | |
Yifan Xing | 48f0ca8b0e0 | Merge pull request #73 in SHRINE/shrine from ~YXING/shrine:rename to develop
* commit '5c156fc8e533e5e328705903e3e74... | | |
yifan xing | 5c156fc8e53 | fixed typo in shrine.conf | | |
David Walend | d0fd6995788 | Checking in partial progress for SHRINE-2115 before trying something I'll likely regret | | |
bendcarmen | e396d2769ea | Potential smoothing of queries | | |
David Walend | 278c611646c | Got the right call to work. Next up is using the data to make things safe. SHRINE-2115 | | |
bendcarmen | 2e7f3d2526c | Potential resolution for SHRINE-2367 | | |
bendcarmen | 9376b3a0be6 | Nevermind, have to bundle before checkin...no proper build | | |
bendcarmen | af8caf1e7f1 | attempt at a proper build | | |
bendcarmen | a86f6b2c170 | Incremental History refresh | | |
yifan xing | 12b246eba0d | renamed the modules, classes, and packages for the messagequeue system | | |
bendcarmen | 92cf27504e3 | Hope this fixes the build | | |
bendcarmen | 4cf4464c361 | Fix of node-sass issue with build | | |
bendcarmen | 33c3f14f050 | Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine into develop | | |
Next → |