 Ben Carmen | 1bfcd45f64a | Merge pull request #435 in SHRINE/shrine from feature/SHRINE-3281-timestamp to develop
* commit '47361a9719737c3fcea... | | |
 bendcarmen | 47361a97197 | removed irrelevant test. | | |
 David Walend | 6c4ba13f51b | Common code for queued queries and running queries for SHRINE-3100, at least for the queued queries. | | |
bendcarmen | f5677692fa6 | Potential solution for timestamp | | |
David Walend | 60a5e0a8ebf | Merge remote-tracking branch 'origin/develop' into feature/SHRINE-3100-fill-in-breakdowns-in-results | | |
bendcarmen | b1e365c6199 | Saving work | | |
Ben Carmen | 726afa7592a | Merge pull request #434 in SHRINE/shrine from feature/SHRINE-3277-breakdown-text to develop
* commit 'd4bd58fe8f3270... | | |
 dwalend | 6acc035f513 | More wayfinding fro SHRINE-3100. I think I've found the right place to put the logic - QueryResult in the old protocol | | |
bendcarmen | d4bd58fe8f3 | removed shrine-proxy route. | | |
bendcarmen | f35f6f09f9d | Update of breakdown messages | | |
 marc-danie | 3a76a05e268 | SHRINE-3305 - Remove the shrine-proxy project from git | | |
dwalend | 6f4a60219aa | Merge remote-tracking branch 'origin/develop' into feature/SHRINE-3100-fill-in-breakdowns-in-results | | |
Ben Carmen | 62590265fa3 | Merge pull request #432 in SHRINE/shrine from feature/SHRINE-3246-replace-proxy to develop
* commit '3ac9bc183e8e9cb... | | |
dwalend | 101f8a1a6de | Merge remote-tracking branch 'origin/develop' into feature/SHRINE-3204-add-problem-digest-element-to | | |
Ben Carmen | 910a4fd5933 | Merge pull request #428 in SHRINE/shrine from feature/SHRINE-3239-username-password-labels to develop
* commit '2034... | | |
marc-danie | 1c7a7bdd03d | SHRINE-3204 - Add Problem Digest Element to the Query Object in case of an Error | | |
bendcarmen | 3ac9bc183e8 | code cleanup | | |
bendcarmen | bbd06df1974 | Replaced shrine-proxy | | |
David Walend | 60091b4eea5 | Merge pull request #429 in SHRINE/shrine from feature/SHRINE-3105-shrine-query-id-numbers-should to develop
* commit... | | |
David Walend | 31499b285da | Merge pull request #426 in SHRINE/shrine from bugfix/SHRINE-3256-hub-s-dispatcher-stopped-receiving to develop
* com... | | |
David Walend | d0d86dc4177 | todos for SHRINE-3100 | | |
 Marc-Danie Nazaire | 551d1d83364 | Merge pull request #431 in SHRINE/shrine from feature/SHRINE-2955-uncomment-code-for-building-the to develop
* commi... | | |
marc-danie | 5ef75277c92 | SHRINE-2955 - Uncomment code for building the NetworkHealthService - deleting build directory | | |
Marc-Danie Nazaire | 32e87538749 | Merge pull request #414 in SHRINE/shrine from feature/SHRINE-3257-part-ii-remove-shrine-proxy-port to develop
* comm... | | |
David Walend | 5866cdaa286 | Merge pull request #430 in SHRINE/shrine from feature/SHRINE-3242-provide-a-default-for-the-immediatelyrunincomingque... | | |
David Walend | 56a8dc5e74c | Set a default immediatelyrunincomingqueries in the reference.conf for SHRINE-3242 | | |
David Walend | 2db84f15117 | All new id numbers generated by Shrine should be positive SHRINE-3105 | | |
bendcarmen | 2034ba39e36 | Update of Username and Password Labels to utilize shrin.conf settings. | | |
Marc-Danie Nazaire | 9c179df9492 | Merge pull request #427 in SHRINE/shrine from feature/SHRINE-3189-figure-out-how-to-accurately to develop
* commit '... | | |
marc-danie | 93d5d1bcb3e | SHRINE-3189 - Figure out how to accurately detect changes in queries and results in the QEP's databases - renamed the... | | |
marc-danie | 62443cf2950 | SHRINE-3189 - Figure out how to accurately detect changes in queries and results in the QEP's databases - added missi... | | |
David Walend | 3a4114fbcfa | Added timeout log message to detect this mysql problem and others for SHRINE-3256 | | |
Ben Carmen | 303311b463a | Merge pull request #425 in SHRINE/shrine from feature/SHRINE-3278-new-breakdown-modal to develop
* commit '6761cc532... | | |
bendcarmen | 6761cc53270 | Moved inline css to stylesheet. | | |
Marc-Danie Nazaire | 4f339bf0760 | Merge pull request #421 in SHRINE/shrine from feature/SHRINE-2955-uncomment-code-for-building-the to develop
* commi... | | |
bendcarmen | 82aafa3d9b7 | Removed unnecessary comment block | | |
David Walend | b57d8750910 | Some stray type declarations from another ticket | | |
David Walend | b5c35e35436 | Merge pull request #424 in SHRINE/shrine from bugfix/SHRINE-3271-exception-on-shrine-qa3-with to develop
* commit '8... | | |
bendcarmen | a4f0ff93219 | change of spelling error | | |
bendcarmen | 8f69b1264aa | Possible solution for a new look for the breakdown dialog. per SHRINE-3278 | | |
Marc-Danie Nazaire | c32c3b5ede6 | Merge pull request #422 in SHRINE/shrine from feature/SHRINE-3280-create-a-variable-to-store-the to develop
* commit... | | |
Marc-Danie Nazaire | cdf792b2fc5 | Merge pull request #423 in SHRINE/shrine from bugfix/SHRINE-3293-network-health-page-replace-the to develop
* commit... | | |
David Walend | 8fc24d2b52f | Merge remote-tracking branch 'origin/develop' into bugfix/SHRINE-3271-exception-on-shrine-qa3-with | | |
David Walend | 50bc00d4fe9 | Merge pull request #420 in SHRINE/shrine from bugfix/SHRINE-3274-item-version-race-problem-on to develop
* commit '4... | | |
marc-danie | 119d9a32599 | SHRINE-3293 - Network Health Page: Replace the network health page tab name from -React App- to -<networkName> Networ... | | |
Marc-Danie Nazaire | bf3320d3753 | Merge pull request #419 in SHRINE/shrine from feature/SHRINE-3189-figure-out-how-to-accurately to develop
* commit '... | | |
bendcarmen | 08020a4c220 | missed merge item. | | |
bendcarmen | 49a9f8c7593 | merge of develop | | |
marc-danie | 34f6fe61257 | SHRINE-3189 - Figure out how to accurately detect changes in queries and results in the QEP's databases - modified to... | | |
marc-danie | 97427bcc8c4 | SHRINE-3189 - Figure out how to accurately detect changes in queries and results in the QEP's databases - renamed tab... | | |
marc-danie | 801a4a72cac | SHRINE-3280 - Create a variable to store the instructions for previous queries flag help icon in shrine.conf | | |
marc-danie | a110d13a864 | SHRINE-2955 - Uncomment code for building the NetworkHealthService - minor edit | | |
marc-danie | 326cad40176 | SHRINE-2955 - Uncomment code for building the NetworkHealthService | | |
David Walend | 02965a4c198 | Handling a case where the CRC tells us ERROR, but does not have enough to interpret as a problem in a result for SHRI... | | |
David Walend | 499755c78d1 | Merge remote-tracking branch 'origin/develop' into bugfix/SHRINE-3274-item-version-race-problem-on | | |
Ben Carmen | 073f17ad7ad | Merge pull request #418 in SHRINE/shrine from bugfix/SHRINE-3220-flagging-instructions to develop
* commit '4e0e4526... | | |
Ben Carmen | 6dece35e930 | Merge pull request #417 in SHRINE/shrine from bugfix/SHRINE-3255-fix-column-spacing to develop
* commit '45455f615d2... | | |
marc-danie | 7cacec424ec | SHRINE-3189 - Figure out how to accurately detect changes in queries and results in the QEP's databases - fixed typo | | |
marc-danie | 3fcf94f268b | SHRINE-3189 - Figure out how to accurately detect changes in queries and results in the QEP's databases | | |
bendcarmen | 4e0e4526cf0 | Fix of pulling in queryFlagging instructions from shrine.conf. | | |
David Walend | dcde6e42b67 | Trapping a duplicate submission for SHRINE-3274 | | |
bendcarmen | 45455f615d2 | Fix CSS formatting of query history table. | | |
dwalend | ae1a40bc307 | Passing files back to the work machine. Nothing to see here | | |
David Walend | 00545b58eb5 | Merge pull request #415 in SHRINE/shrine from feature/SHRINE-3047-authenticate-routes-that-can to develop
* commit '... | | |
dwalend | e90622c0a31 | Removed some hazardous blocking API from HubDB for SHRINE-3247 | | |
bendcarmen | cb3465e2165 | Update of unit tests. | | |
bendcarmen | 79cf29c2258 | Fixing the UI for flagging/unflagging a query based on conversations with Isha and Anupama | | |
David Walend | 619bee2e806 | Follow-up jira ticket | | |
David Walend | 78e39e20b70 | Ready to test SHRINE-3047 on shrine-dev* | | |
David Walend | d0a9dad486d | Notes for a different ticket | | |
bendcarmen | f74829a2bf8 | Merge with develop | | |
bendcarmen | 919e6ffbc2a | Merge of Develop | | |
David Walend | 438c5dd12bf | Fixed stray test dependency for SHRINE-3047 | | |
David Walend | 34c89b93c00 | Got auth working at least in tests for SHRINE-3047 | | |
marc-danie | f1bbefba9d0 | SHRINE-3257 - Part II: Remove shrine-proxy - port calls to shrine/rest/i2b2/request - code cleanup | | |
marc-danie | bd68096681b | SHRINE-3257 - Part II: Remove shrine-proxy - port calls to shrine/rest/i2b2/request - cleanup some of the comments | | |
marc-danie | 3a94775454e | SHRINE-3257 - Part II: Remove shrine-proxy - port calls to shrine/rest/i2b2/request | | |
Ben Carmen | f68e1bbf350 | Merge pull request #403 in SHRINE/shrine from SHRINE-3206-retrive-flagging-text to develop
* commit '8bc4320e1881e5c... | | |
Ben C | 8bc4320e188 | Quick update of text in Unflag Query | | |
Ben C | 63a968b44bf | added sanitizer | | |
Marc-Danie Nazaire | c18648796f2 | Merge pull request #413 in SHRINE/shrine from feature/SHRINE-3186-remove-shrine-proxy-war-file to develop
* commit '... | | |
marc-danie | 112c0a744c9 | SHRINE-3186 - Part I: Remove shrine-proxy war file (server side) PM service and ontology service - fixed typo | | |
Marc-Danie Nazaire | 90556cc2045 | Merge pull request #409 in SHRINE/shrine from feature/SHRINE-3186-remove-shrine-proxy-war-file to develop
* commit '... | | |
marc-danie | 2c6b584beeb | SHRINE-3186 - Part I: Remove shrine-proxy war file (server side) PM service and ontology service - removed duplicate ... | | |
marc-danie | 28b519cb76f | SHRINE-3186 - Part I: Remove shrine-proxy war file (server side) PM service and ontology service - added logging of e... | | |
marc-danie | 4f29e7e44f2 | SHRINE-3186 - Part I: Remove shrine-proxy war file (server side) PM service and ontology service - improved error han... | | |
marc-danie | 0e39eb5f0d5 | Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE-3186-remove-shrine... | | |
David Walend | ba237e172fb | Merge branch 'release/1.26.5' into develop | | |
marc-danie | 04f5f0abc6f | Merge branches 'develop' and 'feature/SHRINE-3186-remove-shrine-proxy-war-file' of https://open.med.harvard.edu/stash... | | |
Ben Carmen | c510f086f93 | Merge pull request #411 in SHRINE/shrine from bugfix/SHRINE-3259-missing-flag-text to release/1.26.5
* commit 'be3a3... | | |
bendcarmen | be3a3fb358b | Added missing "Flagged Message" label | | |
bendcarmen | bb76064757c | quick edit to fix breaking test and removed extra icon. | | |
bendcarmen | b4555871147 | Fix of breaking test. | | |
Ben Carmen | df06e81f9f5 | Merge pull request #410 in SHRINE/shrine from bugfix/SHRINE-3251-missing-info-icon to release/1.26.5
* commit '53370... | | |
Ben Carmen | 3c123b339ce | Merge pull request #408 in SHRINE/shrine from bugfix/SHRINE-3253-typing-in-rename-field-not-working to release/1.26.5... | | |
marc-danie | b680c0e1cf3 | SHRINE-3186 - Part I: Remove shrine-proxy war file (server side) PM service and ontology service - improved error res... | | |
marc-danie | 62ecf307a33 | SHRINE-3186 - Part I: Remove shrine-proxy war file (server side) PM service and ontology service - removed unused con... | | |
Ben C | 53370a995ca | Potential Fix for missing information tooltip | | |
marc-danie | a4a58b9ad4f | SHRINE-3186 - Part I: Remove shrine-proxy war file (server side) PM service and ontology service - renamed instances ... | | |
marc-danie | de64a81ac9f | SHRINE-3186 - Part I: Remove shrine-proxy war file (server side) - PM service and ontology service | | |
Ben C | b8dc2861e12 | Fix for renaming still not working | | |
Ben C | 63cde70a4b5 | Fix of failing build | | |
Ben Carmen | ef090a23cc3 | Merge pull request #407 in SHRINE/shrine from bugfix/SHRINE-3253-missing-query-name to release/1.26.5
* commit 'd416... | | |
Ben Carmen | 33c11fed6dd | Merge pull request #406 in SHRINE/shrine from bugfix/SHRINE-3212-processing-at-site to release/1.26.5
* commit '4850... | | |
Ben C | d416fae6d7b | Git push, fixed issue of missing name....React changed Component lifecycle method in version 16.3. | | |
David Walend | 557bf6cda8f | Merge pull request #405 in SHRINE/shrine from feature/SHRINE-3249-upgrade-http4s-and-maybe-other to develop
* commit... | | |
Ben C | 4850f0799b5 | Fix to ensure that site status says "Processing at Site" instead of "Query Submitted" when networkId is received. | | |
David Walend | 23c8c2d135e | Merge remote-tracking branch 'origin/release/1.26.5' into develop | | |
David Walend | 9e18067a145 | Updated a lot of dependencies for SHRINE-3249 | | |
Ben Carmen | 79406c81de5 | Merge pull request #404 in SHRINE/shrine from bugfix/SHRINE-3250-fix-status-message-format to release/1.26.5
* commi... | | |
Ben C | 31b81ae9daf | Saving work on sanitizing html | | |
Ben C | 7ba3150a328 | Potential fix of Query Status text spacing | | |
David Walend | 5e47d2cccd7 | Merge pull request #402 in SHRINE/shrine from bugfix/SHRINE-3241-webclient-is-unable-to-retrieve to release/1.26.5
*... | | |
Ben C | 1ca5a3a6c30 | Utilizing the queryFlaggingInstructions field if provided. | | |
David Walend | 857cb343f85 | Merge pull request #401 in SHRINE/shrine from feature/SHRINE-3248-report-very-old-queued-queries to release/1.26.5
*... | | |
David Walend | 7df7211a711 | Build a ReadQueryDefinitionResponse without a RunQueryRequest for SHRINE-3241 | | |
David Walend | d5bb1862285 | Changed the hard-coded wait into a config property for SHRINE-3248 | | |
David Walend | c2a2cfbf95b | Was able to add a date field to the adapter's old DAO model for SHRIEN-3248 | | |
David Walend | 9670b0e7c10 | Checking in the outer structure before adding a field to the adapter's brittle old data model for SHRIEN-3248 | | |
David Walend | 72bf2ef5ca3 | Moved develop to 1.26.6.1-SNAPSHOT | | |
David Walend | a1cfd6f7a7e | Moved pom.xml version to 1.26.5.2-SNAPSHOT before creating the release branch | | |
Marc-Danie Nazaire | cd6beaab263 | Merge pull request #400 in SHRINE/shrine from bugfix/SHRINE-3243-fix-for-finding-researcher-when to develop
* commit... | | |
marc-danie | 610eb724c28 | SHRINE-3243 - Fix for finding researcher when running the network health test - Modified to throw a specific Exceptio... | | |
marc-danie | cb3ea25999c | SHRINE-3243 - Fix for finding researcher when running the network health test | | |
David Walend | c3b562652dc | Merge pull request #399 in SHRINE/shrine from bugfix/SHRINE-3196-occasional-data-race-lost-in to develop
* commit '7... | | |
David Walend | 0d90c36d722 | Merge pull request #398 in SHRINE/shrine from bugfix/SHRINE-3238-hub-s-database-needs-to-be-able to develop
* commit... | | |
dwalend | 7e2876ce687 | Possible fix for the database race in SHRINE-3196 . It should at least be much more survivable. | | |
dwalend | 853cb8a9cbc | Stray comment cleanup | | |
dwalend | 1edc7e6ea8e | Stray comment cleanup | | |
dwalend | 2d683e19e38 | Handle queries that the hub has never heard of more gracefully for SHRINE-3238 | | |
dwalend | ea90df8dc1c | Now using flatmap and returning an Option[Item] for upserts for SHRINE-3238 | | |
David Walend | 38aa59564e3 | Merge pull request #397 in SHRINE/shrine from bugfix/SHRINE-3236-interpret-reinterpret-status to develop
* commit '4... | | |
dwalend | 45be6e5fbca | Switched off QUEUED query polling for SHRINE-3236 | | |
dwalend | 53e59fb201b | Storing errors found while begging for QUEUED query results is very hard. Moving on for SHRINE-3236 | | |
dwalend | 65315973490 | Fixed null pointer exception for SHRINE-3237 | | |
David Walend | 33cfc453b40 | More logging for SHRINE-3237 | | |
David Walend | 432e622398a | Fix for queued query xml response woes in SHRINE-3236 | | |
Marc-Danie Nazaire | 7f07b5f9684 | Merge pull request #396 in SHRINE/shrine from bugfix/SHRINE-3222-fix-sorting-of-previous-queries to develop
* commit... | | |
marc-danie | e68206a3a34 | SHRINE-3222 - Fix sorting of previous queries - fixed broken tests | | |
Marc-Danie Nazaire | f7944d62aa3 | Merge pull request #395 in SHRINE/shrine from bugfix/SHRINE-3222-fix-sorting-of-previous-queries to develop
* commit... | | |
marc-danie | f38295c51d8 | SHRINE-3222 - Fix sorting of previous queries - fixed sorting with skip | | |
marc-danie | 319ed10d333 | SHRINE-3222 - Fix sorting of previous queries | | |
Ben C | 9c3fbdd8508 | Quick fix of Submitted appearing when query is idle. | | |
Ben Carmen | 05530dc56fd | Merge pull request #354 in SHRINE/shrine from feature/mock-sse to develop
* commit '08b5ece51f9c3311a7e299dd95a11d7a... | | |
Ben Carmen | 08b5ece51f9 | Merge pull request #394 in SHRINE/shrine from Feature/mock-sse to feature/mock-sse
* commit 'fc03c6be5848ba85afd99bd... | | |
Ben C | fc03c6be584 | Merge with develop | | |
Ben C | d858a3be812 | Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine into develop | | |
Marc-Danie Nazaire | 714d006f785 | Merge pull request #393 in SHRINE/shrine from feature/SHRINE-3220-add-flagging-instructions-to to develop
* commit '... | | |
Ben C | 4d391a3cc38 | Changed wording to avoid confusion | | |
Ben Carmen | 215fc0765fc | Merge pull request #391 in SHRINE/shrine from feature/SHRINE-3154-collect-flag-query-changes-at to develop
* commit ... | | |
David Walend | 6dca8ae359d | Found a minor bug in updateQueryStatus while testing SHRINE-3154 | | |
marc-danie | 97866990663 | SHRINE-3220 - Add Flagging Instructions to webclient section of shrine.conf | | |
David Walend | 25d48c58cc4 | Merge branch 'feature/SHRINE-3175-flag-a-query' into feature/SHRINE-3154-collect-flag-query-changes-at | | |
bendcarmen | 16b2fcacdfb | Solution for latency in showing pending fetch state for rename, flag and unflag calls. | | |
Ben C | 3aa12d41027 | A few style tweaks and added a missing component back. | | |
Ben C | 43b41f3355d | Fixed the loader | | |
Ben C | 5111779350e | Cleanup of unused components. | | |
Ben C | b4829fb8712 | Merge branch 'develop' into feature/SHRINE-3175-flag-a-query | | |
Ben C | 0c9cd869efb | Possible Solution for flagging, unflagging and renaming a query. | | |
Ben C | bceb098bcd5 | Added snapshot tests | | |
Ben C | 3282dc59e13 | Saving work | | |
David Walend | 4048ad80aec | Knew I | | |
David Walend | 354c76f2c27 | Cleaning up some stale comments for SHRINE-3154 | | |
David Walend | 17029c9f411 | Flagging/unflagging of queries for SHRINE-3154 | | |
Ben C | ecff643340e | saving work on modal, query rename and flagging | | |
marc-danie | 7e1b34e45c9 | SHRINE-3186- Remove shrine-proxy war file (server side) | | |
Marc-Danie Nazaire | a2a0fddabbe | Merge pull request #390 in SHRINE/shrine from feature/SHRINE-3193-detect-and-send-incremental-query to develop
* com... | | |
marc-danie | eb4afe01d0c | SHRINE-3193 - Detect and send incremental query results to the web client - removed redundant triggerDataChangeFor call | | |
marc-danie | 548f5843c95 | SHRINE-3193 - Detect and send incremental query results to the web client - added test | | |
marc-danie | 10b895ef22b | SHRINE-3096 - Run Network Health Connectivity test with real data - added Jira ticket comment | | |
marc-danie | ad98de06623 | SHRINE-3193 - Detect and send incremental query results to the web client - fixed sending of data when not responding... | | |
Ben C | e8731f75678 | saving work | | |
Ben C | 5b8cd92623d | Merge branch 'develop' into feature/SHRINE-3175-flag-a-query | | |
Ben C | 5f756ced447 | added removed tests back in after fixing build | | |
Ben C | fe2e4deb5de | Fixed breaking build...I think. | | |
Ben C | 25fdac52e9d | Figuring out why build is failing | | |
Ben C | d533357dd4c | Fixed failing snapshot tests | | |
Ben Carmen | 7fc1d33b70c | Merge pull request #389 in SHRINE/shrine from feature/SHRINE-3077-previous-queries-table to develop
* commit 'c7cd7f... | | |
Ben C | c7cd7f5c40a | Code cleanup | | |
Ben C | c5e0f21b5ea | Saving work | | |
Ben C | ae5617a136c | Merge branch 'develop' into feature/SHRINE-3077-previous-queries-table | | |
Ben C | ccc58a66487 | Potential solution for SHRINE-3077 | | |
marc-danie | 8e20b45e5d6 | SHRINE-3193 - Detect and send incremental query results to the web client | | |
Ben C | dd32acf8959 | Saving Changes | | |
Ben C | 8ba3e2c4a18 | Saving work | | |
Marc-Danie Nazaire | e6bb7ce35db | Merge pull request #387 in SHRINE/shrine from feature/SHRINE-3096-run-network-health-connectivity to develop
* commi... | | |
marc-danie | 86792750c47 | SHRINE-3096 - Run Network Health Connectivity test with real data - renamed timeout to timeLimit and fixed saving of ... | | |
David Walend | 5cc2df3f0b0 | Merge pull request #388 in SHRINE/shrine from feature/SHRINE-3153-collect-renames-of-queries-in to develop
* commit ... | | |
| Next → |
