SHRINE
  1. SHRINE

shrine

Public
  1. SHRINE
  2. shrine

All Branches Graph  

        
AuthorCommitMessageCommit dateBuilds
dwalenddwalend
afe47111b50Moving this release branch to 2.0.0-RC7, but hopefully this will be the last check-in on the branch
Ansible DeployAnsible Deploy
4e7b9f0e850Merge release branch release/1.26.7 into master.
Ansible DeployAnsible Deploy
bf2142e3dc1Update POMs with release version 2.0.0-RC6.
dwalenddwalend
daaff9ce8a9Deleted some more adapter parts for SHRINE-3543
David WalendDavid Walend
564d49b8ee4Merge pull request #687 in SHRINE/shrine from bugfix/SHRINE-3626-using-the-wrong-id-number-in to release/1.26.7 * co...
dwalenddwalend
ef06529bf9aDeleted a lot of dead services from the adapter for SHRINE-3543
mjdiloretomjdiloreto
86160a9ecfcupdated signature of scheduleOnce in IOScheduler.
mjdiloretomjdiloreto
0aaf0b7ecebClean up imports.
mjdiloretomjdiloreto
d58073a94dbChanged IOScheduler to return IO for stop and restart. Added Unit tests for all methods.
mjdiloretomjdiloreto
e9b3b57a6a9Made current pollers use the IOScheduler behind the scenes.
mjdiloretomjdiloreto
faa01bf59f4created test for IOScheduler
mjdiloretomjdiloreto
6149b97b4b9created abstract scheduler for repeated IO events
dwalenddwalend
068786a6072Deleted DeleteQueryAdapter for SHRINE-3543
dwalenddwalend
90bf45c5670Deleting an empty file for SHRINE-3543
dwalenddwalend
23480c01555Fix for SHRINE-3626 with belt-and-suspenders checks to make sure we get the query instance id from the CRC
dwalenddwalend
17a64e201abQuick fix of SHRINE-3626 to see the id number work correctly on shrine-qa2
dwalenddwalend
2a5cc4a7b58Deleted a little more QEP and started deletign old adapter stuff for SHRINE-3543
dwalenddwalend
b8d2cdb08beSome more minor deleting for SHRINE-3543
Ben CBen C
d9c3f8c2e31commit of potential solution for Lab Values validation
dwalenddwalend
73f76922e55Removed another chunk of the QEP for SHRINE-3543
dwalenddwalend
cc4d842e8a4Toward removing QueryEntryPointComponents for SHRINE-3542
Ben CBen C
cbe9e7a47d3changed text to read Less than or Equal to (<=) and Greater than or Equal to (>=)
dwalenddwalend
04a42784922Removed the jersy part of the QEP for SHRINE-3543
dwalenddwalend
e7c34e77c41Deleted the QepService for SHRINE-3543
dwalenddwalend
14eac1a03a1Removed StatusJaxrs for SHRINE-3543
dwalenddwalend
9d0c9ae3ab2Deleted many things for SHRINE-3379
dwalenddwalend
f73bd2f962dRemoved a lot of the hub for SHRINE-3543
Ben CBen C
e21df88c626refactored validation to a hook...also moved shared css to constants
Ben CBen C
fb1e5fb0f5crefactored validation to a hook
David WalendDavid Walend
0f2252ab8d1Merge pull request #685 in SHRINE/shrine from feature/SHRINE-3552-upgrade-easy-libraries-to-the to develop * commit ...
Ben CBen C
3d46704cb36saving work
dwalenddwalend
805b40dc366Rolling back bouncycastle to 1.57 - Needs to wait for JDK 11 I think.
dwalenddwalend
a6b707468c2Upgraed http4s circe twirl for SHRINE-3552
dwalenddwalend
412d3d2c2c2Updated squeryl, typesafe config, and slick for SHRINE-3552
dwalenddwalend
53345eb099bUpgraded scala-maven-plugin for SHRINE-3552
dwalenddwalend
e207c0c53beUpdated xml and slf4j for SHRINE-3552
dwalenddwalend
41a020ab5c7Merging release/1.26.7 for 2.0.0-RC5
dwalenddwalend
4b3861634a9Before merge
Ben CarmenBen Carmen
96b40e871afMerge pull request #684 in SHRINE/shrine from feature/SHRINE2020-19-lab-values-UAT1 to 2.0-webclient * commit '04ac4...
Ben CBen C
04ac46e0d81Changes based on feedback from UAT
Ben CBen C
a3b3bb66a19Fixed layout and select issues from UAT
Matthew DiLoretoMatthew DiLoreto
e0e332edf77Merge pull request #665 in SHRINE/shrine from bugfix/SHRINE-3566-design-database-schema-to-hold-adapter to develop *...
Ben CarmenBen Carmen
fdb74e2e4caMerge pull request #680 in SHRINE/shrine from SHRINE2020-30-clear-out-concpets to 2.0-webclient * commit '643b0deca1...
Matthew DiLoretoMatthew DiLoreto
c0d0c0746b3Changes from review.
Matthew DiLoretoMatthew DiLoreto
9add55a05d2Merge branch 'develop' into bugfix/SHRINE-3566-design-database-schema-to-hold-adapter
dwalenddwalend
4a738683ecaMerge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine into develop
dwalenddwalend
cf8a30df311Updating pom.xml files to 2.0.0-RC6-SNAPSHOT
Matthew DiLoretoMatthew DiLoreto
d3bcb97c1efMerge pull request #683 in SHRINE/shrine from bugfix/SHRINE-3614-update-java-key-store-for-jsontest.testqueryroundtri...
Ansible DeployAnsible Deploy
0c5360c7340Merge release branch release/1.26.7 into master.
Ansible DeployAnsible Deploy
108560fe20aUpdate POMs with release version 2.0.0-RC5.
Ben CBen C
46c61d9801acommit of dashboard/version dev service
mjdiloretomjdiloreto
f142291d9d7minor change to adapter ddl.
David WalendDavid Walend
f0ac1ce6d8aMerge pull request #682 in SHRINE/shrine from bugfix/SHRINE-3617-error-error-from-crc-causes-shrine to release/1.26.7...
dwalenddwalend
b78c39ae515Continue polling for QUEUED queries by digesting a new from a new ERROR ERROR, and from handling general trouble foun...
mjdiloretomjdiloreto
ee4f0031a81created new test certificates to last an eon. Refactored broken json tests that hardcoded old certificate.
Ben CBen C
4a6e8832ed2commented out testQueryRoundTrip tests temporarily until fix is in place from 2.0 webclient.
mjdiloretomjdiloreto
7c53c42a3bcAdapter mappings now log how long insert takes.
mjdiloretomjdiloreto
de5154b9fd8Merge branch 'develop' into bugfix/SHRINE-3566-design-database-schema-to-hold-adapter
Matthew DiLoretoMatthew DiLoreto
8224b54f994Merge pull request #681 in SHRINE/shrine from bugfix/SHRINE-3612-move-xmldatehelper.time-to to develop * commit '5d8...
Marc-Danie NazaireMarc-Danie Nazaire
62ab86f4fc2Merge pull request #679 in SHRINE/shrine from feature/SHRINE2020-38-create-a-footer-element-for to 2.0-webclient * c...
marc-daniemarc-danie
6aa68bc14ceSHRINE2020-38 - Create a footer element for all application web pages and display the date/time/version - added propT...
Ben CBen C
643b0deca17updated a method name
mjdiloretomjdiloreto
5d87a66a45erenamed time method in Loggable to avoid name collisions elsewhere.
Ben CBen C
d54fa1635a7added unit tests for confirmation component
marc-daniemarc-danie
d787672c1faMerge branch '2.0-webclient' of https://open.med.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-38-creat...
Ben CBen C
98b0e5b83efPotential solution for clear all button
Ben CBen C
bbc0ae411a3merge of main branch
Ben CBen C
479edafe55fsaving progress
marc-daniemarc-danie
31bde887033Merge branch '2.0-webclient' of https://open.med.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-38-creat...
dwalenddwalend
7526610a03bMerge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine into develop
dwalenddwalend
f63f54e88fcBack to the 2.1.0M1 version
Ben CarmenBen Carmen
5ee6e30b3b8Merge pull request #672 in SHRINE/shrine from feature/SHRINE2020-19-lab-values to 2.0-webclient * commit '326c3427e3...
dwalenddwalend
39fbc3e867dMerging
dwalenddwalend
e0fe70796c1Before merging from the release branch
Matthew DiLoretoMatthew DiLoreto
bef577b4aa7Merge pull request #678 in SHRINE/shrine from bugfix/SHRINE-3615-use-h2-in-mysql-compatibility to develop * commit '...
Matthew DiLoretoMatthew DiLoreto
d98fb66290fMerge pull request #673 in SHRINE/shrine from bugfix/SHRINE-3612-move-xmldatehelper.time-to-a to develop * commit '0...
dwalenddwalend
a1fb1d513caMoving to a safe version after releasing 2.0.0-RC4
Ben CarmenBen Carmen
ca6fa7e283aMerge pull request #676 in SHRINE/shrine from feature/SHRINE2020-25-new-inclusion-design to 2.0-webclient * commit '...
Ansible DeployAnsible Deploy
2d5795f2ed3Merge release branch release/1.26.7 into master.
Ansible DeployAnsible Deploy
e92510f2af0Update POMs with release version 2.0.0-RC4.
marc-daniemarc-danie
4aece5b8d22SHRINE2020-38 - Create a footer element for all application web pages and display the date/time/version - reverting t...
marc-daniemarc-danie
d8ac7657908SHRINE2020-23 - Allow a user to click the info icon for a concept and view the code path of the selected concept and ...
Ben CBen C
326c3427e32Merge branch '2.0-webclient' into feature/SHRINE2020-19-lab-values
Ben CBen C
8cc6747d85echanged slot1 and slot2 to LabLink and LabContent
David WalendDavid Walend
4d2bb854e4eMerge pull request #677 in SHRINE/shrine from bugfix/SHRINE-3611-queries-with-breakdowns-that to release/1.26.7 * co...
mjdiloretomjdiloreto
7c87cd39e5drefactor adapter mappings to break correctly when shrine is misconfigured.
mjdiloretomjdiloreto
b1c1ba81e6cchanged all test datasources to use H2's mysql compatability mode.
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
Next →