SHRINE
  1. SHRINE

shrine

Public
  1. SHRINE
  2. shrine

All Branches Graph  

        
AuthorCommitMessageCommit dateBuilds
Ben CarmenBen Carmen
3dbc4fb3a32Merge pull request #699 in SHRINE/shrine from feature/SHRINE2020-64-new-design to 2.0-webclient * commit '2a1b8edb31...
mjdiloretomjdiloreto
d6704a672c6Changes suggested by review, except those shirked until SHRINE-3608.
dwalenddwalend
3f6cd1756faMatt spotted some wildcard imports in SHRINE-3644
Ben CBen C
f101189faa2saving work
dwalenddwalend
56661ec938bBetter comment for SHRINE-3644
Ben CBen C
17c13f5b65dsaving work
dwalenddwalend
b3e61be0204Removed json4s from dashboard and steward for SHRINE-3644
Ben CBen C
2a1b8edb316moved text-shadow to mixin
Ben CBen C
523afed4f68Made changes recommended by UAT
mjdiloretomjdiloreto
06c22370d53Added call-by-name parameter to adapter mappings to not instantiate db unless really needed. Simplify adapter mapping...
mjdiloretomjdiloreto
2fd95b8ea38refactored expressions to use transactional lookup of local terms.
mjdiloretomjdiloreto
131dae3c8fdAllow adapter mappings to look up many mappings at once.
Ben CBen C
bc164d024fcmerge of 2.0-webclient
Ben CBen C
ef498d511c7Update of app styles to new base look
dwalenddwalend
f5c20262c0cMerge branch 'develop' into feature/SHRINE-3644-remove-json4s-dependency-from
Ben CBen C
6d467d59036saving work
Ben CBen C
7ee40e8c586saving work
Matthew DiLoretoMatthew DiLoreto
51e099eb7cdMerge pull request #697 in SHRINE/shrine from bugfix/SHRINE-3623-upgrade-opencsv to develop * commit '75da1b4eb9bdd3...
David WalendDavid Walend
056811f83b3Merge pull request #696 in SHRINE/shrine from feature/SHRINE-3643-replace-shrine-util-s-use-of to develop * commit '...
Ben CBen C
812de4d4172saving work
mjdiloretomjdiloreto
1637da0bef9Merge branch 'develop' into bugfix/SHRINE-3634-refactor-networkhealthscheduler
mjdiloretomjdiloreto
b0909f53514Remove bug where network health scheduler wouldn't check query status after time limit.
dwalenddwalend
0a861e3d6b3Got rid of json4s dependency in steward, but foudn a new one in dashboard for SHRINE-3644
Ben CBen C
f759624f4c8saving work
marc-daniemarc-danie
25c7cff750cSHRINE2020-27 - Create the ability for a user to click a "Run" button to execute the query - modified so that the Get...
mjdiloretomjdiloreto
75da1b4eb9bUpgrade opencsv.
mjdiloretomjdiloreto
68c2fe7c4daRename method suggested in review.
Ben CBen C
a6ae8aaae30merge
Ben CBen C
f65655334ccmerge of latest develop
Ben CBen C
d92c16249ccsaving work
Ben CBen C
81593d0db19saving work
Ben CBen C
634467a4230saving work
mjdiloretomjdiloreto
ce6a7137d1dRevert "Upgrade opencsv." This reverts commit 88590bb723c8e625e3d3df25e63533628398d84b.
mjdiloretomjdiloreto
88590bb723cUpgrade opencsv.
Ben CBen C
60c784643a2saving work
marc-daniemarc-danie
81fd6f11b70Merge branches '2.0-webclient' and 'feature/SHRINE2020-54-create-lucene-index-for-the' of https://open.med.harvard.ed...
marc-daniemarc-danie
b7c0ada9ddbneed to manually remove empty broadcaster-service module
marc-daniemarc-danie
e2667bc35b7Merge remote-tracking branch 'origin/2.0-webclient' into 2.0-webclient
marc-daniemarc-danie
60ac2d9f112Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine into 2.0-webclient # Conflicts: # app...
Ben CarmenBen Carmen
65f5e1592f8Merge pull request #694 in SHRINE/shrine from feature/SHRINE2020-43-ontology-layout to 2.0-webclient * commit 'eba53...
Ben CBen C
8e7980a0b9bsaving work
dwalenddwalend
af275405056Removed dependencies on json4s for SHRINE-3642 and SHRINE-3641
dwalenddwalend
fadfb4b2ed4Removed json4s dependency from util for SHRINE-3643
Ben CBen C
4812f816d68saving work
marc-daniemarc-danie
c18809e3e10removed unused ShouldMatchersForJUnit
David WalendDavid Walend
cbc7e9dfa9fMerge pull request #691 in SHRINE/shrine from bugfix/SHRINE-3624-jawn-is-only-used-by-integration to develop * commi...
dwalenddwalend
ca6df775f52Merge branch 'develop' into bugfix/SHRINE-3624-jawn-is-only-used-by-integration
mjdiloretomjdiloreto
c6ded89b743Merge branch 'develop' into bugfix/SHRINE-3419-refactor-selectTheNetworkIO
Matthew DiLoretoMatthew DiLoreto
f4b03fc9db7Merge pull request #627 in SHRINE/shrine from bugfix/SHRINE-3533-one-version-in-the-top-level to develop * commit '5...
mjdiloretomjdiloreto
57d7d3b85d8remove deleted directories remaining after merge.
mjdiloretomjdiloreto
8768596885aMerge branch develop into bugfix/SHRINE-3533-one-version-in-the-top-level
David WalendDavid Walend
db5850b3727Merge pull request #693 in SHRINE/shrine from bugfix/SHRINE-1518-upgrade-jjwt-library-and-drop to develop * commit '...
mjdiloretomjdiloreto
79009df235eMerge branch 'develop' into bugfix/SHRINE-3419-refactor-selectTheNetworkIO
mjdiloretomjdiloreto
83dfd344b15Merge branch develop into bugfix/SHRINE-3634-refactor-networkhealthscheduler
David WalendDavid Walend
b71d43a2670Merge pull request #689 in SHRINE/shrine from bugfix/SHRINE-3543-remove-old-qep-hub-adapter-and to develop * commit ...
Ben CBen C
eba53da17a4merge of 2.0-webclient
Ben CBen C
d11e4698188added test for Search Component
Ben CBen C
f54831045e6Potential solution to Medical Concepts Layout.
mjdiloretomjdiloreto
d4e41bff150removed unnecessary formatting.
dwalenddwalend
665de35e610Back to the 2.1.0-M1-SNAPSHOT pom.xml
dwalenddwalend
8d86e6b2aebMerge 2.0.0
dwalenddwalend
af79aa700c7Preparing to merge 2.0.0 into develop
dwalenddwalend
80b2a173c22Removing jjwt for SHRINE-1518
dwalenddwalend
9216b824aedMoving the pom.xml version to the safe 2.0.1-PR1-SNAPSHOT
Ansible DeployAnsible Deploy
c6a9c2b678bMerge release branch release/1.26.7 into master.
Ansible DeployAnsible Deploy
6b1e9273165Update POMs with release version 2.0.0.
dwalenddwalend
c703abc0134Trying to sweet-talk Bamboo into making the 2.0.0 release
Ben CarmenBen Carmen
4615e9b515bMerge pull request #686 in SHRINE/shrine from SHRINE2020-28-validate-lab-values to 2.0-webclient * commit '5ea773cf5...
Ben CBen C
5ea773cf516Changes based on code review.
marc-daniemarc-danie
2cc0b4aa0b5Add the new ontology data to the expected JSON response
Marc-Danie NazaireMarc-Danie Nazaire
161834b8c2aMerge pull request #690 in SHRINE/shrine from feature/SHRINE2020-27-create-the-ability-for-a-user to 2.0-webclient *...
marc-daniemarc-danie
76458ba0f58SHRINE2020-27 - Create the ability for a user to click a "Run" button to execute the query - changed the reduce funct...
marc-daniemarc-danie
05d71f6bdffMerge branch '2.0-webclient' of https://open.med.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-27-creat...
mjdiloretomjdiloreto
b57b0a0403fProvide name param in NetworkHealthScheduler to work with IOScheduler.
mjdiloretomjdiloreto
cee0a8d38e4Changed NetworkHealthScheduler api to match other scheduler apis and fixed callers.
mjdiloretomjdiloreto
ec82a1ed6c8Slightly simplified data validation and email sending in NetworkHealthScheduler.
mjdiloretomjdiloreto
abb1e65cb6bupdated networkHealthScheduler to use IOScheduler under the hood.
Matthew DiLoretoMatthew DiLoreto
137dc2e9287Merge pull request #688 in SHRINE/shrine from bugfix/SHRINE-3536-create-standard-abstraction-for-the to develop * co...
Ben CBen C
0cc94bf64c5Merge branch '2.0-webclient' into SHRINE2020-28-validate-lab-values
mjdiloretomjdiloreto
80bbaaba1ebForce client of IOScheduler to provide a name.
dwalenddwalend
7094f8e8ab2Remove jawn library for SHRINE-3624
marc-daniemarc-danie
145137e2b7cAdded more data to the mock ontology to help test out auto suggest
dwalenddwalend
ab273739528Merging develop and Marc-Danie found a stray println
dwalenddwalend
7f8eb39a563End of merge from release/1.26.7
marc-daniemarc-danie
3a3fc314962SHRINE2020-27 - Create the ability for a user to click a "Run" button to execute the query - small css change
marc-daniemarc-danie
e1b45520871SHRINE2020-27 - Create the ability for a user to click a "Run" button to execute the query
dwalenddwalend
07dcb3602d1Merging release/1.26.7
dwalenddwalend
6f9ccc4be11Making way for merging release/1.26.7
mjdiloretomjdiloreto
3afc0afa3f3refactored selectTheNetworkIO to throw an exception when no Network is found.
dwalenddwalend
48f171cba78Merge branch 'develop' into bugfix/SHRINE-3543-remove-old-qep-hub-adapter-and
dwalenddwalend
ce717d9eee1Stray SHRINE-3379 comment
dwalenddwalend
c2bd7dbefcbFound and cleaned out some stray pom.xml dependencies for SHRINE-3543
dwalenddwalend
40cf92b9e7cFound some problems we no longer have for SHRINE-3543
dwalenddwalend
d98ce4cff82Chasers for SHRINE-3543
dwalenddwalend
34b843db676Updating comments for SHRINE-3543 before wrapping it up
dwalenddwalend
d92c14360f3Deleted the hub broadcaster sub project for SHRINE-3543
dwalenddwalend
8cfc7ed70e4Deleted most of the hub/broadcaster-aggregator/src/test/scala/net/shrine/broadcaster package for SHRINE-3543
dwalenddwalend
09fd600a2b5Deleted delete commands and that touched all kinds of things for SHRINE-3543
dwalenddwalend
0c5cd4dcb9cDeleted adapter/adapter-api for SHRINE-3543
dwalenddwalend
fb40f1415abPunting some actual consolidation work to a future ticket
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
Next →