SHRINE
  1. SHRINE

shrine

Public
  1. SHRINE
  2. shrine

All Branches Graph  

        
AuthorCommitMessageCommit dateBuilds
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
marc-daniemarc-danie
f97ed34fb94Merge branches '2.0-webclient' and 'feature/SHRINE2020-29-setup-stub-ontology-service' of https://open.med.harvard.ed...
marc-daniemarc-danie
2d2795ba7c8SHRINE2020-29 - Setup stub Ontology service - Finalized JSON structure and added more unit tests
Ben CBen C
5e787c04749saving work for adding and removing the highlight
Matthew DiLoretoMatthew DiLoreto
392ae2acffeMerge pull request #641 in SHRINE/shrine from bugfix/SHRINE-3530-add-unit-tests-for-reading-in to develop * commit '...
marc-daniemarc-danie
dfc33a407f1SHRINE2020-29 - Setup stub Ontology service - Added procedures to Mock data
dwalenddwalend
c05c5e07d79Moving version to 2.0.0-RC2-SNAPSHOT
Ben CBen C
a82191f1080Potential solution for deleting a query term
Ben CBen C
61db4bab0a6Merge branch 'feature/SHRINE2020-16-first-group' into 2.0-webclient
Ben CBen C
77c245d5400Fix of feedback from UAT
Ansible DeployAnsible Deploy
c0a8524583fMerge release branch release/1.26.7 into master.
Ansible DeployAnsible Deploy
574b4dbcee1Update POMs with release version 2.0.0-RC1.
marc-daniemarc-danie
a4e23649842SHRINE2020-29 - Setup stub Ontology service - Adding POM file
Ben CBen C
72b28c2e4b6saving work
marc-daniemarc-danie
3d68c3725f6SHRINE2020-29 - Setup stub Ontology service - Added some lab details
mjdiloretomjdiloreto
d60d1c0d875Changed test address from localhost to 0.0.0.0 to remove any chance of failure.
mjdiloretomjdiloreto
643530c4595remove test dependency on Matt's laptop...
Marc-Danie NazaireMarc-Danie Nazaire
ae30b3eed43Merge pull request #639 in SHRINE/shrine from feature/SHRINE-3571-error-parsing-breakdowns-which to release/1.26.7 *...
marc-daniemarc-danie
12b4d171e10Merge branch 'release/1.26.7' of https://open.med.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE-3571-error-...
marc-daniemarc-danie
75074fd5009SHRINE-3571 - Error parsing Breakdowns which contain < in the value - Moved fixed to I2B2Workarounds and commented ou...
David WalendDavid Walend
4c779c3cb75Merge pull request #638 in SHRINE/shrine from bugfix/SHRINE-3327-after-scale-up-testing to release/1.26.7 * commit '...
Ben CBen C
9ef5cf619d7saving work
Ben CarmenBen Carmen
8a5fc71e452Merge pull request #634 in SHRINE/shrine from SHRINE-3574-replace-help-guide to release/1.26.7 * commit '673c487c752...
David WalendDavid Walend
b483ff8e86dMerge pull request #637 in SHRINE/shrine from bugfix/SHRINE-3576-survive-java.nio.channels.closedchannelexception to ...
Ben CBen C
fa5b35ace11call remote service for ontology for now
dwalenddwalend
e2904d242dbGo ahead and store an error asking about a QUEUED query as an error for SHRINE-3327
Ben CBen C
30ebf961c70fixed failing test
Ben CBen C
673c487c752updated help guide
dwalenddwalend
ced1cf551aaHandle ClosedChannelException observed at UCSD behind the proxy for SHRINE-3576
Ben CBen C
b9233db5b76removed &nbsp; and replaced it with apropriate padding and margin css.
Ben CBen C
440fd59cc63set NODE_PATH to simplify imports
Ben CBen C
8d3dac68a25SHRINE2020-16 Allow a user to create an inlcusion / exclusion criteria with one or more concepts.
marc-daniemarc-danie
63fa07c43e9SHRINE-3571 - Error parsing Breakdowns which contain < in the value - removed replacing &lt; with < and no longer cal...
marc-daniemarc-danie
1e1240177f9SHRINE2020-29 - Setup stub Ontology service
Matthew DiLoretoMatthew DiLoreto
3648867e903Merge pull request #631 in SHRINE/shrine from bugfix/SHRINE-1862-upgrade-scalatest to develop * commit '18ed6a741f3a...
Matthew DiLoretoMatthew DiLoreto
67bcc701f2dMerge pull request #625 in SHRINE/shrine from bugfix/SHRINE-3530-add-unit-tests-for-reading-in to develop * commit '...
Ben CBen C
f43dfa4019fupdated the help guide
Ben CBen C
1c3ad9950e0saving up dates to styles and structure.
Marc-Danie NazaireMarc-Danie Nazaire
685172201d3Merge pull request #633 in SHRINE/shrine from feature/SHRINE-3571-error-parsing-breakdowns-which to release/1.26.7 *...
marc-daniemarc-danie
430945ade90SHRINE-3571 - Error parsing Breakdowns which contain < in the value
Ben CarmenBen Carmen
c5333a96e94Merge pull request #632 in SHRINE/shrine from bugfix/SHRINE-3529-fixed-with-paging to release/1.26.7 merge of paging...
Ben CBen C
13eb6221015updated unit tests to reflect limit of 34
dwalenddwalend
8db3aa48750Merged from release/1.26.7
Ben CBen C
fd1203d1ce7Set the limit to 34 results in order to avoid scrollbar.
mjdiloretomjdiloreto
4f55fc0235drefactored protocol JSON tests to not inherit a base test.
dwalenddwalend
744b13e135eMerge branch 'release/1.26.7' into develop
dwalenddwalend
58daebe2047Before merging
Ben CBen C
20515c5a4baclean up of styles
Ben CBen C
6ab5a39a685Potential Solution for paging through query history
Ben CBen C
ff7aa540241accidentally checked in config
Ben CBen C
d869007b2c2Make sure new paging controls fit
Ben CBen C
f23b1e0557esaving work
Ben CBen C
d8162e32196saving work
Ben CBen C
4f6d0586f6bsaving what I have.
Ben CBen C
66b113e3bd4saving work
Ben CBen C
590eb9d4224saving work
Marc-Danie NazaireMarc-Danie Nazaire
a94754865e2Merge pull request #630 in SHRINE/shrine from feature/SHRINE-3518-index-date-created-for-previousqueries to develop ...
marc-daniemarc-danie
1d20c095954SHRINE-3518 - Index date created for previousQueries
mjdiloretomjdiloreto
18ed6a741f3removed references to all deprecated scalatest traits, and import the equivalent
mjdiloretomjdiloreto
00670e8caf6moved flatten plugin to proper place. update .gitignore to ignore flattened poms
mjdiloretomjdiloreto
d8e21b696e0trying to NOT use Resource
Marc-Danie NazaireMarc-Danie Nazaire
4410abf0cc5Merge pull request #629 in SHRINE/shrine from feature/SHRINE-3570-add-api-call-to-get-status-of to release/1.26.7 * ...
marc-daniemarc-danie
f64b68b6adeSHRINE-3570 - Add api call to get status of a subset of queries
mjdiloretomjdiloreto
af5efe69e58upgraded scalatest version. No fixes to tests needed upgrading to 3.0.8
mjdiloretomjdiloreto
fb2b3457d5bremoved redundant child pom version tags. Minor formatting fix
mjdiloretomjdiloreto
aa91fe578dcchanged revision to reflect old revision
mjdiloretomjdiloreto
641b1c10e30removed weird second SNAPSHOT from pom
mjdiloretomjdiloreto
a0924c254daadded pom flattening to all projects and removed all hardcoded 2.1.0-M1-SNAPSHOT instances
mjdiloretomjdiloreto
700c9e04753fixed method names in protocol json tests
Marc-Danie NazaireMarc-Danie Nazaire
e3c4dd5879dMerge pull request #624 in SHRINE/shrine from feature/SHRINE-3565-modify-messagequeuewebclien-to to release/1.26.7 *...
Ben CBen C
df84e5e69beminor tweak of reduer.
mjdiloretomjdiloreto
3051b7b7edfCreated tests for all v1 protocol case classes, ensuring conversion between objects and JSON and vice versa.
marc-daniemarc-danie
490d235a6f7SHRINE-3565- Modify MessageQueueWebClient to retry after java.util.concurrent.TimeoutException
Ben CarmenBen Carmen
c40325d6372Merge pull request #622 in SHRINE/shrine from bugfix/SHRINE-3548-fix-infinite-scroll to release/1.26.7 * commit '9ef...
Ben CarmenBen Carmen
57222aebd87Merge pull request #623 in SHRINE/shrine from bugfix/safari-crash to release/1.26.7 * commit '3aaac3f0b70f41cd73a37c...
Ben CBen C
3aaac3f0b70Make sure the style element on queryTimeingButton exists before accessing it.
Ben CBen C
9ef23dd4a1dFix of failing snapshot test
Ben CBen C
f6e66dd035aSaving work.
dwalenddwalend
7868c1f7aadChanging pom.xml versions back after the merge
dwalenddwalend
18b84dac5a9Merged from release/1.26.7
dwalenddwalend
4b2819c5648Setting up an easy merge from release/1.26.7
Matthew DiLoretoMatthew DiLoreto
b9d5afcc794Merge pull request #619 in SHRINE/shrine from bugfix/SHRINE-3484-unanticipated-error-when-the to develop * commit 'c...
Ben CBen C
ef9d3c53a36Breaking apart demo code into components (unit tests and prop types to come)
David WalendDavid Walend
f6185d1b628Merge pull request #621 in SHRINE/shrine from bugfix/SHRINE-3534-webclient-audit-emails-are-not to release/1.26.7 * ...
dwalenddwalend
7bde47ce66cMerge remote-tracking branch 'origin/release/1.26.7' into bugfix/SHRINE-3534-webclient-audit-emails-are-not
dwalenddwalend
9ed0899eeb5Restored emailing audit requests to the data steward for SHRINE-3534
David WalendDavid Walend
f6aeb58b7a1Merge pull request #620 in SHRINE/shrine from bugfix/SHRINE-3535-oracle-sql-exception-from-optimized to release/1.26....
dwalenddwalend
76b2abfa534Oracle can't deal with a DISTINCT on a table with CLOBS but selecting non-CLOB columbs works around its fussiness thi...
mjdiloretomjdiloreto
cafd7adf67dChanged node names to node keys in error message and rename to NoAdapterRunQueriesProblem
mjdiloretomjdiloreto
068e333bdcfAdded list of configured nodes to error message
mjdiloretomjdiloreto
491a7a131c5Changed error message to include the list of configured nodes.
Ben CBen C
94b3b0f0571Fix of Firefox drag and drop about:blank issue
Ben CBen C
77a6924a7c0Fix of bad merge
Ben CBen C
28705be309bmerge of branch query-builder-2020
Ben CBen C
5c058f56ef4Fix of failing unit test.
Ben CarmenBen Carmen
309ab6d8e89Merge pull request #617 in SHRINE/shrine from bugfix/SHRINE-3529-limit-previous-queries-request to release/1.26.7 * ...
Ben CBen C
2e72efd9c95change to scrollTop check at 1 instead of 0, so that refresh of history doesn't automatically trigger it.
mjdiloretomjdiloreto
92cf35340a0Added a new Problem to describe when no adapter nodes were configured to run a query.
Ben CBen C
43de59a3b4ePotential fix or SHRINE-3529
Ben CBen C
a31580ea16cSaving potential fix
Ben CBen C
00711370f38saving work
Matthew DiLoretoMatthew DiLoreto
ba69cc28c1eMerge pull request #616 in SHRINE/shrine from feature/SHRINE-3419-selectthenetworkio-call-should to develop * commit...
Next →