SHRINE
  1. SHRINE

shrine

Public
  1. SHRINE
  2. shrine

All Branches Graph  

        
AuthorCommitMessageCommit dateBuilds
David WalendDavid Walend
bfe22026449Moved pom.xml shrine versions on develop to 1.25.2.1-SNAPSHOT
David WalendDavid Walend
e509f56f345Updated pom.xml s to 1.25.1.2-SNAPSHOT
bendcarmenbendcarmen
c748121ca72Candidate foror fix of SHRINE-2472
bendcarmenbendcarmen
435b32cf465Candidate foror fix of SHRINE-2472
bendcarmenbendcarmen
7b01943b5f3Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine into develop
bendcarmenbendcarmen
1369f69a01bMerge of feature/SHRINE-2472-show-404-error
David WalendDavid Walend
cff90d5129cMerge pull request #106 in SHRINE/shrine from bugfix/SHRINE-2481-scale-up-testing-with-jmeter to develop * commit 'e...
David WalendDavid Walend
eb05e6d89d7Merge branch 'develop' into bugfix/SHRINE-2481-scale-up-testing-with-jmeter
David WalendDavid Walend
f0defbdc7bfNo need to close the host-level spray connector, fixes SHRINE-2481
bendcarmenbendcarmen
62154054ffeCommit of feature to display network errors
Sam TsoiSam Tsoi
1a155a3351dMore changes for simplicity
Sam TsoiSam Tsoi
b045cb90d86Simplifying shrine.conf for 1.22.8
bendcarmenbendcarmen
7c6b86adfecCreated branch for SHRINE-2472
bendcarmenbendcarmen
9527c9c6069Merged in changes for SHRINE-2471
bendcarmenbendcarmen
a6c2d82d02fBuild out of sync
bendcarmenbendcarmen
bd00dc8dcacFixed an issue where require(*.scss) and harmony imports were confliting in jest, also requirie statements in main.js...
bendcarmenbendcarmen
b606a4419beBuild of merge with develop
bendcarmenbendcarmen
40f40affb39Merge of develop
David WalendDavid Walend
9ec53f4ba4ctodo for SHRINE-2481
bendcarmenbendcarmen
87b400c32a0Fix of recommended changes from code review, also added JEST test runner to verify no conclict with inlining the requ...
bendcarmenbendcarmen
03c2535bc48Added call to readApproved entries that was removed accidentally
bendcarmenbendcarmen
ac6fc8078cbsaving latest
David WalendDavid Walend
acbc30aaa8dMerge pull request #103 in SHRINE/shrine from bugfix/SHRINE-2476-message-service-client-is-rapidly to develop * comm...
David WalendDavid Walend
71512742ee8Tracking comment in the pom.xml for SHRINE-2478
David WalendDavid Walend
ed7555fb552Downgraded bouncy castle for SHRINE-2478
David WalendDavid Walend
8ea491ff688Marc-Danie's review comments for SHRINE-2476
David WalendDavid Walend
83725b36effQuick fix for a DoS attack from SHRINE on itself. SHRINE-2476
David WalendDavid Walend
d11afa55eceMerge pull request #101 in SHRINE/shrine from bugfix/SHRINE-2468-shrine-no-longer-requests-an to develop * commit '8...
David WalendDavid Walend
8fe0f076fb6Marc-Danie's review comments for SHRINE-2468
bendcarmenbendcarmen
89edff85cfaCleanup of .scss files
bendcarmenbendcarmen
5c7345239b3Cleanup and more tests
David WalendDavid Walend
4f81389d63dSome stray bits for SHRINE-2468 I found while walking the pull request
David WalendDavid Walend
607f1a8aafaMerging SHRINE-2468 to develop branch
David WalendDavid Walend
897a3424362Added a property to control the time we allow the CRC to tell us about queued queries for SHRINE-2468
bendcarmenbendcarmen
40c90ac77e7Saving fully integrated local webclient
David WalendDavid Walend
9eb7b5f48cdconfig and some error handling for SHRINE-2468
bendcarmenbendcarmen
d05a4292502Code cleanup
bendcarmenbendcarmen
b53ef3a6c4esaved latest
bendcarmenbendcarmen
f32ee63d574Full functionality, some failing tests that need to be filled in
bendcarmenbendcarmen
ac72533115csaving the latest
David WalendDavid Walend
7b9d743da1cGot things working on vagrant for SHRINE-2468
David WalendDavid Walend
0ab5c71fb1aThrough to the old shrine servlet for SHRINE-2468
bendcarmenbendcarmen
5414873f8eelatest
bendcarmenbendcarmen
ad90597d033Added tests for graph
bendcarmenbendcarmen
d2c7d1e5993latest
David WalendDavid Walend
f9e9fe26b0cBuilding the request for SHRINE-2468
bendcarmenbendcarmen
f956bd0e25aUpdated css reset
bendcarmenbendcarmen
c2f4a8a49d1saving latest
bendcarmenbendcarmen
2607cb5f48esave latest
bendcarmenbendcarmen
37e3c1c7cd1added graph
David WalendDavid Walend
0cda35184fcBuilt the insides of the request (maybe) for SHRINE-2469
David WalendDavid Walend
bbf68db31c5Logic for when to fire off the QUEUED query request for SHRINE-2468
David WalendDavid Walend
880ef141edeSkelital work for SHRINE-2468
David WalendDavid Walend
94064bc1ca8More planning comments for SHRINE-2468
David WalendDavid Walend
5e83c3fb89cMerge pull request #100 in SHRINE/shrine from feature/SHRINE-2423-indicate-that-crc-errors-come to develop * commit ...
David WalendDavid Walend
c0c7fb56dccCommented the code to call for SHRINE-2468
David WalendDavid Walend
c8b94bd540eMerge branch 'release/1.24.3' into bugfix/SHRINE-2468-shrine-no-longer-requests-an
David WalendDavid Walend
9689e8477ffpom.xml version updates for 1.24.3 hotfixes
David WalendDavid Walend
16b012dc808Added planning comments for SHRINE-2468
David WalendDavid Walend
dc3d9faddc3Added some words for a case where the CRC tells us ERROR for SHRINE-2423
David WalendDavid Walend
b86ed49f063Merge pull request #99 in SHRINE/shrine from feature/SHRINE-2441-remove-the-install-subproject to develop * commit '...
David WalendDavid Walend
48c343ef761Removed the abandoned install subproject for SHRINE-2441
bendcarmenbendcarmen
adc39be0584Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine into develop
bendcarmenbendcarmen
7eb72a1246fFix of SHRINE-1147
bendcarmenbendcarmen
1789dadc2e9Fixed labels on pagination
David WalendDavid Walend
44d68e0aa78Merge pull request #98 in SHRINE/shrine from feature/SHRINE-2453-upgrade-scalatest to develop * commit '667b5ea0c6f5...
David WalendDavid Walend
667b5ea0c6fUpdated scalatest version to 3.0.1 for SHRINE-2453
Yifan XingYifan Xing
d4ba16c4d5bMerge pull request #96 in SHRINE/shrine from ~YXING/shrine:json to develop * commit '402bf67b29d889ad0346c988d454c6b...
yifan xingyifan xing
402bf67b29dimplemented review comments, use plain text
marc-daniemarc-danie
6cbd665327aSHRINE-2176 - Fix 2 failed tests in DashboardServiceTest
yifan xingyifan xing
85400f110f1get rid of wildcard imports
yifan xingyifan xing
887324e92f5set content type to json
yifan xingyifan xing
874b1ef580aadded test that checks the media type
David WalendDavid Walend
04d80a59e36Update about the December 21st maven scala plugin bug ITEAM-2030
yifan xingyifan xing
671d3884accset message content to json
Yifan XingYifan Xing
29e63eb6209Merge pull request #95 in SHRINE/shrine from ~YXING/shrine:json to develop * commit '866e382d9f961adfa956242868c168c...
yifan xingyifan xing
866e382d9f9SHRINE-2173 fill in test json
Yifan XingYifan Xing
21691177683Merge pull request #89 in SHRINE/shrine from ~YXING/shrine:webapitry to develop * commit 'a0c923418996d8ef7e288ea29b...
yifan xingyifan xing
a0c92341899implement Dave's review comments
yifan xingyifan xing
2ef70685c24used Future instead of Try in send and receive
yifan xingyifan xing
f8c6c371a1eMerge branch 'webapitry' of https://open.med.harvard.edu/stash/scm/~yxing/shrine into webapitry
yifan xingyifan xing
631c9280396merging conflicts
Yifan XingYifan Xing
8fc4325831dMerge pull request #91 in SHRINE/shrine from ~YXING/shrine:status to develop * commit '026c937d8ebf5aafb69473db705b9...
yifan xingyifan xing
026c937d8ebadded a statusCode for send failure
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
Next →