SHRINE
  1. SHRINE

shrine

Public
  1. SHRINE
  2. shrine

All Branches Graph  

        
AuthorCommitMessageCommit dateBuilds
yifan xingyifan xing
650b8d0d96acomment back the tests, changed maven-scala plug in back to version 3.2.2
David WalendDavid Walend
3eb6fb502abMerge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine into develop
David WalendDavid Walend
fdd1d673061Try commenting out dashboard app and war for the holiday break
yifan xingyifan xing
5f557595291commented out LocalMessageQueueMiddlewareTest.scala
yifan xingyifan xing
6f1c848610afixed the infinite recursive problem
yifan xingyifan xing
deb3b3f67dfmake sure if one test fails, the other won't be affected
David WalendDavid Walend
71ae49c0ff7Merge pull request #90 in SHRINE/shrine from feature/SHRINE-2356-upgrade-back-end-dependencies to develop * commit '...
Yifan XingYifan Xing
1121853e6a4Merge pull request #83 in SHRINE/shrine from ~YXING/shrine:future to develop * commit '7fb526a43b629c6ab625796aa397f...
David WalendDavid Walend
7c6de7c18d4Second batch of library updates for SHRINE-2356
bendcarmenbendcarmen
d11176c150eFix of multiple query topics created at once
David WalendDavid Walend
cd9ec007606First block of updates
bendcarmenbendcarmen
8473eecee54Potential fix of SHRINE-2133
Ben CarmenBen Carmen
4d72edd3eccMerge pull request #88 in SHRINE/shrine from SHRINE-2446-remove-sidebar.service.js-and to develop * commit 'e6a3ba58...
yifan xingyifan xing
35f4434c08fmerging commits
marc-daniemarc-danie
e6a3ba58aa1SHRINE-2446 - Remove sidebar.service.js and sidebar.model.js since they are no longer used
Marc-Danie NazaireMarc-Danie Nazaire
695756deea8Merge pull request #86 in SHRINE/shrine from bugfix/SHRINE-2296-qa1-2-3-admin-dashboard-summary to develop * commit ...
marc-daniemarc-danie
51f5fb8844eSHRINE-2296 - Split the internalstatus/summary REST call into two separate calls - removed {}
marc-daniemarc-danie
ea739d30b37SHRINE-2296 - Split the internalstatus/summary REST call into two separate calls - removed TODO item
marc-daniemarc-danie
168c7832f59SHRINE-2296 - Split the internalstatus/summary REST call into two separate calls - renamed QueryAdapterTest object an...
marc-daniemarc-danie
9f19dbdd73dSHRINE-2296 - Split the internalstatus/summary REST call into two separate calls - more changes related to renaming t...
marc-daniemarc-danie
68e92632dffremoved todo
marc-daniemarc-danie
8ac37baa911SHRINE-2296 - Split the internalstatus/summary REST call into two separate calls - renamed the rest call to internals...
bendcarmenbendcarmen
5c9839aa5e0Potential fix of user Amin role issue and query term alias=false
bendcarmenbendcarmen
fc8261f92b2Added Mixin for Term Info alias = false
yifan xingyifan xing
7fb526a43b6changed await time from 1s to 1min in localMessageLib
marc-daniemarc-danie
a03b18491f6SHRINE-2296 - Split the internalstatus/summary REST call into two separate calls - removed unused import
yifan xingyifan xing
bd920496fdaimplemented Dave's review comments
marc-daniemarc-danie
cd018020beaSHRINE-2296 - Split the internalstatus/summary REST call into two separate calls - minor edits
marc-daniemarc-danie
9f55da522a4Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine into bugfix/SHRINE-2296-qa1-2-3-admin-...
Ansible DeployAnsible Deploy
8d822e49a6eMerge release branch release/1.24.1 into master.
Ansible DeployAnsible Deploy
4ef543f4269Update POMs with release version 1.24.2.
David WalendDavid Walend
e7c49500fc6Updated pom.xmls for the 1.24.2
David WalendDavid Walend
f61b40ca155Merge pull request #85 in SHRINE/shrine from bugfix/SHRINE-2427-deprecate-the-shouldqueryself to develop * commit '2...
bendcarmenbendcarmen
c82e7c782f8Update of readme
marc-daniemarc-danie
67cf3cf1544SHRINE-2296 - Split the internalstatus/summary REST call into two separate calls - summary and networkHealth
David WalendDavid Walend
2c6e0ff39a6Added default value for shouldQuerySelf for SHRINE-2427
David WalendDavid Walend
2425ad9371dFound a Thread.sleep() without a blocking{}. I don't think it was breaking anything.
yifan xingyifan xing
36c61ff3cf8fix merge conflicts
yifan xingyifan xing
4965e95f0abadded blocking back to prevent thread starvation
yifan xingyifan xing
8935abef8a4use futures and promises in qep and adapter
yifan xingyifan xing
63ed12525f1implemented client using futures and promises
yifan xingyifan xing
63636edb14cimplemented local messagequeue lib and api using Futures
bendcarmenbendcarmen
1fcb547107bFix of readme
bendcarmenbendcarmen
8d5acacc3a8Instructions on installing and running
bendcarmenbendcarmen
fce96bd9269Provide the ability to run npm start to spin up a local copy of the dashboard app with a local server
Yifan XingYifan Xing
319870d6b49Merge pull request #84 in SHRINE/shrine from ~YXING/shrine:damap to develop * commit 'a2c8148c07ae4074f7aaa68ae13116...
yifan xingyifan xing
a2c8148c07afix the complete bug by changing types in DAMap
David WalendDavid Walend
1bf6ff40f60Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine into develop
David WalendDavid Walend
74240d8140eCouple of nodes on shouldQuerySelf for SHRINE-2427
bendcarmenbendcarmen
2ca1b98bff2npm start to launch dev server and local client
bendcarmenbendcarmen
b8d03824479Some cleanup
bendcarmenbendcarmen
0bd7e577fe5common configuration for local ports in dev
bendcarmenbendcarmen
6535148069dNow using Webpack
bendcarmenbendcarmen
32d20bad0d7Fully functioning Query Viewer running on Web Pack
bendcarmenbendcarmen
a2600f306d9adding webpack
bendcarmenbendcarmen
99bc9f7ecdeUpdated version to 1.24.1.10-SNAPSHOT
bendcarmenbendcarmen
2be85e1748dAdded updated help guide
bendcarmenbendcarmen
2ada16b8490removed shrine-react
bendcarmenbendcarmen
db2853e0effAddition of jshint and webpack for plugin build
David WalendDavid Walend
42673bb934fUpdated pom.xml versions to 1.24.1.9-SNAPSHOT
bendcarmenbendcarmen
30fd060249aMerge branch 'release/1.24.1' into develop
bendcarmenbendcarmen
32b64f19274Clearing queries in viewer issue
bendcarmenbendcarmen
d95473ee106clearing previous queries
bendcarmenbendcarmen
c38535f00ecFix of clearing results in viewer
bendcarmenbendcarmen
e2e56ba5c5esmoothing of queries, make sure query viewer is completely cleared out with new structure
yifan xingyifan xing
b44fd32f325Merge branch 'release/1.24.1' into develop
bendcarmenbendcarmen
0dc2f374aa1Remove highlight if new query is run
bendcarmenbendcarmen
d0b520b69edFix of SHRINE-2364
bendcarmenbendcarmen
47b1a5c2d18Hopefully a fix for SHRINE-2422
bendcarmenbendcarmen
9b639fb309eclear highlight
bendcarmenbendcarmen
ca326d41477Clear selected query when hitting clear
bendcarmenbendcarmen
44deae0b4e5Possible fix of SHRINE-2405
yifan xingyifan xing
1c0d25678cefixed pom files version
bendcarmenbendcarmen
7d894c30010Possible fix of SHRINE-2422
yifan xingyifan xing
8f9648da10cMerge branch 'release/1.24.1' into develop
David WalendDavid Walend
4bbf9eba362Updated version to 1.24.1.8-SNAPSHOT
David WalendDavid Walend
f0fa0cf9ecdMerge branch 'release/1.24.1' of https://open.med.harvard.edu/stash/scm/shrine/shrine into release/1.24.1
David WalendDavid Walend
ad989b8f917Cut-and-paste merge of SHRINE-2421
Yifan XingYifan Xing
570d699d54eMerge pull request #80 in SHRINE/shrine from ~YXING/shrine:fixSendBug to release/1.24.1 * commit '1f3fc3f8428244136a...
yifan xingyifan xing
1f3fc3f8428renamed a method in send
yifan xingyifan xing
047f3849640implemented resent if encountered CouldNotCompleteMomTaskButOKToRetryException
bendcarmenbendcarmen
a8cdb3828f9smoothing queries...last call.
bendcarmenbendcarmen
07a9a81ec92Merge branch 'release/1.24.1' of https://open.med.harvard.edu/stash/scm/shrine/shrine into release/1.24.1
bendcarmenbendcarmen
e06d1dbddectesting out adding loader back in for Previous Queries
Yifan XingYifan Xing
45e905ede49Merge pull request #79 in SHRINE/shrine from ~YXING/shrine:fixSendBug to release/1.24.1 * commit 'ed7d6c84fa6652b685...
yifan xingyifan xing
ed7d6c84fa6clean up comments
yifan xingyifan xing
c3dcbc1bd3eimplemented Dave's review
David WalendDavid Walend
29b9751f93dMerge branch 'release/1.24.1' of https://open.med.harvard.edu/stash/scm/shrine/shrine into release/1.24.1
bendcarmenbendcarmen
7dd5762c304smoothing queries
yifan xingyifan xing
a9aa376b634implemented Dave's comments: better logging message
bendcarmenbendcarmen
3d18f0469e4query smoothing back in
bendcarmenbendcarmen
b0b4dc27883roll back of query smoothing
yifan xingyifan xing
17c9007c3f7used transform instead of for-comprehension to catch the failures
bendcarmenbendcarmen
85522f4009dquery smoothing
Sam TsoiSam Tsoi
44b84b32f18Fixed shrine.conf syntax errors
bendcarmenbendcarmen
f104bdf61a1Smoothing previous queries
David WalendDavid Walend
5aea0abdc09Comments for the next round of bug fixes
bendcarmenbendcarmen
6d13bdc0933test of smoothing previous queries
bendcarmenbendcarmen
47b843217ffTest of query highlightt
bendcarmenbendcarmen
e3b78fa9e5aTesting query history responsiveness
bendcarmenbendcarmen
b1161b5639bUpdated POM version to 1.24.1.7-SNAPSHOT
bendcarmenbendcarmen
205fd521182loader issue
bendcarmenbendcarmen
c58863eb31bpotential fix of broken drag and drop for previous queries
bendcarmenbendcarmen
ffadb22285dPotential fix of SHRINE-2397
bendcarmenbendcarmen
2b1e6b72e32Potential fix of previous query highlighting issue
bendcarmenbendcarmen
c4d79124adfBumped POMs to 1.24.1.6-SNAPSHOT
bendcarmenbendcarmen
23d538799efPotential fix of SHRINE-2398
bendcarmenbendcarmen
d6b69532a70Potential Fix of SHRINE-2395 and SHRINE-2396
bendcarmenbendcarmen
7a97113e5bcPotential fix of loading issue
yifan xingyifan xing
173243efc40Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine into develop
yifan xingyifan xing
64833c6725brevert change in commit 7d029b14fd9
bendcarmenbendcarmen
886400cbe17Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine into develop
bendcarmenbendcarmen
a421670accbupdated poms to 1.25.1.1-SNAPSHOT
yifan xingyifan xing
7d029b14fd9fixed the wrong link to error wiki page
bendcarmenbendcarmen
c7786d2a7f4Candidate for fix of SHRINE-2397
bendcarmenbendcarmen
8a5850ee0b1Updated POMS to 1.25.1.5-SNAPSHOT
bendcarmenbendcarmen
1054dc251adupdate poms to 1.24.2.1-SNAPSHOT
bendcarmenbendcarmen
679243c2e5dupdate poms to 1.24.2.1-SNAPSHOT
bendcarmenbendcarmen
d4e2e45f337Fix of missing plus sign for query terms
bendcarmenbendcarmen
3e82e669bf1Removed "display" from right click menu
bendcarmenbendcarmen
4a5b996c5baMerge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine into develop
bendcarmenbendcarmen
a0f4c3f9db2Candidate for CSS fix
Yifan XingYifan Xing
fc50a918f89Merge pull request #77 in SHRINE/shrine from bugfix/SHRINE-2328-webclient-while-running-complex to develop * commit ...
Yifan XingYifan Xing
c3510eceebaMerge pull request #78 in SHRINE/shrine from bugfix/SHRINE-2366-formatdetectingadaptermappingssource to develop * co...
bendcarmenbendcarmen
76b31e3cc15Candidate for previous queries
bendcarmenbendcarmen
5e47cb989a2Updated the version to 1.24.1.3-SNAPSHOT
bendcarmenbendcarmen
4eb72444297reset
bendcarmenbendcarmen
d6726237264Test of fix for locking previous queries
bendcarmenbendcarmen
15154297db3Test of locking previous queries fix
David WalendDavid Walend
a6cd4fd6be4Now log the error in the CSV file earlier. (The old error is going to catalina.out) Fixes SHRINE-2366
David WalendDavid Walend
117cb6a5474Merge branch 'develop' into bugfix/SHRINE-2328-webclient-while-running-complex
David WalendDavid Walend
17715a98094Change that makes SHRINE-2328 less terrible. It seems fixed on shrine-dev*
David WalendDavid Walend
4235fc4b2b2Merge pull request #75 in SHRINE/shrine from bugfix/SHRINE-2115-figure-out-what-to-do-with-text to develop * commit ...
Yifan XingYifan Xing
590c89dadeeMerge pull request #74 in SHRINE/shrine from ~YXING/shrine:downstream to develop * commit '6bf546d1a29ceeabaf90d5015...
yifan xingyifan xing
6bf546d1a29deleted todo
Yifan XingYifan Xing
452548d04c2Merge pull request #76 in SHRINE/shrine from ~YXING/shrine:wireformat to develop * commit '1c469e7313791fdb8df5a5f48...
yifan xingyifan xing
1c469e73137moved AggregatedRunQueryResponse back to net.shrine.protocol
Yifan XingYifan Xing
1bf02659a9aMerge pull request #72 in SHRINE/shrine from ~YXING/shrine:deadline to develop * commit '97760b785e898bd7d9ed22cef95...
yifan xingyifan xing
97760b785e8rename problem name
yifan xingyifan xing
830caef442ccombied two runners into one
yifan xingyifan xing
3d76759d294moved wire formats into net.shrine.protocal.version.v24
yifan xingyifan xing
634908cffd6implemented review comments
yifan xingyifan xing
0db8fa921a7Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine into deadline
yifan xingyifan xing
a2c5faad348clean up
yifan xingyifan xing
0710a2821efoptimize imports
yifan xingyifan xing
3c2f885bcbcclean up code
yifan xingyifan xing
ee078c1998achanged HTTP response code from 404 to 422 if requesting a non-existing queue
David WalendDavid Walend
700d4942beaBetter bad excuse for leaving out tests for SHRINE-2115
David WalendDavid Walend
fc81116d066Cleaning up before pull request for SHRINE-2115
David WalendDavid Walend
88eaaf68292First round of cleanup for SHRINE-2115
David WalendDavid Walend
ddcff6478fdGot SHRINE-2115 with as good as the logic can be given the CRC's limitations.
yifan xingyifan xing
96e5408b620implemented Dave's review comments
David WalendDavid Walend
7af619a60b2Found the xml.text calls that gave what looked like an unformatted error message for SHRINE-2115
David WalendDavid Walend
580d5bbd5d8If i2b2 worked reliably as advertised then SHRINE-2115 would be done but for cleanup. Alas it is not te case.
yifan xingyifan xing
b7dc65d5bc5fixed bug in webClient
David WalendDavid Walend
0afa3be6c75Merge branch 'develop' into bugfix/SHRINE-2115-figure-out-what-to-do-with-text
David WalendDavid Walend
a9aeb4dbfbdBumped version number to 1.24.1.3-SNAPSHOT
yifan xingyifan xing
54dfdd193afthrow a retry exception if queue does not exist on hub
David WalendDavid Walend
52bc736d8fcFirst steps of converting a ReadQueryInstancesResponse to a ReadInstanceResultsResponse for SHRINE-2115. Parking so I...
David WalendDavid Walend
7e5279cd0ffGot the response out of the adapter and to the hub for SHRINE-2115
David WalendDavid Walend
7dffa0705bbNow getting the query instance status from the batch_mode xml element from i2b2 for SHRINE-2115
bendcarmenbendcarmen
8b8a14ce245Potential history fix
bendcarmenbendcarmen
9bbab7bbc35Test of removing plus/minus from query history
David WalendDavid Walend
4569fa0244dMerge branch 'develop' into bugfix/SHRINE-2115-figure-out-what-to-do-with-text
David WalendDavid Walend
8f90fa24cf8Checkpoint now that I know I need the batch_mode element for status, not the query instance's query_status_type - for...
yifan xingyifan xing
912b99a49b0implement review comments
yifan xingyifan xing
2f39f78b052combined scheduleCleanupExpiredDeliveryAttemptInMap and scheduleCleanupExpiredMessageInDeque into the same action
yifan xingyifan xing
ef1ab1217a5used dealine instead of current system time
bendcarmenbendcarmen
9df5bc48f6bpotential solution to unnested query history
bendcarmenbendcarmen
0befc97f960Arranging Query History Calls the way they were before
bendcarmenbendcarmen
bad450cbf58Testing a different order of history refresh
David WalendDavid Walend
4003cdde7c6Added a real queryStatusType to ReadQueryInstancesResponse and QueryInstance for SHRINE-2115
bendcarmenbendcarmen
62d2d698748Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine into develop
bendcarmenbendcarmen
10e5c9d4796Testing out new query refresh
David WalendDavid Walend
c137872416eNow able to read a ReadQueryInstancesResponse without an end_date for SHRINE-2115
Yifan XingYifan Xing
48f0ca8b0e0Merge pull request #73 in SHRINE/shrine from ~YXING/shrine:rename to develop * commit '5c156fc8e533e5e328705903e3e74...
yifan xingyifan xing
5c156fc8e53fixed typo in shrine.conf
David WalendDavid Walend
d0fd6995788Checking in partial progress for SHRINE-2115 before trying something I'll likely regret
bendcarmenbendcarmen
e396d2769eaPotential smoothing of queries
David WalendDavid Walend
278c611646cGot the right call to work. Next up is using the data to make things safe. SHRINE-2115
bendcarmenbendcarmen
2e7f3d2526cPotential resolution for SHRINE-2367
bendcarmenbendcarmen
9376b3a0be6Nevermind, have to bundle before checkin...no proper build
bendcarmenbendcarmen
af8caf1e7f1attempt at a proper build
bendcarmenbendcarmen
a86f6b2c170Incremental History refresh
yifan xingyifan xing
12b246eba0drenamed the modules, classes, and packages for the messagequeue system
bendcarmenbendcarmen
92cf27504e3Hope this fixes the build
bendcarmenbendcarmen
4cf4464c361Fix of node-sass issue with build
bendcarmenbendcarmen
33c3f14f050Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine into develop
Next →