SHRINE
  1. SHRINE

shrine

Public
  1. SHRINE
  2. shrine

All Branches Graph  

        
AuthorCommitMessageCommit dateBuilds
Ben CBen C
3c06243c3b9removed accidental addition to .gitignore
dwalenddwalend
3f11ef55649Cleaned up a bit for SHRINE-3611
dwalenddwalend
3e5f277a26eRestored retrival of queued breakdown results for SHRINE-3611
dwalenddwalend
90b8424962fEnd-of-merge for SHRINE-3611
David WalendDavid Walend
d56dcd96ab4Merge pull request #671 in SHRINE/shrine from bugfix/SHRINE-3610-breakdown-queries-with-some-results to release/1.26....
Ben CBen C
1c7c554019ecode cleanup
Ben CBen C
772862c5e0freverted .gitignore
Ben CBen C
d16ae524a6aMerge branch '2.0-webclient' into feature/SHRINE2020-25-new-inclusion-design
Ben CBen C
06fe20453c1Potential Solution for the new inclusion/exclusion design
Ben CBen C
dd2b0e9a567Create a new QueryTermLabView component that wraps the QueryTermView.
Ben CBen C
348bbca95b6ignore changes to i2b2_config_data.js
Ben CBen C
ae1638ca148commented out accidental commit
Matthew DiLoretoMatthew DiLoreto
14fa0cf4694Merge pull request #675 in SHRINE/shrine from develop to 2.0-webclient * commit '026b16069b462e8aa7086abef8d8993ae0a...
Matthew DiLoretoMatthew DiLoreto
026b16069b4Merge pull request #674 in SHRINE/shrine from revert-shrine-3419 to develop * commit '765e182282cfce123ff78161774fb2...
Ben CBen C
bb800d7da33Use React Context Provider instead of passing around a bunch of props.
mjdiloretomjdiloreto
765e182282cremove network health js build
dwalenddwalend
05833e17e81Start of merging with SHRINE-3610
dwalenddwalend
1b10ec4f2deFix for a partially complete query - some breakdowns queued - for SHRINE-3661
Matthew DiLoretoMatthew DiLoreto
1e3b57502e2revert changes from SHRINE-3419
Ben CBen C
4fe6aa9100fsaving width of header
Ben CBen C
7ec6834f42asaving progress
mjdiloretomjdiloreto
06e2717bfddMoved time method from XmlUtil to Loggable.
Ben CBen C
0c87e74190cadded unit tests for Lab Values...put ValueTypes in own component
mjdiloretomjdiloreto
92c02848455Updated Adapter Mappings to truncate table before inserting mappings on reload.
Ben CBen C
ecb9715b4b7saving unit tests.
marc-daniemarc-danie
6a67dc37ecdfixed version field in the POM file for OntologyService
Ben CBen C
0157278385bupdated snapshot test
Ben CBen C
540e73f0f82Merge branch '2.0-webclient' into feature/SHRINE2020-19-lab-values
mjdiloretomjdiloreto
fde92ca9339Changes based on review, added index to ddl.
Matthew DiLoretoMatthew DiLoreto
f60e9c8d980Merge pull request #670 in SHRINE/shrine from merge-pom-into-webclient to 2.0-webclient * commit '7152a6ad5ffccbc8b8...
dwalenddwalend
13c29bc3870Cleaning up some of the detritus from investigating SHRINE-3610
dwalenddwalend
eb32a3010d4Cleaning up some of the detritus from investigating SHRINE-3610
dwalenddwalend
9bc3ab4ae12Much more thourough check of breakdown query status for SHRINE-3610
Ben CBen C
3dfd192fc24saving progress
mjdiloretomjdiloreto
7152a6ad5ffre-deleting appropriate files that were added during merge.
mjdiloretomjdiloreto
52677584e93Merge branch bugfix/SHRINE-3533-one-version-in-the-top-level-pom into 2.0-webclient
Matthew DiLoretoMatthew DiLoreto
3d485456d4bMerge pull request #669 in SHRINE/shrine from merge-develop-into-2.0-webclient to 2.0-webclient * commit '4e84b020eb...
Ben CBen C
0c8512694eesaving work
mjdiloretomjdiloreto
4e84b020ebeRemove log4j references from 2.0-webclient code. Update service mounting in shrine-api bootstrap.
Ben CBen C
aae1a3577dasaving
Ben CBen C
6fd84ddb0d8added colon after Date
Ben CBen C
1f30f2b68a2mege of develop into 2.0-webclient
Ben CBen C
415911f8d97merge of develop into 2.0-webclient
Ben CBen C
18895d1bf6csaving work
David WalendDavid Walend
41cd74f95d2Merge pull request #668 in SHRINE/shrine from bugfix/SHRINE-3602-retry-for-network-failures-as to release/1.26.7 * c...
Ben CBen C
8013555cb6cmoved open/close container to a component for reuse in labs.
Ben CarmenBen Carmen
9f0955c4b83Merge pull request #666 in SHRINE/shrine from feature/SHRINE-2020-21-date-range-UAT1 to 2.0-webclient * commit 'fa8d...
dwalenddwalend
9fda1c7675dRecover for almost all network errors for SHRINE-3602
mjdiloretomjdiloreto
078118ddc86Merge branch develop into bugfix/SHRINE-3533-one-version-in-the-top-level
David WalendDavid Walend
8210f3353c8Merge pull request #664 in SHRINE/shrine from bugfix/SHRINE-3589-queryqueuedtimetoliveexceeded to release/1.26.7 * c...
Ben CBen C
fa8de8c596dupdated snapshot tests
Ben CBen C
e48aa72fc81added colon to date range.
Ben CBen C
fc142d8a799fix for UAT feedback
mjdiloretomjdiloreto
a0e674a2d6eadded mapping table create statements into ddl and changed table names and columns to camelCase
Ben CBen C
e6263cc22aeMerge branch '2.0-webclient' of https://open.med.harvard.edu/stash/scm/shrine/shrine into 2.0-webclient
Ben CBen C
7aaf2ec5f1cchanged some text.
dwalenddwalend
1d51a687e21Made shrine able to handle missing data in the shrine_query_history count and result tables to fix SHRINE-3589
mjdiloretomjdiloreto
4e7df21a265Added checksum checking to adapter mappings and added check for mappings changes at shrine startup.
Ben CarmenBen Carmen
0e67ecfa395Merge pull request #663 in SHRINE/shrine from feature/SHRINE2020-24-scroll-on-drag to 2.0-webclient * commit 'af3d47...
Ben CBen C
af3d47e46f3made adjustment based on code review
mjdiloretomjdiloreto
e32ffeecca7simplified dao to only use fs2.
mjdiloretomjdiloreto
2cbe78dcf36created test for adapter mappings and trying to parallelize insert
mjdiloretomjdiloreto
7df1e6aca3ecreat unit test for mappings dao.
mjdiloretomjdiloreto
2baeff431d4made adapter use db
Ben CBen C
dbae2a76cd0working version of hook for scroll while dragging
Ben CBen C
29746ee4bcbMerge branch '2.0-webclient' into feature/SHRINE2020-24-scroll-on-drag
Matthew DiLoretoMatthew DiLoreto
3a83058ec32Merge pull request #654 in SHRINE/shrine from bugfix/SHRINE-1523-clean-up-baroque-hierarchy-under to develop * commi...
David WalendDavid Walend
d9192ba8db5Merge pull request #662 in SHRINE/shrine from bugfix/SHRINE-3587-transient-unknownhostexception to release/1.26.7 * ...
dwalenddwalend
6d4b9a8f5d3Another trap for UCLA's temporary DNS problem for SHRINE-3587
Ben CBen C
b1df4266b88Update of package lock to account for DatePicker component
Ben CBen C
0e1ceecf35fcleaned up code
Ben CarmenBen Carmen
87d63633e7fMerge pull request #659 in SHRINE/shrine from feature/SHRINE-2020-21 to 2.0-webclient * commit '38ba19414473175c0bd5...
David WalendDavid Walend
84fb1998990Merge pull request #661 in SHRINE/shrine from feature/SHRINE-3551-upgrade-scala-to-2.12 to develop * commit 'b6ae53c...
Ben CBen C
4987b2525a9Merge branch '2.0-webclient' into feature/SHRINE2020-24-scroll-on-drag
dwalenddwalend
b6ae53cf80eStray comments for SHRINE-3551
Ben CBen C
38ba1941447removed the !important modifiers from CSS in index.scss per Code Review feedback
Ben CBen C
652b8ff6581Merge branch '2.0-webclient' into feature/SHRINE-2020-21
Ben CarmenBen Carmen
6754738d315Merge pull request #660 in SHRINE/shrine from eature/SHRINE2020-18-view-categories-UAT2 to 2.0-webclient * commit '2...
dwalenddwalend
905f04ed9caAdded dependency on circe to QEP service for SHRINE-3551
dwalenddwalend
838482f1799Added dependency on circe for SHRINE-3551
dwalenddwalend
9da82a94c44Changed some hard-coded dependencies on scala 2.11 to use the variable and got all the way to NetworkHealth in the bu...
Ben CBen C
e545db0eff5feedback from Code Review
Ben CBen C
2e9a693920dIncorporated changes from UAT round 2.
Ben CBen C
29527226452created Unit tests.
dwalenddwalend
7b7de304e66Fixed a type problem now caught by the 2.12 compiler in XML code for SHRINE-3551
Ben CBen C
56d4db4d011cleaned up code
Ben CBen C
836870f4480all features are working for this item.
dwalenddwalend
cbe95d6fafaUpdated courier to a new groupid that supports 2.12 and got the tests working again for SHRINE-3551
Ben CBen C
28fd0612944saving work
Matthew DiLoretoMatthew DiLoreto
9bc7947c316Merge pull request #655 in SHRINE/shrine from bugfix/SHRINE-1501-find-replacement-for-log4j to develop * commit '04c...
Ben CBen C
eedb0f0f617Merge branch '2.0-webclient' into feature/SHRINE-2020-21
Ben CarmenBen Carmen
77840fb829aMerge pull request #658 in SHRINE/shrine from feature/SHRINE2020-18-view-categories-UAT1 to 2.0-webclient * commit '...
Ben CBen C
5a850427cd6Updated snapshot test.
Ben CBen C
33a14b5cb41changes based on UAT, remove the phrasing 'has a' or 'of' from the term category
Ben CBen C
c0cc0ebd14dWorking layout for components
mjdiloretomjdiloreto
04ca51eef03changed date format.
Ben CarmenBen Carmen
c2b872bf113Merge pull request #657 in SHRINE/shrine from feature/SHRINE2020-18 to 2.0-webclient * commit 'b28d7d6d6cdb7f3ebe00e...
Ben CBen C
b28d7d6d6cdupdated failing snapshot test
Ben CBen C
e646f863f4efix of css
Ben CBen C
338ab21efb0potentail solution for phrasing of categories
Ben CBen C
2a0eedfdc7fmake sure child element has children
Ben CBen C
d78c7bec14equick fix of allowing folders to close
dwalenddwalend
fb55fb9344cMoved pom.xml version to 2.0.0-RC4
Ben CarmenBen Carmen
7037e9c4dd8Merge pull request #656 in SHRINE/shrine from feature/SHRINE2020-37-use-ontology-service to 2.0-webclient * commit '...
Ben CBen C
5e721718908removed padding
Ben CBen C
271d44f1681Changes based on feedback from code review
Ben CBen C
dfe71e64b77update to use suggestions from code review
Ben CBen C
302ff1e7578code cleanup
Ben CBen C
efcecc8be5bcode cleanup
Ben CBen C
04e8ece2139code cleanup before review
Ben CBen C
5bd113a63abgitignore .metals
Ben CBen C
0b5a9d89ddbremoved .metals folder
Ben CBen C
3df13eb5435code cleanup
Ben CBen C
8da47214037Ontology using the ontology service instead of mock.
Ben CBen C
3d85d024b76saving work
Ben CBen C
6cbbc71d270saving work
Ansible DeployAnsible Deploy
734e0104e3bMerge release branch release/1.26.7 into master.
Ansible DeployAnsible Deploy
afbfd94042cUpdate POMs with release version 2.0.0-RC3.
mjdiloretomjdiloreto
bd9a1d1750cremoved wildcard imports from dashboard service.
dwalenddwalend
35fbd4b281dMoving version number to RC3-SNAPSHOT
David WalendDavid Walend
48073604ba5Merge pull request #652 in SHRINE/shrine from bugfix/SHRINE-3585-queuedquerypoller-waiting-too to release/1.26.7 * c...
mjdiloretomjdiloreto
b84845f62e3made the root logger point to a different file
mjdiloretomjdiloreto
4bf8c0337c9changed implementations to just use AdapterMappings, nothing from removed hierarchy.
mjdiloretomjdiloreto
fe5a62f105cremove entire hierarchy. Nothing fixed yet.
Ansible DeployAnsible Deploy
dc2318dcab2Merge release branch release/1.26.7 into master.
Ansible DeployAnsible Deploy
ea2415f3f30Update POMs with release version 2.0.0-RC2.
David WalendDavid Walend
5aaaa1c354dMerge 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 CBen C
7ec0daaee4fmerge of 2.0-webclient
Ben CBen C
58777bf0c71Merge branch '2.0-webclient' into feature/SHRINE2020-37-use-ontology-service
Ben CBen C
eb8fe635b32saving work for scroll when dragging
dwalenddwalend
bbc957f3997Support both the old and new XML stored in the QEP's query definition for SHRINE-3588
Marc-Danie NazaireMarc-Danie Nazaire
1020b420f7dMerge pull request #651 in SHRINE/shrine from feature/SHRINE2020-29-setup-stub-ontology-service to 2.0-webclient * c...
marc-daniemarc-danie
ca1f4052d77SHRINE2020-29 - Setup stub Ontology service - modified to use an IO[List[OntologyTerm]] in getRoot function
marc-daniemarc-danie
66b93c3a39cSHRINE2020-29 - Setup stub Ontology service - modified to use an IO[List[OntologyTerm]] in getRoot function
Ben CarmenBen Carmen
831e3c9bfbbMerge pull request #650 in SHRINE/shrine from feature/SHRINE2020-20-delete-terms to 2.0-webclient * commit 'c430aa36...
mjdiloretomjdiloreto
d3d2575a256Changed throwable converter to print full stack trace and caused by. format log messages.
dwalenddwalend
feaef13665cIntercept and log (but don't send) the QueryResultNotAvailable problem for SHRINE-3585 . The CRC may not have baked t...
marc-daniemarc-danie
30c323662a3SHRINE2020-29 - Setup stub Ontology service - modified to return 204 response if no children data was found for a giv...
marc-daniemarc-danie
7163cc25449SHRINE2020-29 - Setup stub Ontology service - Added hasChildren field to JSON structure
marc-daniemarc-danie
3c05790c47eSHRINE2020-29 - Setup stub Ontology service - replace orNul with exists
Ben CarmenBen Carmen
f9cab9ef6abMerge pull request #649 in SHRINE/shrine from feature/SHRINE2020-22-highlight to 2.0-webclient * commit 'c299c151eb5...
marc-daniemarc-danie
1b8773bc7abSHRINE2020-29 - Setup stub Ontology service - modified so that the ontology path is now sent in the request body as JSON
bendcarmenbendcarmen
c299c151eb5Used variable from shared.scss for box shadow
mjdiloretomjdiloreto
3af74c89471rename custom pattern layout test. Tighten up logback configurations.
David WalendDavid Walend
016fb7861bfMerge pull request #648 in SHRINE/shrine from bugfix/SHRINE-3587-transient-unknownhostexception to release/1.26.7 * ...
Ben CBen C
f4265c44a96changed from border to box-shadow
marc-daniemarc-danie
f0847e62175SHRINE2020-29 - Setup stub Ontology service - switched back to using a query parameter instead of a path parameter be...
Ben CBen C
c430aa36373Changes as a result of feedback from UAT.
Ben CBen C
669ce74eb6eFeedback from UAT...use blue highlight around the border of the drop zone.
Ben CarmenBen Carmen
c2897d4b9d0Merge pull request #647 in SHRINE/shrine from SHRINE2020-15-instuctional-text to 2.0-webclient * commit '0325e656b63...
Ben CBen C
0325e656b63added missing period.
Ben CBen C
6976a5a9c98ontology root call is working, but children fetch is not.
dwalenddwalend
54aff3467bdAdded handling of an UnknownHostException seen at UCLA for SHRINE-3587
dwalenddwalend
6b4f62801b5Increased the time before checking on QUEUED queries for SHRINE-3585
Matthew DiLoretoMatthew DiLoreto
739ddf0da95Merge pull request #644 in SHRINE/shrine from bugfix/SHRINE-3142-figure-out-how-to-use-either to develop * commit '6...
mjdiloretomjdiloreto
449c0bf1b17remove all log4j properties files and replace the necessary ones with logback.xml
mjdiloretomjdiloreto
9676081fe25one logback version in top-level pom. Finalized default logback.xml
mjdiloretomjdiloreto
b4456a9e82bedited log file to log interesting information. Fixed throwable censor to properly censor throwables.
mjdiloretomjdiloreto
573e2ac711eMigrate log4j dependent code to logback. Fix unit tests. Refactor Loggable to use slf4j api, only log strings.
mjdiloretomjdiloreto
0bef7a65b07Remove log4j and slf4j-simple references from all poms. Create logback.xml to replace log4j.properties.
Ben CBen C
35c919836dcsaving work
Ben CBen C
e4ac7688a31used ordered list
Ben CBen C
8ea89820223Instructional text
Ben CarmenBen Carmen
468842f0465Merge pull request #645 in SHRINE/shrine from feature/SHRINE2020-22-highlight to 2.0-webclient * commit 'c8bea0e60b9...
mjdiloretomjdiloreto
63c75d0d111minor refactoring.
Ben CBen C
c8bea0e60b9incorporated recommended changes from review
Ben CBen C
dc716557bb6cleanup
Ben CBen C
ddd694a19a2pull data from remote source.
mjdiloretomjdiloreto
9824a01fa8cshutdown http client when servlet closed. minor formatting changes.
Ben CBen C
20305af0a18Merge branch '2.0-webclient' into feature/SHRINE2020-22-highlight
Ben CBen C
8c4b78a8a6fadded react-dnd library for drag and drop
mjdiloretomjdiloreto
ea7485072b8Merge branch 'bugfix/SHRINE-3142-figure-out-how-to-use-either' of https://open.med.harvard.edu/stash/scm/shrine/shrin...
David WalendDavid Walend
70b6df9b780Merge pull request #643 in SHRINE/shrine from hotfix/SHRINE-3523-add-the-shrinedatabasetype-with to release/1.26.7 *...
Marc-Danie NazaireMarc-Danie Nazaire
da0859b2f38Merge pull request #642 in SHRINE/shrine from feature/SHRINE2020-29-setup-stub-ontology-service to 2.0-webclient * c...
marc-daniemarc-danie
1cbda92bc25SHRINE2020-29 - Setup stub Ontology service - switch from using query parameter to a path parameter
Ben CBen C
5b392806c3aadded react dnd library
Ben CarmenBen Carmen
72ef51eec78Merge pull request #640 in SHRINE/shrine from feature/SHRINE2020-20-delete-terms to 2.0-webclient * commit 'cef81b55...
dwalenddwalend
84dfbe1c28fExtra comments as a fix for SHRINE-3523
mjdiloretomjdiloreto
3cd5fb466c1Change http4sclient to use static client and not create a new one for each call.
mjdiloretomjdiloreto
3a89b39637bmerge from remote.
mjdiloretomjdiloreto
697ed82e1faChange http4sclient to use static client and not create a new one for each call.
dwalenddwalend
a75da050cb8Last step of merging release/1.26.7 and 2.0.0-RC1
dwalenddwalend
523ea00c625Merging
Ben CBen C
cef81b55a1bupdated unit test to not be as generic
Ben CBen C
7797735bde6saving drop shadow work
dwalenddwalend
34b64f5c504Getting out of the way of the merge
marc-daniemarc-danie
fc65b0f74eaSHRINE2020-29 - Setup stub Ontology service - cleanup dependencies
marc-daniemarc-danie
ab8d103e9b9SHRINE2020-29 - Setup stub Ontology service - minor text edit
Next →