 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 | | |
David Walend | 95a3a23265f | Merge pull request #278 in SHRINE/shrine from bugfix/SHRINE-2948-figure-out-why-receive-s-timeout to develop
* commi... | | |
marc-danie | 8ca75b81d6c | SHRINE-2886 - Make the network health page downloadable - removed wildcard import | | |
marc-danie | dd2915750cb | Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine into SHRINE-2886-make-the-network-heal... | | |
marc-danie | 69ba18517d4 | SHRINE-2886 - Make the network health page downloadable - added test for webpage/data/network_status.json | | |
bendcarmen | 99a4c25db9c | CSS change to align run and clear buttons properly | | |
David Walend | 50f62cebc73 | Missed a capitalized O for SHRINE-2948 | | |
bendcarmen | ff2acbf302f | Potential fix for clearing a previously run query when a new one is run | | |
marc-danie | 4d5e170e4e6 | Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine into SHRINE-2886-make-the-network-heal... | | |
marc-danie | 9858c9e3ffd | Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine into SHRINE-2886-make-the-network-heal... | | |
David Walend | bb9d5d72536 | Merge pull request #276 in SHRINE/shrine from feature/SHRINE-2773-remove-the-actual-aggregate-result to develop
* co... | | |
Ben Carmen | 1682d94db2e | Merge pull request #274 in SHRINE/shrine from SHRINE-2965-previous-queries-not-refreshing to release/1.26.2
* commit... | | |
David Walend | bff72100dc5 | Removed the ORIGINAL_COUNT column and all the associated code for SHRINE-2773 | | |
David Walend | b256001306e | Merge pull request #275 in SHRINE/shrine from feature/SHRINE-2959-add-back-55-second-timeout-for to develop
* commit... | | |
David Walend | a2baf82db2d | Marc-Danie spotted an unused variable for SHRINE-2959 | | |
bendcarmen | 1cf7823a753 | Possible fix of sync between previous queries and query status | | |
marc-danie | f7fc1f51d36 | SHRINE-2886 - Make the network health page downloadable - modified so that no temp zip file needs to be created | | |
David Walend | e7a985d64da | Bumped version to 1.26.2.2-SNAPSHOT | | |
David Walend | cc2406894dd | More debug logs for SHRINE-2959 | | |
David Walend | fead93a8108 | Merge branch 'develop' into feature/SHRINE-2959-add-back-55-second-timeout-for | | |
bendcarmen | 53be5ac3589 | updated some prop types. | | |
bendcarmen | d086b296c1b | this is a test with the branch enabled. | | |
bendcarmen | cf799661c2e | This is a test to see I can get Bamboo to run 1.26.2. automatically. | | |
bendcarmen | 6c6079da626 | Updated POMS in develop to reflect 1.26.3 sprint. | | |
Marc-Danie Nazaire | 8088937e724 | Merge pull request #273 in SHRINE/shrine from feature/SHRINE-2903-create-a-way-to-define-a-set to develop
* commit '... | | |
marc-danie | ac658058907 | SHRINE-2903 - Create a way to define a set of queries to run on a schedule - removed use of forbidden | | |
Marc-Danie Nazaire | a6c192be706 | Merge pull request #271 in SHRINE/shrine from feature/SHRINE-2903-create-a-way-to-define-a-set to develop
* commit '... | | |
marc-danie | 09023097078 | SHRINE-2903 - Create a way to define a set of queries to run on a schedule - modified to use a Seq of Nodes in Networ... | | |
marc-danie | eb5a7f799bc | SHRINE-2903 - Create a way to define a set of queries to run on a schedule - added missing cats.data dependency and a... | | |
Ben Carmen | a88fd6c5b09 | Merge pull request #272 in SHRINE/shrine from bugfix/SHRINE-2963 to develop
* commit '9db4fda4aa72130839a59f7563b737... | | |
marc-danie | d269577daaf | SHRINE-2903 - Create a way to define a set of queries to run on a schedule - removed duplicate static function | | |
David Walend | 8afa73c49a4 | Made the ultimate give-up timeout configurable for SHRINE-2961 | | |
David Walend | 6829333074d | Added a hard-coded ultimate timeout and the start of a way to test it for http4s calls into shrine-api.war for SHRINE... | | |
bendcarmen | 9db4fda4aa7 | Quick update | | |
Ben Carmen | dd7359b1c7b | Merge pull request #270 in SHRINE/shrine from bugfix/SHRINE-2962-previous-query-definition-missing to develop
* comm... | | |
bendcarmen | 83e7ba9fa1f | Possible Fix for Polling Issues | | |
bendcarmen | f8d5158c4cb | Possible fix of SHRINE-2963 | | |
bendcarmen | 17f254e1907 | Saving potential fix to polling | | |
marc-danie | 190c0e05cd6 | Merging changes from develop | | |
marc-danie | 063e1271adf | SHRINE-2903 - Create a way to define a set of queries to run on a schedule | | |
bendcarmen | 30829be4fcc | clear query when running a previous query. | | |
bendcarmen | 91e11090c37 | added a quick comment | | |
bendcarmen | 1cc0756fb3e | removed unnecessary config | | |
bendcarmen | b729c7b1dc5 | Possible fix for SHRINE-2962 query definition not showing up. | | |
bendcarmen | f6be6dec7f2 | removed typescript test | | |
bendcarmen | 5a9e8240068 | removed unused typescript settings | | |
bendcarmen | 324a5704bec | Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine into develop | | |
bendcarmen | 921c7a7c2f2 | Saving a dev example with typescript | | |
David Walend | 27feb6ec681 | Merge pull request #269 in SHRINE/shrine from feature/SHRINE-2922-switch-default-from-shrine-meta to develop
* commi... | | |
David Walend | 81ab2d11722 | Merge pull request #267 in SHRINE/shrine from bugfix/SHRINE-2949-the-shrine-api.war-s-receive to develop
* commit 'f... | | |
Ben Carmen | 62f5bb685e8 | Merge pull request #268 in SHRINE/shrine from task/SHRINE-2917-resolve-unused-features-in-previous-queries to develop... | | |
David Walend | 622cc154655 | new default mom url for SHRINE-2922 | | |
David Walend | febc0ff1475 | Merge remote-tracking branch 'origin/develop' into bugfix/SHRINE-2949-the-shrine-api.war-s-receive | | |
David Walend | ac46977fad0 | Cleaned up MessageQueueWebApi a bit for SHRINE-2949 | | |
David Walend | 4d0b3ad0006 | Not using this file at all | | |
David Walend | d1921fea8e1 | Not using this file at all | | |
David Walend | 9414128d6c9 | Not using this file at all | | |
bendcarmen | c7080d5766e | Tweaks to UI before we start QA | | |
Ben Carmen | 2c7d51a45ae | Merge pull request #265 in SHRINE/shrine from bugfix/SHRINE-2954-cancel-poll-on-clear to develop
* commit '9ad93a793... | | |
David Walend | e27d09f5be8 | Added Network Health back to shrine-api.war, added a test of ping to Network Health for SHRINE-2949 | | |
David Walend | bd56e9405e8 | Got concurrent requests working again for SHRINE-2949 | | |
David Walend | 45a21fcfac4 | Merge remote-tracking branch 'origin/develop' into bugfix/SHRINE-2949-the-shrine-api.war-s-receive | | |
David Walend | 882defcc693 | Merge pull request #266 in SHRINE/shrine from bugfix/SHRINE-2957-fix-shrine-dev-after-shrine-api.war to develop
* co... | | |
David Walend | 6a70015d79d | A few tail details to get shrine-dev* working again SHRINE-2957 | | |
bendcarmen | 9ad93a79337 | Potential fix of Query Poll continuing to run after cancel is pressed. | | |
bendcarmen | b9d9c55be3b | update of package.json to test and build | | |
bendcarmen | 5a541b3c94a | removed /dist/ folder to test Bamboo build | | |
bendcarmen | 06290b2312e | Merge branch 'task/2908-take-over-query-button' into develop | | |
bendcarmen | e7758825dbe | removed an undefined method | | |
Ben Carmen | e0b8ed78f87 | Merge pull request #264 in SHRINE/shrine from task/2908-take-over-query-button to develop
* commit '2204b5c61543af0d... | | |
David Walend | f9f327e3ea4 | Merge branch 'develop' into feature/SHRINE-2770-clean-up-existing-mom-api-use | | |
David Walend | 93fdae9f56f | Exploring fixes for SHRINE-2949 | | |
bendcarmen | 2204b5c6154 | Merge branch 'develop' into task/2908-take-over-query-button | | |
bendcarmen | b2bcdf00734 | Renamed a method from either to getOrElse | | |
David Walend | 6113a7a4c88 | Merge pull request #258 in SHRINE/shrine from feature/SHRINE-2770-clean-up-existing-mom-api-use to develop
* commit ... | | |
Marc-Danie Nazaire | e45e7095e92 | Merge pull request #262 in SHRINE/shrine from bugfix/SHRINE-2953-webclient-connectivity-test-issue to develop
* comm... | | |
marc-danie | 0a3b8b6070e | SHRINE-2953 - Webclient: Connectivity Test Issue: Discrepancy observed in the Query Term displayed in the email recei... | | |
marc-danie | 78e06b26939 | SHRINE-2953 - Webclient: Connectivity Test Issue: Discrepancy observed in the Query Term displayed in the email recei... | | |
bendcarmen | e47f301a0fb | Merge branch 'develop' into task/2908-take-over-query-button | | |
Ben Carmen | 0cf5907c9ac | Merge pull request #257 in SHRINE/shrine from task/2908-take-over-query-button to develop
* commit '1fc423bc7db70d36... | | |
bendcarmen | cf227b9c62f | Merge branch 'develop' into task/2908-take-over-query-button | | |
Marc-Danie Nazaire | 76e951927ad | Merge pull request #263 in SHRINE/shrine from bugfix/SHRINE-2868-make-the-network-health-web-page to develop
* commi... | | |
marc-danie | be4dbf40c87 | SHRINE-2868 - Make the network health web page accessible - commented out the building with npm in the pom.xml | | |
Marc-Danie Nazaire | b0880c62c0f | Merge pull request #260 in SHRINE/shrine from bugfix/SHRINE-2868-make-the-network-health-web-page to develop
* commi... | | |
David Walend | c83328aea2a | Merge pull request #259 in SHRINE/shrine from bugfix/SHRINE-2950-test-mysql-configured-system to develop
* commit '9... | | |
marc-danie | 515d3fb2611 | SHRINE-2953 - Webclient: Connectivity Test Issue: Discrepancy observed in the Query Term displayed in the email recei... | | |
marc-danie | 9a1f78eff6f | SHRINE-2868 - Make the network health web page accessible - removed the wildcard import | | |
marc-danie | 4a4cc0e5739 | SHRINE-2868 - Make the network health web page accessible - Added missing resources section in pom.xml and fixed the ... | | |
| Next → |
