Ben C | 3c06243c3b9 | removed accidental addition to .gitignore | | |
dwalend | 3f11ef55649 | Cleaned up a bit for SHRINE-3611 | | |
dwalend | 3e5f277a26e | Restored retrival of queued breakdown results for SHRINE-3611 | | |
dwalend | 90b8424962f | End-of-merge for SHRINE-3611 | | |
David Walend | d56dcd96ab4 | Merge pull request #671 in SHRINE/shrine from bugfix/SHRINE-3610-breakdown-queries-with-some-results to release/1.26.... | | |
Ben C | 1c7c554019e | code cleanup | | |
Ben C | 772862c5e0f | reverted .gitignore | | |
Ben C | d16ae524a6a | Merge branch '2.0-webclient' into feature/SHRINE2020-25-new-inclusion-design | | |
Ben C | 06fe20453c1 | Potential Solution for the new inclusion/exclusion design | | |
Ben C | dd2b0e9a567 | Create a new QueryTermLabView component that wraps the QueryTermView. | | |
Ben C | 348bbca95b6 | ignore changes to i2b2_config_data.js | | |
Ben C | ae1638ca148 | commented out accidental commit | | |
Matthew DiLoreto | 14fa0cf4694 | Merge pull request #675 in SHRINE/shrine from develop to 2.0-webclient
* commit '026b16069b462e8aa7086abef8d8993ae0a... | | |
Matthew DiLoreto | 026b16069b4 | Merge pull request #674 in SHRINE/shrine from revert-shrine-3419 to develop
* commit '765e182282cfce123ff78161774fb2... | | |
Ben C | bb800d7da33 | Use React Context Provider instead of passing around a bunch of props. | | |
mjdiloreto | 765e182282c | remove network health js build | | |
dwalend | 05833e17e81 | Start of merging with SHRINE-3610 | | |
dwalend | 1b10ec4f2de | Fix for a partially complete query - some breakdowns queued - for SHRINE-3661 | | |
Matthew DiLoreto | 1e3b57502e2 | revert changes from SHRINE-3419 | | |
Ben C | 4fe6aa9100f | saving width of header | | |
Ben C | 7ec6834f42a | saving progress | | |
mjdiloreto | 06e2717bfdd | Moved time method from XmlUtil to Loggable. | | |
Ben C | 0c87e74190c | added unit tests for Lab Values...put ValueTypes in own component | | |
mjdiloreto | 92c02848455 | Updated Adapter Mappings to truncate table before inserting mappings on reload. | | |
Ben C | ecb9715b4b7 | saving unit tests. | | |
marc-danie | 6a67dc37ecd | fixed version field in the POM file for OntologyService | | |
Ben C | 0157278385b | updated snapshot test | | |
Ben C | 540e73f0f82 | Merge branch '2.0-webclient' into feature/SHRINE2020-19-lab-values | | |
mjdiloreto | fde92ca9339 | Changes based on review, added index to ddl. | | |
Matthew DiLoreto | f60e9c8d980 | Merge pull request #670 in SHRINE/shrine from merge-pom-into-webclient to 2.0-webclient
* commit '7152a6ad5ffccbc8b8... | | |
dwalend | 13c29bc3870 | Cleaning up some of the detritus from investigating SHRINE-3610 | | |
dwalend | eb32a3010d4 | Cleaning up some of the detritus from investigating SHRINE-3610 | | |
dwalend | 9bc3ab4ae12 | Much more thourough check of breakdown query status for SHRINE-3610 | | |
Ben C | 3dfd192fc24 | saving progress | | |
mjdiloreto | 7152a6ad5ff | re-deleting appropriate files that were added during merge. | | |
mjdiloreto | 52677584e93 | Merge branch bugfix/SHRINE-3533-one-version-in-the-top-level-pom into 2.0-webclient | | |
Matthew DiLoreto | 3d485456d4b | Merge pull request #669 in SHRINE/shrine from merge-develop-into-2.0-webclient to 2.0-webclient
* commit '4e84b020eb... | | |
Ben C | 0c8512694ee | saving work | | |
mjdiloreto | 4e84b020ebe | Remove log4j references from 2.0-webclient code. Update service mounting in shrine-api bootstrap. | | |
Ben C | aae1a3577da | saving | | |
Ben C | 6fd84ddb0d8 | added colon after Date | | |
Ben C | 1f30f2b68a2 | mege of develop into 2.0-webclient | | |
Ben C | 415911f8d97 | merge of develop into 2.0-webclient | | |
Ben C | 18895d1bf6c | saving work | | |
David Walend | 41cd74f95d2 | Merge pull request #668 in SHRINE/shrine from bugfix/SHRINE-3602-retry-for-network-failures-as to release/1.26.7
* c... | | |
Ben C | 8013555cb6c | moved open/close container to a component for reuse in labs. | | |
Ben Carmen | 9f0955c4b83 | Merge pull request #666 in SHRINE/shrine from feature/SHRINE-2020-21-date-range-UAT1 to 2.0-webclient
* commit 'fa8d... | | |
dwalend | 9fda1c7675d | Recover for almost all network errors for SHRINE-3602 | | |
mjdiloreto | 078118ddc86 | Merge branch develop into bugfix/SHRINE-3533-one-version-in-the-top-level | | |
David Walend | 8210f3353c8 | Merge pull request #664 in SHRINE/shrine from bugfix/SHRINE-3589-queryqueuedtimetoliveexceeded to release/1.26.7
* c... | | |
Ben C | fa8de8c596d | updated snapshot tests | | |
Ben C | e48aa72fc81 | added colon to date range. | | |
Ben C | fc142d8a799 | fix for UAT feedback | | |
mjdiloreto | a0e674a2d6e | added mapping table create statements into ddl and changed table names and columns to camelCase | | |
Ben C | e6263cc22ae | Merge branch '2.0-webclient' of https://open.med.harvard.edu/stash/scm/shrine/shrine into 2.0-webclient | | |
Ben C | 7aaf2ec5f1c | changed some text. | | |
dwalend | 1d51a687e21 | Made shrine able to handle missing data in the shrine_query_history count and result tables to fix SHRINE-3589 | | |
mjdiloreto | 4e7df21a265 | Added checksum checking to adapter mappings and added check for mappings changes at shrine startup. | | |
Ben Carmen | 0e67ecfa395 | Merge pull request #663 in SHRINE/shrine from feature/SHRINE2020-24-scroll-on-drag to 2.0-webclient
* commit 'af3d47... | | |
Ben C | af3d47e46f3 | made adjustment based on code review | | |
mjdiloreto | e32ffeecca7 | simplified dao to only use fs2. | | |
mjdiloreto | 2cbe78dcf36 | created test for adapter mappings and trying to parallelize insert | | |
mjdiloreto | 7df1e6aca3e | creat unit test for mappings dao. | | |
mjdiloreto | 2baeff431d4 | made adapter use db | | |
Ben C | dbae2a76cd0 | working version of hook for scroll while dragging | | |
Ben C | 29746ee4bcb | Merge branch '2.0-webclient' into feature/SHRINE2020-24-scroll-on-drag | | |
Matthew DiLoreto | 3a83058ec32 | Merge pull request #654 in SHRINE/shrine from bugfix/SHRINE-1523-clean-up-baroque-hierarchy-under to develop
* commi... | | |
David Walend | d9192ba8db5 | Merge pull request #662 in SHRINE/shrine from bugfix/SHRINE-3587-transient-unknownhostexception to release/1.26.7
* ... | | |
dwalend | 6d4b9a8f5d3 | Another trap for UCLA's temporary DNS problem for SHRINE-3587 | | |
Ben C | b1df4266b88 | Update of package lock to account for DatePicker component | | |
Ben C | 0e1ceecf35f | cleaned up code | | |
Ben Carmen | 87d63633e7f | Merge pull request #659 in SHRINE/shrine from feature/SHRINE-2020-21 to 2.0-webclient
* commit '38ba19414473175c0bd5... | | |
David Walend | 84fb1998990 | Merge pull request #661 in SHRINE/shrine from feature/SHRINE-3551-upgrade-scala-to-2.12 to develop
* commit 'b6ae53c... | | |
Ben C | 4987b2525a9 | Merge branch '2.0-webclient' into feature/SHRINE2020-24-scroll-on-drag | | |
dwalend | b6ae53cf80e | Stray comments for SHRINE-3551 | | |
Ben C | 38ba1941447 | removed the !important modifiers from CSS in index.scss per Code Review feedback | | |
Ben C | 652b8ff6581 | Merge branch '2.0-webclient' into feature/SHRINE-2020-21 | | |
Ben Carmen | 6754738d315 | Merge pull request #660 in SHRINE/shrine from eature/SHRINE2020-18-view-categories-UAT2 to 2.0-webclient
* commit '2... | | |
dwalend | 905f04ed9ca | Added dependency on circe to QEP service for SHRINE-3551 | | |
dwalend | 838482f1799 | Added dependency on circe for SHRINE-3551 | | |
dwalend | 9da82a94c44 | Changed some hard-coded dependencies on scala 2.11 to use the variable and got all the way to NetworkHealth in the bu... | | |
Ben C | e545db0eff5 | feedback from Code Review | | |
Ben C | 2e9a693920d | Incorporated changes from UAT round 2. | | |
Ben C | 29527226452 | created Unit tests. | | |
dwalend | 7b7de304e66 | Fixed a type problem now caught by the 2.12 compiler in XML code for SHRINE-3551 | | |
Ben C | 56d4db4d011 | cleaned up code | | |
Ben C | 836870f4480 | all features are working for this item. | | |
dwalend | cbe95d6fafa | Updated courier to a new groupid that supports 2.12 and got the tests working again for SHRINE-3551 | | |
Ben C | 28fd0612944 | saving work | | |
Matthew DiLoreto | 9bc7947c316 | Merge pull request #655 in SHRINE/shrine from bugfix/SHRINE-1501-find-replacement-for-log4j to develop
* commit '04c... | | |
Ben C | eedb0f0f617 | Merge branch '2.0-webclient' into feature/SHRINE-2020-21 | | |
Ben Carmen | 77840fb829a | Merge pull request #658 in SHRINE/shrine from feature/SHRINE2020-18-view-categories-UAT1 to 2.0-webclient
* commit '... | | |
Ben C | 5a850427cd6 | Updated snapshot test. | | |
Ben C | 33a14b5cb41 | changes based on UAT, remove the phrasing 'has a' or 'of' from the term category | | |
Ben C | c0cc0ebd14d | Working layout for components | | |
mjdiloreto | 04ca51eef03 | changed date format. | | |
Ben Carmen | c2b872bf113 | Merge pull request #657 in SHRINE/shrine from feature/SHRINE2020-18 to 2.0-webclient
* commit 'b28d7d6d6cdb7f3ebe00e... | | |
Ben C | b28d7d6d6cd | updated failing snapshot test | | |
Ben C | e646f863f4e | fix of css | | |
Ben C | 338ab21efb0 | potentail solution for phrasing of categories | | |
Ben C | 2a0eedfdc7f | make sure child element has children | | |
Ben C | d78c7bec14e | quick fix of allowing folders to close | | |
dwalend | fb55fb9344c | Moved pom.xml version to 2.0.0-RC4 | | |
Ben Carmen | 7037e9c4dd8 | Merge pull request #656 in SHRINE/shrine from feature/SHRINE2020-37-use-ontology-service to 2.0-webclient
* commit '... | | |
Ben C | 5e721718908 | removed padding | | |
Ben C | 271d44f1681 | Changes based on feedback from code review | | |
Ben C | dfe71e64b77 | update to use suggestions from code review | | |
Ben C | 302ff1e7578 | code cleanup | | |
Ben C | efcecc8be5b | code cleanup | | |
Ben C | 04e8ece2139 | code cleanup before review | | |
Ben C | 5bd113a63ab | gitignore .metals | | |
Ben C | 0b5a9d89ddb | removed .metals folder | | |
Ben C | 3df13eb5435 | code cleanup | | |
Ben C | 8da47214037 | Ontology using the ontology service instead of mock. | | |
Ben C | 3d85d024b76 | saving work | | |
Ben C | 6cbbc71d270 | saving work | | |
Ansible Deploy | 734e0104e3b | Merge release branch release/1.26.7 into master. | | |
Ansible Deploy | afbfd94042c | Update POMs with release version 2.0.0-RC3. | | |
mjdiloreto | bd9a1d1750c | removed wildcard imports from dashboard service. | | |
dwalend | 35fbd4b281d | Moving version number to RC3-SNAPSHOT | | |
David Walend | 48073604ba5 | Merge pull request #652 in SHRINE/shrine from bugfix/SHRINE-3585-queuedquerypoller-waiting-too to release/1.26.7
* c... | | |
mjdiloreto | b84845f62e3 | made the root logger point to a different file | | |
mjdiloreto | 4bf8c0337c9 | changed implementations to just use AdapterMappings, nothing from removed hierarchy. | | |
mjdiloreto | fe5a62f105c | remove entire hierarchy. Nothing fixed yet. | | |
Ansible Deploy | dc2318dcab2 | Merge release branch release/1.26.7 into master. | | |
Ansible Deploy | ea2415f3f30 | Update POMs with release version 2.0.0-RC2. | | |
David Walend | 5aaaa1c354d | Merge pull request #653 in SHRINE/shrine from bugfix/SHRINE-3588-change-from-1.25.4-to-2.0.0-rc1 to release/1.26.7
*... | | |
Ben C | 7ec0daaee4f | merge of 2.0-webclient | | |
Ben C | 58777bf0c71 | Merge branch '2.0-webclient' into feature/SHRINE2020-37-use-ontology-service | | |
Ben C | eb8fe635b32 | saving work for scroll when dragging | | |
dwalend | bbc957f3997 | Support both the old and new XML stored in the QEP's query definition for SHRINE-3588 | | |
Marc-Danie Nazaire | 1020b420f7d | Merge pull request #651 in SHRINE/shrine from feature/SHRINE2020-29-setup-stub-ontology-service to 2.0-webclient
* c... | | |
marc-danie | ca1f4052d77 | SHRINE2020-29 - Setup stub Ontology service - modified to use an IO[List[OntologyTerm]] in getRoot function | | |
marc-danie | 66b93c3a39c | SHRINE2020-29 - Setup stub Ontology service - modified to use an IO[List[OntologyTerm]] in getRoot function | | |
Ben Carmen | 831e3c9bfbb | Merge pull request #650 in SHRINE/shrine from feature/SHRINE2020-20-delete-terms to 2.0-webclient
* commit 'c430aa36... | | |
mjdiloreto | d3d2575a256 | Changed throwable converter to print full stack trace and caused by. format log messages. | | |
dwalend | feaef13665c | Intercept and log (but don't send) the QueryResultNotAvailable problem for SHRINE-3585 . The CRC may not have baked t... | | |
marc-danie | 30c323662a3 | SHRINE2020-29 - Setup stub Ontology service - modified to return 204 response if no children data was found for a giv... | | |
marc-danie | 7163cc25449 | SHRINE2020-29 - Setup stub Ontology service - Added hasChildren field to JSON structure | | |
marc-danie | 3c05790c47e | SHRINE2020-29 - Setup stub Ontology service - replace orNul with exists | | |
Ben Carmen | f9cab9ef6ab | Merge pull request #649 in SHRINE/shrine from feature/SHRINE2020-22-highlight to 2.0-webclient
* commit 'c299c151eb5... | | |
marc-danie | 1b8773bc7ab | SHRINE2020-29 - Setup stub Ontology service - modified so that the ontology path is now sent in the request body as JSON | | |
bendcarmen | c299c151eb5 | Used variable from shared.scss for box shadow | | |
mjdiloreto | 3af74c89471 | rename custom pattern layout test. Tighten up logback configurations. | | |
David Walend | 016fb7861bf | Merge pull request #648 in SHRINE/shrine from bugfix/SHRINE-3587-transient-unknownhostexception to release/1.26.7
* ... | | |
Ben C | f4265c44a96 | changed from border to box-shadow | | |
marc-danie | f0847e62175 | SHRINE2020-29 - Setup stub Ontology service - switched back to using a query parameter instead of a path parameter be... | | |
Ben C | c430aa36373 | Changes as a result of feedback from UAT. | | |
Ben C | 669ce74eb6e | Feedback from UAT...use blue highlight around the border of the drop zone. | | |
Ben Carmen | c2897d4b9d0 | Merge pull request #647 in SHRINE/shrine from SHRINE2020-15-instuctional-text to 2.0-webclient
* commit '0325e656b63... | | |
Ben C | 0325e656b63 | added missing period. | | |
Ben C | 6976a5a9c98 | ontology root call is working, but children fetch is not. | | |
dwalend | 54aff3467bd | Added handling of an UnknownHostException seen at UCLA for SHRINE-3587 | | |
dwalend | 6b4f62801b5 | Increased the time before checking on QUEUED queries for SHRINE-3585 | | |
Matthew DiLoreto | 739ddf0da95 | Merge pull request #644 in SHRINE/shrine from bugfix/SHRINE-3142-figure-out-how-to-use-either to develop
* commit '6... | | |
mjdiloreto | 449c0bf1b17 | remove all log4j properties files and replace the necessary ones with logback.xml | | |
mjdiloreto | 9676081fe25 | one logback version in top-level pom. Finalized default logback.xml | | |
mjdiloreto | b4456a9e82b | edited log file to log interesting information. Fixed throwable censor to properly censor throwables. | | |
mjdiloreto | 573e2ac711e | Migrate log4j dependent code to logback. Fix unit tests. Refactor Loggable to use slf4j api, only log strings. | | |
mjdiloreto | 0bef7a65b07 | Remove log4j and slf4j-simple references from all poms. Create logback.xml to replace log4j.properties. | | |
Ben C | 35c919836dc | saving work | | |
Ben C | e4ac7688a31 | used ordered list | | |
Ben C | 8ea89820223 | Instructional text | | |
Ben Carmen | 468842f0465 | Merge pull request #645 in SHRINE/shrine from feature/SHRINE2020-22-highlight to 2.0-webclient
* commit 'c8bea0e60b9... | | |
mjdiloreto | 63c75d0d111 | minor refactoring. | | |
Ben C | c8bea0e60b9 | incorporated recommended changes from review | | |
Ben C | dc716557bb6 | cleanup | | |
Ben C | ddd694a19a2 | pull data from remote source. | | |
mjdiloreto | 9824a01fa8c | shutdown http client when servlet closed. minor formatting changes. | | |
Ben C | 20305af0a18 | Merge branch '2.0-webclient' into feature/SHRINE2020-22-highlight | | |
Ben C | 8c4b78a8a6f | added react-dnd library for drag and drop | | |
mjdiloreto | ea7485072b8 | Merge branch 'bugfix/SHRINE-3142-figure-out-how-to-use-either' of https://open.med.harvard.edu/stash/scm/shrine/shrin... | | |
David Walend | 70b6df9b780 | Merge pull request #643 in SHRINE/shrine from hotfix/SHRINE-3523-add-the-shrinedatabasetype-with to release/1.26.7
*... | | |
Marc-Danie Nazaire | da0859b2f38 | Merge pull request #642 in SHRINE/shrine from feature/SHRINE2020-29-setup-stub-ontology-service to 2.0-webclient
* c... | | |
marc-danie | 1cbda92bc25 | SHRINE2020-29 - Setup stub Ontology service - switch from using query parameter to a path parameter | | |
Ben C | 5b392806c3a | added react dnd library | | |
Ben Carmen | 72ef51eec78 | Merge pull request #640 in SHRINE/shrine from feature/SHRINE2020-20-delete-terms to 2.0-webclient
* commit 'cef81b55... | | |
dwalend | 84dfbe1c28f | Extra comments as a fix for SHRINE-3523 | | |
mjdiloreto | 3cd5fb466c1 | Change http4sclient to use static client and not create a new one for each call. | | |
mjdiloreto | 3a89b39637b | merge from remote. | | |
mjdiloreto | 697ed82e1fa | Change http4sclient to use static client and not create a new one for each call. | | |
dwalend | a75da050cb8 | Last step of merging release/1.26.7 and 2.0.0-RC1 | | |
dwalend | 523ea00c625 | Merging | | |
Ben C | cef81b55a1b | updated unit test to not be as generic | | |
Ben C | 7797735bde6 | saving drop shadow work | | |
dwalend | 34b64f5c504 | Getting out of the way of the merge | | |
marc-danie | fc65b0f74ea | SHRINE2020-29 - Setup stub Ontology service - cleanup dependencies | | |
marc-danie | ab8d103e9b9 | SHRINE2020-29 - Setup stub Ontology service - minor text edit | | |
Next → |