 David Walend | bbca12e432d | Changes made while testing the node service at the hub for SHRINE-2857 | | |
David Walend | 36486557e9b | Adding the hub data service to the works for SHRINE-2857 | | |
David Walend | 1b4bf976dce | Added ability to put a Node in the hub for SHRINE-2857 | | |
David Walend | a04761da682 | Added hub-client subproject for SHRINE-2857 | | |
David Walend | 8c9ff8b3079 | Fix after merge | | |
David Walend | ca2e67b7c91 | Merge remote-tracking branch 'origin/develop' into feature/SHRINE-2857-receive-result-updates-at-the | | |
David Walend | 630dad8f754 | First blush of the reciever code for SHRINE-2857 | | |
David Walend | 68911966823 | Turning back to some streaming I understand for SHRINE-2857 | | |
 marc-danie | c4b8ae43ecc | Merge branches 'develop' and 'feature/SHRINE-2895-port-the-authenticated-diagnostic' of https://open.med.harvard.edu/... | | |
 Marc-Danie Nazaire | bfe70b56e39 | Merge pull request #309 in SHRINE/shrine from feature/SHRINE-2896-port-the-unauthenticated-static to develop
* commi... | | |
marc-danie | b321b7db28e | Merge branches 'develop' and 'feature/SHRINE-2896-port-the-unauthenticated-static' of https://open.med.harvard.edu/st... | | |
David Walend | db4d071b63a | Merging | | |
David Walend | 6191e6faf88 | A little progress on SHRINE-2857 before a merge | | |
marc-danie | 1ae1f2757f1 | SHRINE-2895 - Port the authenticated diagnostic route to http4s - ported the authenticate status routes and some code... | | |
Marc-Danie Nazaire | 5af9c0850b4 | Merge pull request #310 in SHRINE/shrine from feature/SHRINE-3018-set-up-basic-authentication-using to develop
* com... | | |
marc-danie | 7b62ebe841e | SHRINE-3018 - Set up basic authentication using http4s - removed unused dependency javax.servlet | | |
marc-danie | 1798ac7b15c | SHRINE-2896 - Port the unauthenticated static route to http4s - created a separate static section in shrine.conf | | |
marc-danie | 89df13aa54c | SHRINE-3018 - Set up basic authentication using http4s | | |
David Walend | 666fc3b748f | Added a new subproject to hold the receiver of messages for SHRINE-2857 | | |
marc-danie | 9edde606826 | SHRINE-2896 - Port the unauthenticated static route to http4s | | |
David Walend | c0f5dec5e10 | Merge pull request #308 in SHRINE/shrine from feature/SHRINE-3013-investigate-stream-instead-of to develop
* commit ... | | |
Marc-Danie Nazaire | 5c51adcdd61 | Merge pull request #302 in SHRINE/shrine from feature/SHRINE-2894-port-the-unauthenticated-diagnostic to develop
* c... | | |
marc-danie | 5b02387655b | SHRINE-2894 - Port the unauthenticated diagnostic route to http4s - fixed 500 error | | |
David Walend | 82410e2f062 | Cleanup for SHRINE-3013 | | |
David Walend | 98629f5958b | Got streaming working for SHRINE-3013 | | |
David Walend | 4ad4df3c6fb | Changed from streaming to stream for SHRINE-3013 | | |
David Walend | 71f81961814 | Switched over to a resource for all but streaming for SHRINE-3013 | | |
marc-danie | 402ddd1cffc | Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE-2894-port-the-unau... | | |
marc-danie | 41d4ab6848b | SHRINE-2894 - Port the unauthenticated diagnostic route to http4s - add missing dependency and vagrant_deploy.sh exec... | | |
David Walend | 8320a390654 | Merge pull request #305 in SHRINE/shrine from feature/SHRINE-2112-remove-researcher-control-of to develop
* commit '... | | |
David Walend | 68548d78805 | Merge cleanup for SHRINE-2112 | | |
 bendcarmen | 0606b43b31e | Merge branch 'task/SHRINE-2983-right-click-menu' into develop | | |
bendcarmen | d00b6bfbf3a | code cleanup | | |
David Walend | ab7f62e30e4 | Merge remote-tracking branch 'origin/develop' into feature/SHRINE-2112-remove-researcher-control-of | | |
 Ben Carmen | e434e84a851 | Merge pull request #306 in SHRINE/shrine from task/SHRINE-2983-right-click-menu to develop
* commit '83f739956c35c8b... | | |
David Walend | a93ed2e31df | Merge pull request #307 in SHRINE/shrine from bugfix/SHRINE-3016-shrine-dev-isn-t-showing-anything to develop
* comm... | | |
David Walend | f763688f324 | Merge branch 'develop' into feature/SHRINE-2112-remove-researcher-control-of | | |
David Walend | 2e10fb9e4ab | Now reading and writing json messages the same way in the web server and client server API for SHRINE-3016 | | |
bendcarmen | 83f739956c3 | Potential solution for right click menu | | |
David Walend | 365d395ebcb | Temporarily moved the QepReceiver into the shrine-api.war to get things working again for SHRINE-3016 | | |
David Walend | dc64ec4fc07 | Getting closer - was able to jam the shapeless dependency in shrine.war for SHRINE-3016 | | |
bendcarmen | f2e6f9fde4e | Renaming to avoid confusion | | |
David Walend | a98554b7b72 | Put in a temporary patch to get the system working again for SHRINE-3016. Still more to go. | | |
David Walend | 9c21bfd2080 | Now back to 'no more messages will be sent' for SHRINE-3016 | | |
David Walend | ac40410ab0d | Moved the MessageQueueShutdownContextListener to shrine-api.war for SHRINE-3016 | | |
David Walend | 0605302d635 | Parking this branch for now. | | |
bendcarmen | afce5c9de81 | Possible solution for the right click menu for previous queries | | |
marc-danie | d91dedc86e6 | Merge branches 'develop' and 'feature/SHRINE-2894-port-the-unauthenticated-diagnostic' of https://open.med.harvard.ed... | | |
bendcarmen | 1c08334dc43 | Merge branch 'develop' into task/SHRINE-2983-right-click-menu | | |
Ben Carmen | 0eb10e793f7 | Merge pull request #304 in SHRINE/shrine from task/SHRINE-3000-infinite-scroll to develop
* commit 'f7d95e1e27085a85... | | |
bendcarmen | 1c612a83691 | Saving work | | |
David Walend | e16cb9cc97e | Merge pull request #303 in SHRINE/shrine from feature/SHRINE-2857-receive-result-updates-at-the to develop
* commit ... | | |
David Walend | c655f97451d | Marc-Danie's review comment for my own passing comment about unmapped terms. | | |
David Walend | 272e3b22b15 | Walking back the move from http4s 0.19.0-M4 to M2 to fix SHRINE-3016 | | |
marc-danie | 7d1ea1cb1b1 | SHRINE-2894 - Port the unauthenticated diagnostic route to http4s - code cleanup | | |
David Walend | f5e778526c5 | Fix for SHRINE-2112 Adapter now controls the query's timeout with the CRC | | |
David Walend | 7a441652309 | First try at making the CRC timeout configurable for SHRINE-2112 | | |
marc-danie | d387d89f1f3 | SHRINE-2894 - Port the unauthenticated diagnostic route to http4s - removed unused import | | |
marc-danie | 6aef2a2ffa1 | SHRINE-2894 - Port the unauthenticated diagnostic route to http4s - more cleanup of implicits | | |
marc-danie | 09b2e6bd439 | SHRINE-2894 - Port the unauthenticated diagnostic route to http4s - renamed to dashboard from diagnostic | | |
marc-danie | 0d48b4a7af3 | SHRINE-2894 - Port the unauthenticated diagnostic route to http4s - renamed to dashboard from diagnostic | | |
marc-danie | 9c548845eb1 | SHRINE-2894 - Port the unauthenticated diagnostic route to http4s - renaming cleanup | | |
marc-danie | c4356de64ee | SHRINE-2894 - Port the unauthenticated diagnostic route to http4s - renaming cleanup | | |
marc-danie | 62c03c685ad | SHRINE-2894 - Port the unauthenticated diagnostic route to http4s - more naming of diagnostic to dashboard | | |
marc-danie | 6efb4e204f3 | SHRINE-2894 - Port the unauthenticated diagnostic route to http4s - more naming of diagnostic to dashboard | | |
marc-danie | 1553c5dc175 | SHRINE-2894 - Port the unauthenticated diagnostic route to http4s - changed package of test | | |
marc-danie | 1223f4c6f56 | SHRINE-2894 - Port the unauthenticated diagnostic route to http4s - renamed to dashboard from diagnostic | | |
marc-danie | f3df095ced5 | SHRINE-2894 - Port the unauthenticated diagnostic route to http4s - renamed to dashboard from diagnostic | | |
bendcarmen | f7d95e1e270 | updated tests for queryHistoryReducer | | |
bendcarmen | 9d0997ac65e | fixed undefined case for limit | | |
bendcarmen | cae87b8d852 | Fixed unit test | | |
bendcarmen | 88ee8867f3a | Merge branch 'develop' into task/SHRINE-3000-infinite-scroll | | |
bendcarmen | b00a1f452c1 | Potential Solution for Infinite Scroll | | |
marc-danie | c33c8b0d05c | SHRINE-2894 - Port the unauthenticated diagnostic route to http4s - edited code comment | | |
marc-danie | f62af4e0e61 | SHRINE-2894 - Port the unauthenticated diagnostic route to http4s - cleaned up the use of implicits | | |
marc-danie | ad6d1c7b40a | SHRINE-2894 - Port the unauthenticated diagnostic route to http4s - fixed broken DiagnosticServiceTest | | |
marc-danie | 4cf01e1c594 | SHRINE-2894 - Port the unauthenticated diagnostic route to http4s - change package to net.shrine.diagnostic from net.... | | |
marc-danie | 32ed846af70 | SHRINE-2894 - Port the unauthenticated diagnostic route to http4s - moved diagnostic code from shrine-api to services... | | |
David Walend | 98de3b0a5e2 | Cleaned out merge conflicts | | |
marc-danie | b446380e9a6 | SHRINE-2894 - Port the unauthenticated diagnostic route to http4s - reverted inadvertent commit | | |
marc-danie | 4b35a3d6d41 | SHRINE-2894 - Port the unauthenticated diagnostic route to http4s - updated the initialization of AsyncHttpClient to ... | | |
David Walend | e6800d85c17 | Added a simple service at the hub to let downstream nodes figure out their queue name (and all kinds of other stuff) ... | | |
David Walend | a7ccc307914 | Merge pull request #301 in SHRINE/shrine from feature/SHRINE-2951-switch-to-circe-for-json-transitions to develop
* ... | | |
David Walend | 42623ef4847 | Pulled the random out of the network health test for SHRINE-2857 | | |
David Walend | d968abee2e4 | Added a key and queue name to Node for SHRINE-2857 | | |
marc-danie | 559f442fcdc | SHRINE-2894 - Port the unauthenticated diagnostic route to http4s - removed unnecessary curly braces | | |
marc-danie | 41e8b800515 | SHRINE-2894 - Port the unauthenticated diagnostic route to http4s - reverting inadvertent changes | | |
marc-danie | 96c459f844d | Merge branches 'develop' and 'feature/SHRINE-2894-port-the-unauthenticated-diagnostic' of https://open.med.harvard.ed... | | |
marc-danie | f297d84d78f | SHRINE-2894 - Port the unauthenticated diagnostic route to http4s | | |
David Walend | 7980bab28c4 | Some refactoring at the start of SHRINE-2857 | | |
David Walend | 0dba4b1923d | Merge pull request #299 in SHRINE/shrine from feature/SHRINE-2848-figure-out-if-generics-can-work to develop
* commi... | | |
David Walend | 0c271e0af91 | Switched MessageAsJson over to use circe for SHRINE-2951 | | |
David Walend | 950713c8ab3 | Merge pull request #300 in SHRINE/shrine from feature/SHRINE-2951-switch-to-circe-for-json-transitions to develop
* ... | | |
David Walend | 7d6dd5b39f8 | Switched to circe for Envelope's json for SHRINE-2951 | | |
David Walend | 239c3f9b49e | Merge remote-tracking branch 'origin/develop' into feature/SHRINE-2848-figure-out-if-generics-can-work | | |
David Walend | ec5ab4d8568 | A few good things I figured out while not really getting SHRINE-2848 done | | |
David Walend | 5167dbb0d15 | Merge pull request #298 in SHRINE/shrine from feature/SHRINE-2967-send-a-429-for-queries-that-take to develop
* comm... | | |
David Walend | a3ed65388c4 | Merged from develop | | |
David Walend | d5e06bdd4c8 | Merged from develop | | |
David Walend | 9200bfda99a | Merge branch 'develop' into feature/SHRINE-2967-send-a-429-for-queries-that-take | | |
David Walend | 5a2367d44f5 | Updated http4s to 0.19.0-M4 to get the 503 response for SHRINE-2967 | | |
David Walend | e9acca1c98d | Upgraded to http4s 0.19 M3 for SHRINE-2967 | | |
marc-danie | 498b0b1a49d | Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine into develop | | |
marc-danie | 23e7ba37dd7 | Merge remote-tracking branch 'remotes/origin/release/1.26.2' into develop
# Conflicts:
# adapter/adapter-api/pom.xml... | | |
David Walend | a4765b69065 | Merge pull request #296 in SHRINE/shrine from feature/SHRINE-2890-breakdown-structure-in-results to develop
* commit... | | |
David Walend | 2f9d3fa422d | Code as it was when I asked the circe gitter room for help with SHRINE-2848 | | |
Marc-Danie Nazaire | b04228d61dd | Merge pull request #290 in SHRINE/shrine from bugfix/SHRINE-2868-make-the-network-health-web-page to release/1.26.2
... | | |
marc-danie | 32677caa3ff | Updating the POM version to 1.26.2.3-SNAPSHOT | | |
marc-danie | a8326b9e0c2 | Merge branch 'release/1.26.2' of https://open.med.harvard.edu/stash/scm/shrine/shrine into bugfix/SHRINE-2868-make-th... | | |
David Walend | cf05f731775 | Refactored the circe configuration into the Versioned object for SHRINE-2849 | | |
David Walend | 64d84a15536 | Merge pull request #297 in SHRINE/shrine from feature/SHRINE-3001-use-server-sent-events-for-mom to develop
* commit... | | |
David Walend | 00079c59497 | Client side of streaming messages in for SHRINE-3001 | | |
David Walend | b88b7a92f17 | Test streaming 10 messages for SHRINE-3001 | | |
David Walend | f90aeaf4f9f | The bulk of the server-side server sent events for SHRINE-3001 | | |
David Walend | 5657ec95140 | Stray printlns | | |
David Walend | a1fe1c0d525 | Stray printlns | | |
David Walend | c89423edc84 | Figured out some of the limits of circe to get breakdowns into the new data structures for SHRINE-2890 | | |
David Walend | f7450ca9fe4 | Checkpointing something I think should work before trying to take it all apart for SHRINE-2890 | | |
David Walend | 03a16c64464 | Merge pull request #293 in SHRINE/shrine from feature/SHRINE-2197-look-into-a-streaming-api-for to develop
* commit ... | | |
David Walend | 69b87fcf151 | Marc-Danie found a thing that was never used for SHRINE-2197 | | |
Marc-Danie Nazaire | dafc840e56a | Merge pull request #211 in SHRINE/shrine from feature/SHRINE-2763-modified-mock-crc-to-simulate to develop
* commit ... | | |
marc-danie | 3a1a31bec07 | SHRINE-2763 - Modified Mock CRC to simulate QUEUED TO ERROR with no status message - removed unneeded method override | | |
marc-danie | 043933bcd95 | SHRINE-2868 - Make the network health web page accessible - removed config settings for the QEP and now including the... | | |
Ben Carmen | d66617ea1aa | Merge pull request #295 in SHRINE/shrine from bugfix/SHRINE-2920 to develop
* commit '7d0637c72afcade59921c32f6c1e00... | | |
Ben Carmen | e4e1df2c23d | Merge pull request #294 in SHRINE/shrine from task/SHRINE-2981-curate-proptypes to develop
* commit '52319e0e137eaef... | | |
Marc-Danie Nazaire | b3c96825544 | Merge pull request #291 in SHRINE/shrine from feature/SHRINE-2764-server-sent-events-example to develop
* commit 'b8... | | |
David Walend | b632419816c | A little cleanup for SHRINE-2197 | | |
David Walend | 4181d6a52ca | Merge remote-tracking branch 'origin/develop' into feature/SHRINE-2197-look-into-a-streaming-api-for | | |
David Walend | 26b16530a9e | Made the message stream infinite for SHRINE-2197 | | |
Marc-Danie Nazaire | f281ca4f834 | Merge pull request #292 in SHRINE/shrine from SHRINE-2892-standardize-version-of-http4s to develop
* commit '4e8ae3e... | | |
bendcarmen | 52319e0e137 | Merge branch 'curate-prop-types' into task/SHRINE-2981-curate-proptypes | | |
bendcarmen | 7d0637c72af | Potential fix of SHRINE-2920 sort carrot not resetting | | |
marc-danie | 6f3363c1250 | SHRINE-2763 - Modified Mock CRC to simulate QUEUED TO ERROR with no status message - removed unused function | | |
marc-danie | 4e8ae3e2f0b | SHRINE-2892 - Standardize version of http4s and upgrade the straggler subprojects | | |
marc-danie | c9bf2becd4f | SHRINE-2763 - Modified Mock CRC to simulate QUEUED TO ERROR with no status message - simpliflied the extraction of th... | | |
David Walend | 3c6b0322ef5 | Tested sending several messages in a stream for SHRINE-2197 | | |
David Walend | 7cf4306478c | Tested sending a message in a stream for SHRINE-2197 | | |
marc-danie | b86e3a217a7 | SHRINE-2764 - Server sent events example - added comments | | |
David Walend | 2593553bcce | Filled in some new API for the local version of SHRINE-2197 | | |
marc-danie | 3055a39ac60 | SHRINE-2764 - Server sent events example - typo fix | | |
marc-danie | 02f1b102ace | SHRINE-2764 - Server sent events example | | |
David Walend | 6fb409ecb3d | Added the streaming API for SHRINE-2197 | | |
marc-danie | 03458426fef | SHRINE-2763 - Modified Mock CRC to simulate QUEUED TO ERROR with no status message - now using triple quotes when def... | | |
bendcarmen | b12c2526ba8 | merge of 1.26.2 | | |
marc-danie | 1b7abf56b0d | SHRINE-2868 - Make the network health web page accessible - Added config with default values for the qep database | | |
Ben Carmen | 45a9c46e0a8 | Merge pull request #289 in SHRINE/shrine from bugfix/SHRINE-2975-running-query-highlighting to release/1.26.2
* comm... | | |
David Walend | 8c79ea062f5 | Bumping the pom.xml versions to 1.26.3.1-SNAPSHOT after the merge | | |
David Walend | e8753834395 | Merge branch 'release/1.26.2' into develop | | |
David Walend | d71ee095dc1 | Bumping the pom.xml versions to 1.26.2.2-SNAPSHOT to ease the merge | | |
David Walend | 7217cd390a7 | Merge pull request #288 in SHRINE/shrine from bugfix/SHRINE-2977-admin-dashboard-problem-logs to release/1.26.2
* co... | | |
marc-danie | e4bf51ccecc | SHRINE-2763 - Modified Mock CRC to simulate QUEUED TO ERROR with no status message - created classes for the differen... | | |
bendcarmen | 6f4cbbf3648 | Potential fix of running query automatically highlighting in previous query section | | |
David Walend | 55187759bb7 | Put text in the detailsText for SHRINE-2977 | | |
David Walend | 21966a867d7 | Merge pull request #285 in SHRINE/shrine from feature/SHRINE-2974-extract-simplemessage-from-localmessagequeue to dev... | | |
bendcarmen | a990b0aab43 | Cleaned up failing tests | | |
bendcarmen | 09dd6be7f9b | Fixed failing tests from renaming a CSS class from pending to is-fetching | | |
Ben Carmen | 32470d475aa | Merge pull request #287 in SHRINE/shrine from bugfix/SHRINE-2978-firfox-load-images to release/1.26.2
* commit '64cc... | | |
bendcarmen | 64cc76999fc | Figured this out with CSS only. | | |
bendcarmen | 31184498cef | Merge branch 'release/1.26.2' into bugfix/SHRINE-2978-firfox-load-images | | |
Ben Carmen | 158f8b6c925 | Merge pull request #286 in SHRINE/shrine from bugfix/SHRINE-2979-firefox-run-clear-group-css to release/1.26.2
* com... | | |
bendcarmen | 558eb1c8985 | Fix for refresh image not showing up in Firefox | | |
bendcarmen | c08169d8384 | removed redundant color | | |
bendcarmen | 9d4fcb1233d | reverted missing icon changes, will handle in SHRINE-2978 | | |
bendcarmen | 749fa4db5ad | Potential fix of CSS issues in Firefox | | |
David Walend | dbbe31759b8 | Made a common set of requests for tests and the http client for MoM for SHRINE-2976 | | |
bendcarmen | 6e1352b61ce | added shrine-webclient to shrine-api-war | | |
David Walend | ed824ddf4d4 | Cleaned out the dependency in the pom.xml, and renamed to LocalMessage for SHRINE-2974 | | |
David Walend | 699422c8f99 | Created MessageAsJson for hauling around json for SHRINE-2974 | | |
bendcarmen | bf6fd4afc33 | saving work | | |
marc-danie | 8f45f1561de | SHRINE-2763 - Modified Mock CRC to simulate QUEUED TO ERROR with no status message | | |
Ben Carmen | b227e5b7035 | Merge pull request #282 in SHRINE/shrine from bugfix/SHRINE-2971-fix-highlighting to release/1.26.2
* commit '037e59... | | |
bendcarmen | 037e59e7e58 | merged with release/1.26.2 | | |
marc-danie | 38d90a3f264 | Merge branches 'develop' and 'feature/SHRINE-2763-modified-mock-crc-to-simulate' of https://open.med.harvard.edu/stas... | | |
David Walend | b1966b409b0 | Merge pull request #281 in SHRINE/shrine from feature/SHRINE-2970-remove-the-actual-breakdown-result to develop
* co... | | |
David Walend | f5c4d501f8c | Merge pull request #283 in SHRINE/shrine from feature/SHRINE-2938-remove-old-spray-mom-implementation to develop
* c... | | |
Ben Carmen | e30a3946785 | Merge pull request #280 in SHRINE/shrine from bugfix/SHRINE-2966-align-previous-query-text to release/1.26.2
* commi... | | |
David Walend | 744fe6c7f42 | Removed the MOM spray server code for SHRINE-2961 | | |
bendcarmen | b85deb5fe9b | Potential Fix of CSS Highlighting | | |
David Walend | a62c8a75577 | Merge branch 'develop' into feature/SHRINE-2970-remove-the-actual-breakdown-result | | |
David Walend | 9b458528278 | removed original_value from BREAKDOWN_RESULT table for SHRINE-2970 | | |
bendcarmen | d63279d51dc | Potential CSS fix to vertically align a query name for a previous query. | | |
David Walend | 8b0ec5dc0aa | Removed the column, got all the tests to pass (ALL the tests) for SHRINE-2970 | | |
bendcarmen | 783a0da0275 | Clean Up of Prop Types | | |
Ben Carmen | 8d12623e93b | Merge pull request #279 in SHRINE/shrine from bugfix/SHRINE-2968-align-buttons to release/1.26.2
* commit '99a4c25db... | | |
Marc-Danie Nazaire | 2bc75c50a5b | Merge pull request #247 in SHRINE/shrine from SHRINE-2886-make-the-network-health-page to develop
* commit 'aa65dd28... | | |
Ben Carmen | fb036345b5a | Merge pull request #277 in SHRINE/shrine from bugfix/SHRINE-2964-clear-previous-result to release/1.26.2
* commit 'f... | | |
marc-danie | aa65dd28ed4 | SHRINE-2886 - Make the network health page downloadable - modified to use version properties in pom.xml | | |
marc-danie | a37810909d2 | SHRINE-2886 - Make the network health page downloadable - removed more wildcard imports and some code cleanup | | |
| Next → |
