SHRINE
  1. SHRINE

shrine

Public
  1. SHRINE
  2. shrine

All Branches Graph  

        
AuthorCommitMessageCommit dateBuilds
David WalendDavid Walend
cab5bbaa63cMerge pull request #322 in SHRINE/shrine from feature/SHRINE-2856-send-the-crc-s-reply-from-the to release/1.26.3 * ...
marc-daniemarc-danie
748bb047641SHRINE-3026 - Port the authenticated diagnostic to and from dashboard route to http4s - renamed StatusUtil to Dashboa...
David WalendDavid Walend
9a457130176Merging to the sprint release branch
Marc-Danie NazaireMarc-Danie Nazaire
0b3ddda22f6Merge pull request #324 in SHRINE/shrine from bugfix/SHRINE-3019-connectivity-test-issue-email to develop * commit '...
marc-daniemarc-danie
09469c804f4SHRINE-3026 - Port the authenticated diagnostic to and from dashboard route to http4s - code review cleanup
Ben CarmenBen Carmen
5bf3ed8a839Merge pull request #284 in SHRINE/shrine from task/SHRINE-2822-serve-webclient-from-war to develop * commit 'c3c0d4b...
bendcarmenbendcarmen
c3c0d4b2997merge of with develop
bendcarmenbendcarmen
dd345983babPotential fix of dropdown overlapping
marc-daniemarc-danie
fbb22fcdb7eSHRINE-3026 - Port the authenticated diagnostic to and from dashboard route to http4s - code cleanup
bendcarmenbendcarmen
1bffadea1a4Potential fix of text formatting for query sort options button
marc-daniemarc-danie
1f28be62175SHRINE-3026 - Port the authenticated diagnostic to and from dashboard route to http4s - removed wildcard imports
marc-daniemarc-danie
ecf3338094bSHRINE-3019 - Connectivity Test Issue Email: An extra white space is appearing above the 'Hello' text
marc-daniemarc-danie
46e7f5a5af3SHRINE-3065 - Add an authenticated server sent event example
David WalendDavid Walend
4c90f260084Moved develop to shrine 1.26.4.1-SNAPSHOT
David WalendDavid Walend
56aa5c01285Updated pom.xml files to Shrine 1.26.3.2-SNAPSHOT
marc-daniemarc-danie
a60a2dca4cdMerge branches 'develop' and 'feature/SHRINE-3026-port-the-authenticated-diagnostic' of https://open.med.harvard.edu/...
David WalendDavid Walend
55c2c5357ecMarc-Danie's got a sharp eye. Updated a jira ticket number in a comment.
David WalendDavid Walend
1b417fd7e61Commenting out HubDispatcherTest again
David WalendDavid Walend
0cb8ea62740Jira ticket in comment for SHRINE-2856
marc-daniemarc-danie
2ce2972dfa1SHRINE-3026 - Port the authenticated diagnostic to and from dashboard route to http4s - test update and code cleanup
marc-daniemarc-danie
5711533ceb8SHRINE-3026 - Port the authenticated diagnostic to and from dashboard route to http4s - removed wildcard import
marc-daniemarc-danie
ed33be2a195SHRINE-3026 - Port the authenticated diagnostic to and from dashboard route to http4s - test update and code cleanup
David WalendDavid Walend
18f16857b04Merge remote-tracking branch 'origin/develop' into feature/SHRINE-2856-send-the-crc-s-reply-from-the
David WalendDavid Walend
158917f5b31Commented out a test for SHRINE-2988
David WalendDavid Walend
e6f6a4f4eafBridging a test for SHRINE-2856
Marc-Danie NazaireMarc-Danie Nazaire
844797b177cMerge pull request #321 in SHRINE/shrine from feature/SHRINE-3059-incorporate-the-qep-queryresult to develop * commi...
marc-daniemarc-danie
c35317f537cSHRINE-3059 - Incorporate the qep/queryResult endpoint into shrine-api via proxy - removed wildcard import
Ben CarmenBen Carmen
b658ec4ab9eMerge pull request #320 in SHRINE/shrine from bugfix/SHRINE-3508-fix-broken-history to develop * commit 'c7974cbac8b...
marc-daniemarc-danie
16631fcf95aSHRINE-3059 - Incorporate the qep/queryResult endpoint into shrine-api via proxy - code cleanup
marc-daniemarc-danie
a5934f5475cSHRINE-3059 - Incorporate the qep/queryResult endpoint into shrine-api via proxy - cleaned up up the imports
marc-daniemarc-danie
8e0d3854089SHRINE-3059 - Incorporate the qep/queryResult endpoint into shrine-api via proxy
bendcarmenbendcarmen
c7974cbac8bremoved unnecessary destructured dataVersion
bendcarmenbendcarmen
d3db152db9cFix of a snapshot test
bendcarmenbendcarmen
df2efdb2fa8Updates to accomodate the new structure of the queryHistoryTable
marc-daniemarc-danie
394f1e47751SHRINE-3026 - Port the authenticated diagnostic to and from dashboard route to http4s - updated the Uri in the test
David WalendDavid Walend
f8321395e28Network and node available for tests for SHRINE-2856
David WalendDavid Walend
106e34a0a1fMaybe out of dependency purgatory for SHRINE-3054
marc-daniemarc-danie
e2f3a3eba41SHRINE-3026 - Port the authenticated diagnostic to and from dashboard route to http4s - fromDashboard is now working
Marc-Danie NazaireMarc-Danie Nazaire
2f941ee900fMerge pull request #319 in SHRINE/shrine from feature/SHRINE-3042-update-the-qep-queryresultstable to develop * comm...
marc-daniemarc-danie
12f81f3c8c4SHRINE-3042 - Update the qep/queryResultsTable call to use http4s - changed changeDate.asc to dateCreated.asc
David WalendDavid Walend
65e10acc1c5Turned the QepReceiver back on. Wasn't quite ready to turn that off.
David WalendDavid Walend
e5b5bfde58fDisabled HubDispatcherStartTest to diagnose later why it fails on Bamboo build server.
David WalendDavid Walend
4202dc9822eMoved the UserAuthenticator out of commons/auth for SHRINE-3054
bendcarmenbendcarmen
a91762c3fd3updated tests to reflect queries instead of queryResults
David WalendDavid Walend
be2e0ef51abStewardQueryAuthorizationService freed from spray for SHRINE-2988
David WalendDavid Walend
0c943c77ec5Give the adapter service a network available for testing for SHRINE-2856
marc-daniemarc-danie
15a46f1b6a2Merge branches 'develop' and 'feature/SHRINE-3026-port-the-authenticated-diagnostic' of https://open.med.harvard.edu/...
Ben CarmenBen Carmen
139b6a3bb83Merge pull request #318 in SHRINE/shrine from feature/SHRINE-3501-call-sort-service to develop * commit '09b37aa0dff...
bendcarmenbendcarmen
09b37aa0dffAlias the queries element in the response to queryResults.
bendcarmenbendcarmen
95a84dce9b5utilize the sorting feature of the queryHistory serice
David WalendDavid Walend
18000b913b3Consolidated the hub-client and hub-service projects to support SHRINE-2856 testing
David WalendDavid Walend
f4f5b6824a0Looks like SHRINE-2856 is working, but is not yet testable.
bendcarmenbendcarmen
b4088936133Incorporated suggested code review changes
bendcarmenbendcarmen
3e5099a10aaMerge branch 'develop' into task/SHRINE-2822-serve-webclient-from-war
marc-daniemarc-danie
44fc2b45adeMerge branches 'develop' and 'feature/SHRINE-3026-port-the-authenticated-diagnostic' of https://open.med.harvard.edu/...
Marc-Danie NazaireMarc-Danie Nazaire
cbb0e3c1c30Merge pull request #317 in SHRINE/shrine from feature/SHRINE-3042-update-the-qep-queryresultstable to develop * comm...
marc-daniemarc-danie
0f3d3144ff7Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE-3042-update-the-qe...
marc-daniemarc-danie
cee4483b255SHRINE-3042 - Update the qep/queryResultsTable call to use http4s - trimmed down the contents of the response to only...
David WalendDavid Walend
a9812fc3927Merge pull request #313 in SHRINE/shrine from feature/SHRINE-2857-receive-result-updates-at-the to develop * commit ...
marc-daniemarc-danie
7b9f0d6ff87SHRINE-3042 - Update the qep/queryResultsTable call to use http4s - a little code cleanup
David WalendDavid Walend
0158bad84ecMy review changes for SHRINE-2857
marc-daniemarc-danie
e65e92d9191SHRINE-3042 - Update the qep/queryResultsTable call to use http4s - added sortBy feature and tests
David WalendDavid Walend
17ee6d45b6cResults flow into the hub's database for SHRINE-2857
David WalendDavid Walend
e05822ab6a4Merge remote-tracking branch 'origin/develop' into feature/SHRINE-2857-receive-result-updates-at-the
David WalendDavid Walend
d33d5753ae3Network setup tests pass. hub is able to receive a message for SHRINE-2857
marc-daniemarc-danie
4ccddc20c76SHRINE-3042 - Update the qep/queryResultsTable call to use http4s
David WalendDavid Walend
6a4d75b687fGot the initial config to the database for SHRINE-2857
David WalendDavid Walend
f0ad5539a8cSuggestions from Marc-Danie's review for SHRIEN-2857
bendcarmenbendcarmen
22da8a7bf75style cleanup
bendcarmenbendcarmen
17f6196cddaClean up some positioning styles.
David WalendDavid Walend
e201edbe1c8A way to get a static configuration in for the new work for SHRINE-2857
marc-daniemarc-danie
3bdf87840e9SHRINE-3026 - Port the authenticated diagnostic to and from dashboard route to http4s - includes some tests
David WalendDavid Walend
b18fde9cb9cIncremental work on SHRINE-2857, not done but need to check something on a different branch
David WalendDavid Walend
7a5871a7e72Leving the start for later for SHRINE-2857
Ben CarmenBen Carmen
75c20046c9fMerge pull request #314 in SHRINE/shrine from bugfix/SHRINE-2954-flag-delete-rename-previous-queries to develop * co...
Ben CarmenBen Carmen
faeedbdbe73Merge pull request #316 in SHRINE/shrine from bugfix/SHRINE-3022-remove-green-checkbox to develop * commit '7d03c8bd...
bendcarmenbendcarmen
7d03c8bdf03Remove ability for user to set timeout.
Marc-Danie NazaireMarc-Danie Nazaire
034ed30b448Merge pull request #315 in SHRINE/shrine from feature/SHRINE-2895-port-the-authenticated-diagnostic to develop * com...
marc-daniemarc-danie
9f6cf9ab4dfSHRINE-2895 - Port the authenticated diagnostic status route to http4, SHRINE-3024 - fixed rename error
Marc-Danie NazaireMarc-Danie Nazaire
6c1ae7e2062Merge pull request #312 in SHRINE/shrine from feature/SHRINE-2895-port-the-authenticated-diagnostic to develop * com...
bendcarmenbendcarmen
d0742301414simplifie styles for pop up menus
marc-daniemarc-danie
86f79f0692dSHRINE-2895 - Port the authenticated diagnostic status route to http4, SHRINE-3024 - removed unused dependency
bendcarmenbendcarmen
b9dd7dcd679Show flagged status in previous query
David WalendDavid Walend
bbc7d67dc03Merge remote-tracking branch 'origin/develop' into feature/SHRINE-2857-receive-result-updates-at-the
David WalendDavid Walend
2ec705528e7The hub can receive results for SHRINE-2857
David WalendDavid Walend
aaa87fc173bNow safe to start (and restart) the hub's dispatcher for SHRINE-2857
David WalendDavid Walend
23808b3b44cMore progress toward - now ready to receive results SHRINE-2857
bendcarmenbendcarmen
b4824bc287asaving changes
David WalendDavid Walend
8b36cc913daStart of the dispatcher and some testing for SHRINE-2857
David WalendDavid Walend
c13185ffa0fClient side of the hub's service api for the network for SHRINE-2857
David WalendDavid Walend
795d8b9ffe1Got the queue for the hub to receive from defined for SHRINE-2857
David WalendDavid Walend
a931d9351c1Getting deeper into the hub and queue's lifecycle for SHRINE-2857
marc-daniemarc-danie
335ada8b9a4SHRINE-2895 - Port the authenticated diagnostic status route to http4, SHRINE-3024 - Fix issue with AsyncHttpClient n...
bendcarmenbendcarmen
8cfd4314f4ffix of broken snapshot
Ben CarmenBen Carmen
32d80ef9846Merge pull request #311 in SHRINE/shrine from task/SHRINE-2907-history-sort to develop * commit '9201ac62236cf3d7a6c...
bendcarmenbendcarmen
9201ac62236incorporated suggestion from review
David WalendDavid Walend
2b584bf44cdHub can make queues for SHRINE-2857
bendcarmenbendcarmen
7e6a117744asome CSS tweaks
bendcarmenbendcarmen
6caf9aa88casuggested code review change
bendcarmenbendcarmen
daad8aaf415Merge branch 'develop' into task/SHRINE-2907-history-sort
bendcarmenbendcarmen
fefc19296b1Potential Solution for UI for sorting options of Query History
David WalendDavid Walend
bbca12e432dChanges made while testing the node service at the hub for SHRINE-2857
David WalendDavid Walend
36486557e9bAdding the hub data service to the works for SHRINE-2857
David WalendDavid Walend
1b4bf976dceAdded ability to put a Node in the hub for SHRINE-2857
David WalendDavid Walend
a04761da682Added hub-client subproject for SHRINE-2857
David WalendDavid Walend
8c9ff8b3079Fix after merge
David WalendDavid Walend
ca2e67b7c91Merge remote-tracking branch 'origin/develop' into feature/SHRINE-2857-receive-result-updates-at-the
David WalendDavid Walend
630dad8f754First blush of the reciever code for SHRINE-2857
David WalendDavid Walend
68911966823Turning back to some streaming I understand for SHRINE-2857
marc-daniemarc-danie
c4b8ae43eccMerge branches 'develop' and 'feature/SHRINE-2895-port-the-authenticated-diagnostic' of https://open.med.harvard.edu/...
Marc-Danie NazaireMarc-Danie Nazaire
bfe70b56e39Merge pull request #309 in SHRINE/shrine from feature/SHRINE-2896-port-the-unauthenticated-static to develop * commi...
marc-daniemarc-danie
b321b7db28eMerge branches 'develop' and 'feature/SHRINE-2896-port-the-unauthenticated-static' of https://open.med.harvard.edu/st...
David WalendDavid Walend
db4d071b63aMerging
David WalendDavid Walend
6191e6faf88A little progress on SHRINE-2857 before a merge
marc-daniemarc-danie
1ae1f2757f1SHRINE-2895 - Port the authenticated diagnostic route to http4s - ported the authenticate status routes and some code...
Marc-Danie NazaireMarc-Danie Nazaire
5af9c0850b4Merge pull request #310 in SHRINE/shrine from feature/SHRINE-3018-set-up-basic-authentication-using to develop * com...
marc-daniemarc-danie
7b62ebe841eSHRINE-3018 - Set up basic authentication using http4s - removed unused dependency javax.servlet
marc-daniemarc-danie
1798ac7b15cSHRINE-2896 - Port the unauthenticated static route to http4s - created a separate static section in shrine.conf
marc-daniemarc-danie
89df13aa54cSHRINE-3018 - Set up basic authentication using http4s
David WalendDavid Walend
666fc3b748fAdded a new subproject to hold the receiver of messages for SHRINE-2857
marc-daniemarc-danie
9edde606826SHRINE-2896 - Port the unauthenticated static route to http4s
David WalendDavid Walend
c0f5dec5e10Merge pull request #308 in SHRINE/shrine from feature/SHRINE-3013-investigate-stream-instead-of to develop * commit ...
Marc-Danie NazaireMarc-Danie Nazaire
5c51adcdd61Merge pull request #302 in SHRINE/shrine from feature/SHRINE-2894-port-the-unauthenticated-diagnostic to develop * c...
marc-daniemarc-danie
5b02387655bSHRINE-2894 - Port the unauthenticated diagnostic route to http4s - fixed 500 error
David WalendDavid Walend
82410e2f062Cleanup for SHRINE-3013
David WalendDavid Walend
98629f5958bGot streaming working for SHRINE-3013
David WalendDavid Walend
4ad4df3c6fbChanged from streaming to stream for SHRINE-3013
David WalendDavid Walend
71f81961814Switched over to a resource for all but streaming for SHRINE-3013
marc-daniemarc-danie
402ddd1cffcMerge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE-2894-port-the-unau...
marc-daniemarc-danie
41d4ab6848bSHRINE-2894 - Port the unauthenticated diagnostic route to http4s - add missing dependency and vagrant_deploy.sh exec...
David WalendDavid Walend
8320a390654Merge pull request #305 in SHRINE/shrine from feature/SHRINE-2112-remove-researcher-control-of to develop * commit '...
David WalendDavid Walend
68548d78805Merge cleanup for SHRINE-2112
bendcarmenbendcarmen
0606b43b31eMerge branch 'task/SHRINE-2983-right-click-menu' into develop
bendcarmenbendcarmen
d00b6bfbf3acode cleanup
David WalendDavid Walend
ab7f62e30e4Merge remote-tracking branch 'origin/develop' into feature/SHRINE-2112-remove-researcher-control-of
Ben CarmenBen Carmen
e434e84a851Merge pull request #306 in SHRINE/shrine from task/SHRINE-2983-right-click-menu to develop * commit '83f739956c35c8b...
David WalendDavid Walend
a93ed2e31dfMerge pull request #307 in SHRINE/shrine from bugfix/SHRINE-3016-shrine-dev-isn-t-showing-anything to develop * comm...
David WalendDavid Walend
f763688f324Merge branch 'develop' into feature/SHRINE-2112-remove-researcher-control-of
David WalendDavid Walend
2e10fb9e4abNow reading and writing json messages the same way in the web server and client server API for SHRINE-3016
bendcarmenbendcarmen
83f739956c3Potential solution for right click menu
David WalendDavid Walend
365d395ebcbTemporarily moved the QepReceiver into the shrine-api.war to get things working again for SHRINE-3016
David WalendDavid Walend
dc64ec4fc07Getting closer - was able to jam the shapeless dependency in shrine.war for SHRINE-3016
bendcarmenbendcarmen
f2e6f9fde4eRenaming to avoid confusion
David WalendDavid Walend
a98554b7b72Put in a temporary patch to get the system working again for SHRINE-3016. Still more to go.
David WalendDavid Walend
9c21bfd2080Now back to 'no more messages will be sent' for SHRINE-3016
David WalendDavid Walend
ac40410ab0dMoved the MessageQueueShutdownContextListener to shrine-api.war for SHRINE-3016
David WalendDavid Walend
0605302d635Parking this branch for now.
bendcarmenbendcarmen
afce5c9de81Possible solution for the right click menu for previous queries
marc-daniemarc-danie
d91dedc86e6Merge branches 'develop' and 'feature/SHRINE-2894-port-the-unauthenticated-diagnostic' of https://open.med.harvard.ed...
bendcarmenbendcarmen
1c08334dc43Merge branch 'develop' into task/SHRINE-2983-right-click-menu
Ben CarmenBen Carmen
0eb10e793f7Merge pull request #304 in SHRINE/shrine from task/SHRINE-3000-infinite-scroll to develop * commit 'f7d95e1e27085a85...
bendcarmenbendcarmen
1c612a83691Saving work
David WalendDavid Walend
e16cb9cc97eMerge pull request #303 in SHRINE/shrine from feature/SHRINE-2857-receive-result-updates-at-the to develop * commit ...
David WalendDavid Walend
c655f97451dMarc-Danie's review comment for my own passing comment about unmapped terms.
David WalendDavid Walend
272e3b22b15Walking back the move from http4s 0.19.0-M4 to M2 to fix SHRINE-3016
marc-daniemarc-danie
7d1ea1cb1b1SHRINE-2894 - Port the unauthenticated diagnostic route to http4s - code cleanup
David WalendDavid Walend
f5e778526c5Fix for SHRINE-2112 Adapter now controls the query's timeout with the CRC
David WalendDavid Walend
7a441652309First try at making the CRC timeout configurable for SHRINE-2112
marc-daniemarc-danie
d387d89f1f3SHRINE-2894 - Port the unauthenticated diagnostic route to http4s - removed unused import
marc-daniemarc-danie
6aef2a2ffa1SHRINE-2894 - Port the unauthenticated diagnostic route to http4s - more cleanup of implicits
marc-daniemarc-danie
09b2e6bd439SHRINE-2894 - Port the unauthenticated diagnostic route to http4s - renamed to dashboard from diagnostic
marc-daniemarc-danie
0d48b4a7af3SHRINE-2894 - Port the unauthenticated diagnostic route to http4s - renamed to dashboard from diagnostic
marc-daniemarc-danie
9c548845eb1SHRINE-2894 - Port the unauthenticated diagnostic route to http4s - renaming cleanup
marc-daniemarc-danie
c4356de64eeSHRINE-2894 - Port the unauthenticated diagnostic route to http4s - renaming cleanup
marc-daniemarc-danie
62c03c685adSHRINE-2894 - Port the unauthenticated diagnostic route to http4s - more naming of diagnostic to dashboard
marc-daniemarc-danie
6efb4e204f3SHRINE-2894 - Port the unauthenticated diagnostic route to http4s - more naming of diagnostic to dashboard
marc-daniemarc-danie
1553c5dc175SHRINE-2894 - Port the unauthenticated diagnostic route to http4s - changed package of test
marc-daniemarc-danie
1223f4c6f56SHRINE-2894 - Port the unauthenticated diagnostic route to http4s - renamed to dashboard from diagnostic
marc-daniemarc-danie
f3df095ced5SHRINE-2894 - Port the unauthenticated diagnostic route to http4s - renamed to dashboard from diagnostic
bendcarmenbendcarmen
f7d95e1e270updated tests for queryHistoryReducer
bendcarmenbendcarmen
9d0997ac65efixed undefined case for limit
bendcarmenbendcarmen
cae87b8d852Fixed unit test
bendcarmenbendcarmen
88ee8867f3aMerge branch 'develop' into task/SHRINE-3000-infinite-scroll
bendcarmenbendcarmen
b00a1f452c1Potential Solution for Infinite Scroll
marc-daniemarc-danie
c33c8b0d05cSHRINE-2894 - Port the unauthenticated diagnostic route to http4s - edited code comment
marc-daniemarc-danie
f62af4e0e61SHRINE-2894 - Port the unauthenticated diagnostic route to http4s - cleaned up the use of implicits
marc-daniemarc-danie
ad6d1c7b40aSHRINE-2894 - Port the unauthenticated diagnostic route to http4s - fixed broken DiagnosticServiceTest
marc-daniemarc-danie
4cf01e1c594SHRINE-2894 - Port the unauthenticated diagnostic route to http4s - change package to net.shrine.diagnostic from net....
marc-daniemarc-danie
32ed846af70SHRINE-2894 - Port the unauthenticated diagnostic route to http4s - moved diagnostic code from shrine-api to services...
David WalendDavid Walend
98de3b0a5e2Cleaned out merge conflicts
marc-daniemarc-danie
b446380e9a6SHRINE-2894 - Port the unauthenticated diagnostic route to http4s - reverted inadvertent commit
marc-daniemarc-danie
4b35a3d6d41SHRINE-2894 - Port the unauthenticated diagnostic route to http4s - updated the initialization of AsyncHttpClient to ...
David WalendDavid Walend
e6800d85c17Added a simple service at the hub to let downstream nodes figure out their queue name (and all kinds of other stuff) ...
David WalendDavid Walend
a7ccc307914Merge pull request #301 in SHRINE/shrine from feature/SHRINE-2951-switch-to-circe-for-json-transitions to develop * ...
David WalendDavid Walend
42623ef4847Pulled the random out of the network health test for SHRINE-2857
David WalendDavid Walend
d968abee2e4Added a key and queue name to Node for SHRINE-2857
marc-daniemarc-danie
559f442fcdcSHRINE-2894 - Port the unauthenticated diagnostic route to http4s - removed unnecessary curly braces
marc-daniemarc-danie
41e8b800515SHRINE-2894 - Port the unauthenticated diagnostic route to http4s - reverting inadvertent changes