SHRINE
  1. SHRINE

shrine

Public
  1. SHRINE
  2. shrine

All Branches Graph  

        
AuthorCommitMessageCommit dateBuilds
dwalenddwalend
3b0c27ee136Added default properties for the web client. SHRINE-3342
Ben CBen C
18c5564a431Refactor and tweak of bar spacing.
Ben CBen C
63e32ac8bb7Functioning Breakdowns
dwalenddwalend
44b075899cfMerge remote-tracking branch 'origin/develop' into bugfix/SHRINE-3384-admin-dashboard-problem-log-the
dwalenddwalend
6b4f625781fPartial removal of downstream nodes for SHRINE-3384
David WalendDavid Walend
bdaf4cc7aefMerge pull request #505 in SHRINE/shrine from feature/SHRINE-3357-create-a-specialized-execution to develop * commit...
David WalendDavid Walend
45ea5f93bcfMerge pull request #506 in SHRINE/shrine from feature/SHRINE-3010-ship-with-latest-http4s-milestone to develop * com...
dwalenddwalend
b6726478024Upgraded to a real release of http4s! (and fixed some dependency purgatory) for SHRINE-3010
marc-daniemarc-danie
d3756148b2dMerge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE-2900-connect-the-n...
David WalendDavid Walend
317f0c383ecMerge pull request #504 in SHRINE/shrine from feature/SHRINE-3366-search-and-clear-up-all-uses to develop * commit '...
dwalenddwalend
1d482ecdd46Removed and replaced a lot of global context, and added a long-running-work context for SHRINE-3357
dwalenddwalend
2ba18f456beMerge remote-tracking branch 'origin/develop' into feature/SHRINE-3366-search-and-clear-up-all-uses
dwalenddwalend
1eb93dab8a4Cleared out some warnings and stray bits while going through SHRINE-3366
dwalenddwalend
318ef12953dCleared out some unsafeRunSync()s from inside AbstractQepService for SHRINE-3366
David WalendDavid Walend
280acd372deMerge pull request #503 in SHRINE/shrine from feature/SHRINE-3340-ponder-is-hub_will_submit-an to develop * commit '...
David WalendDavid Walend
d4ce66ed684Merge pull request #502 in SHRINE/shrine from feature/SHRINE-3356-create-a-specialized-execution to develop * commit...
dwalenddwalend
026eb1e5e4aBroader error handling for SHRINE-3340
dwalenddwalend
c66694ca918Remaning attempts available to the dispatcher for SHRINE-3340
dwalenddwalend
78ce0489399HUB_WILL_SUBMIT is an error state - no need to check for new results ever. SHRINE-3340
dwalenddwalend
dbe852d72c9Added a jersey client execution context to isolate calls the old code makes to i2b2 services for SHRINE-3356
Ben CBen C
7615babde41Cleaned up Unit Tests.
Ben CBen C
e39e56fd69eDisplaying Results now.
Ben CBen C
cfdfeef95fbCleanup up styles (still some work to do)
Marc-Danie NazaireMarc-Danie Nazaire
e7e09df71c3Merge pull request #500 in SHRINE/shrine from bugfix/SHRINE-3370-connectivity-test-scheduler-should to develop * com...
Marc-Danie NazaireMarc-Danie Nazaire
8abc4f7cdecMerge pull request #501 in SHRINE/shrine from feature/SHRINE-2862-update-servlet-api-version-in to develop * commit ...
Ben CBen C
555eabfc6e8added selected query.
marc-daniemarc-danie
2cafe41368bSHRINE-2862 - Update servlet-api-version in pom from 3.0.1 to latest version
Ben CBen C
2127257f0b8latest and greatest.
marc-daniemarc-danie
72b08b2c59bSHRINE-3370 - Connectivity test scheduler should fail with better error when the query Id is missing.
marc-daniemarc-danie
7c346b20829SHRINE-2900 - Connect the network health emailer to the connectivity test- sends email when there are errors
marc-daniemarc-danie
5186b33af1fSHRINE-2900 - Connect the network health emailer to the connectivity test- fixed typo in email template
Ben CBen C
350fd9ea332merge of 1.26.6.3
Ben CBen C
2cfedd8c20ccss overflow settings.
Ben CBen C
e88ecb98098Refactored components
Marc-Danie NazaireMarc-Danie Nazaire
d9688d867d2Merge pull request #498 in SHRINE/shrine from bugfix/SHRINE-3372-be-able-to-handle-exception-seen to develop * commi...
marc-daniemarc-danie
fb753b499f6fixed broken test after merge
marc-daniemarc-danie
6e14d81de17Merge branch 'release/1.26.6' of https://open.med.harvard.edu/stash/scm/shrine/shrine into develop # Conflicts: # ad...
Ben CarmenBen Carmen
1b2aeb271e0Merge pull request #490 in SHRINE/shrine from bugfix/SHRINE-3367-add-config-to-setup to release/1.26.6 * commit '377...
Ben CBen C
3721798fb0asaving work
Marc-Danie NazaireMarc-Danie Nazaire
48a54f552c6Merge pull request #499 in SHRINE/shrine from feature/SHRINE-3355-create-a-specialized-execution to develop * commit...
marc-daniemarc-danie
c9c786e4442SHRINE-3355 create a specialized execution - added missing import
Marc-Danie NazaireMarc-Danie Nazaire
8d20793e886Merge pull request #497 in SHRINE/shrine from feature/SHRINE-3355-create-a-specialized-execution to develop * commit...
marc-daniemarc-danie
cbcc192036aMerge branches 'develop' and 'feature/SHRINE-3355-create-a-specialized-execution' of https://open.med.harvard.edu/sta...
Ben CBen C
9520519cdb2saving work on branch
Ben CBen C
de756a21770Saving progress
David WalendDavid Walend
867104320d3Some better exceptions fo SHRINE-3372
David WalendDavid Walend
5c1ddf95285Merge pull request #495 in SHRINE/shrine from feature/SHRINE-3354-create-a-specialized-execution to develop * commit...
David WalendDavid Walend
cf1dad528d1Merge pull request #494 in SHRINE/shrine from feature/SHRINE-3353-create-a-specialized-execution to develop * commit...
Marc-Danie NazaireMarc-Danie Nazaire
bb7bec55d6cMerge pull request #493 in SHRINE/shrine from bugfix/SHRINE-3331-results_observed-table-odd-bits to develop * commit...
Marc-Danie NazaireMarc-Danie Nazaire
95fa443baf2Merge pull request #496 in SHRINE/shrine from bugfix/SHRINE-3325-add-the-observed-flag-to-the to release/1.26.6 * co...
Ben CBen C
377e344a146Removed urlCellPM from config service and shrine.conf files.
David WalendDavid Walend
ed20e943aa6Updated pom.xml files to 1.26.6.3-SNAPSHOT
Ben CBen C
7d6ad591ba6Merge branch 'release/1.26.6' into bugfix/SHRINE-3367-add-config-to-setup
Ben CBen C
b25c63ac876saving ui work
Ben CBen C
a960c576d4eSending 404s as default error.
Ben CBen C
229e0cf6f1dMerge of Bill's changes with conflict.
Ben CBen C
2653eb2c23dMerge branch '2.0-webclient' of https://open.med.harvard.edu/stash/scm/shrine/shrine into 2.0-webclient
Ben CBen C
1c26d05afd6Added redux and connected Researcher Component
Bill SimonsBill Simons
b3e7976b115Update dependencies for acorn and node-gyp to resolve build vulnerabilities - note that the actual version of node-gy...
dwalenddwalend
dd66dd8ab58Merging from release/1.26.6
Ben CBen C
b08acbcc625use dev
Ben CBen C
8052fa4f314fixed test.
Ben CBen C
f4b46aaf7a6fetch is working
dwalenddwalend
b3541af371aMerge remote-tracking branch 'origin/develop' into feature/SHRINE-3355-create-a-specialized-execution
dwalenddwalend
5123f0568f4Added an execution context for http clients for SHRINE-3355
David WalendDavid Walend
e172d5ce592Merge pull request #492 in SHRINE/shrine from bugfix/SHRINE-3328-when-reporting-querystatuses.readyforadapters to dev...
marc-daniemarc-danie
f4bc4aa172dMerge branch 'release/1.26.6' of https://open.med.harvard.edu/stash/scm/shrine/shrine into bugfix/SHRINE-3325-add-the...
marc-daniemarc-danie
a91ddfb9330SHRINE-3325 - Add the observed flag to the allQueries section of the JSON response for previous queries - replaced th...
dwalenddwalend
a643828f3fcAdded execution context for the QEP's database work for SHRINE-3354
Ben CBen C
c9b91235897Added infrastructure for redux.
dwalenddwalend
7b3d945ada6Merge branch 'develop' into feature/SHRINE-3353-create-a-specialized-execution
marc-daniemarc-danie
3148360c83aSHRINE-3325 - Add the observed flag to the allQueries section of the JSON response for previous queries - code cleanup
David WalendDavid Walend
a7e2e185c04Created a specialized execution context for http4s for SHRINE-3353
Marc-Danie NazaireMarc-Danie Nazaire
771ae56f5d8Merge pull request #475 in SHRINE/shrine from bugfix/SHRINE-3344-replace-blocking-unsaferunsync to release/1.26.6 * ...
marc-daniemarc-danie
a1ce9aec728SHRINE-3344 - Replace blocking unsafeRunSync calls in QepService.scala with proper IOs - Removed unneeded imports and...
David WalendDavid Walend
d155b09b7f3Merge remote-tracking branch 'origin/develop' into bugfix/SHRINE-3328-when-reporting-querystatuses.readyforadapters
David WalendDavid Walend
3fc8554b0b0Merge pull request #483 in SHRINE/shrine from feature/SHRINE-3351-create-a-general-purpose-execution to develop * co...
marc-daniemarc-danie
6eb7cfae3aaSHRINE-3331 - RESULTS_OBSERVED table odd bits
David WalendDavid Walend
81ece22f498Merge remote-tracking branch 'origin/develop' into feature/SHRINE-3351-create-a-general-purpose-execution
David WalendDavid Walend
e7cb64f443eMade CRC communications daemonic for SHRINE-3352
David WalendDavid Walend
1d47135f1deUsing IO.start for CRC calls for SHRINE-3352
Ben CarmenBen Carmen
f889ca41581Merge pull request #491 in SHRINE/shrine from bugfix/SHRINE-3206-configure-flagging-placeholder-text to release/1.26....
Ben CBen C
70827cf3f60Hard coded urlCellPM
Ben CBen C
c18d1a9c3edAdded models to project.
David WalendDavid Walend
d6a1d682d02Removed blocking around CRC calls for SHRINE-3352
David WalendDavid Walend
e9ab5d14da1Swithced to evalOn() for SHRINE-3351
marc-daniemarc-danie
69071a1e279SHRINE-3325 - Add the observed flag to the allQueries section of the JSON response for previous queries
David WalendDavid Walend
7a202da563bSome clean-up for SHRINE-3328
David WalendDavid Walend
2c61e5d9c0fSome clean-up for SHRINE-3328
David WalendDavid Walend
6c17d2e311bAdded the update-query-and-results-at-the-same-time command from the hub to the QEP for SHRINE-3328
Ben CBen C
0340f6d4744Merge branch 'develop' into 2.0-webclient
Ben CBen C
aeafcf4ae1bAdded suggested default e-mail address to configurations
David WalendDavid Walend
6a63d0315c7Database and API call cleanup for SHRINE-3328
marc-daniemarc-danie
0f4eacecfdaSHRINE-3344 - Replace blocking unsafeRunSync calls in QepService.scala with proper IOs - Modified selectPreviousQueri...
Ben CBen C
1156810aaacUpdated dev service to use query params
Ben CBen C
83df97746fdAdded the ability to configure the placeholder text from shrine.conf.
dwalenddwalend
10283009287More use of UpdateQueryAtQepWith something for SHRINE-3328
Ben CBen C
ecd6d15aef1Added webclient configuration to shrine setup
dwalenddwalend
e91fa4cf9f8Removed the researcher for SHRINE-3328
dwalenddwalend
062dc5d7858Pulling things appart for SHRINE-3328
Ben CarmenBen Carmen
f8cbad7f7f2Merge pull request #486 in SHRINE/shrine from bugfix/SHRINE-3364-fix-button-nm to release/1.26.6 * commit 'fcee529af...
Ben CarmenBen Carmen
a7bde7c0363Merge pull request #487 in SHRINE/shrine from bugfix/SHRINE-3338-max-ontology-children to release/1.26.6 * commit 'd...
Ben CarmenBen Carmen
354b571660aMerge pull request #488 in SHRINE/shrine from bugfix/SHRINE-3363-allow-unflag-query to release/1.26.6 * commit 'fbe7...
Ben CarmenBen Carmen
2a2d7b8eac5Merge pull request #489 in SHRINE/shrine from bugfix/SHRINE-3349-hide-content-when-loading to release/1.26.6 * commi...
Ben CBen C
5478105335cHide the query builder content until it's resize has been calculated.
Ben CBen C
fbe70832924Allow user to unflag a query if there is no flag message text.
Ben CBen C
d2c31ad9308Fix of default number of Ontology Children
Ben CBen C
fcee529af32Fix of query run text to 'Run Query'
David WalendDavid Walend
c7f09e7ad2eI'd rather use a fork-join pool for the CRC for SHRINE-3352
David WalendDavid Walend
15edded57eaI'd rather use a fork-join pool for the CRC for SHRINE-3352
Ben CarmenBen Carmen
b64cb9db6c6Merge pull request #482 in SHRINE/shrine from bugfix/SHRINE-3203-add-expand-collapse-icons to release/1.26.6 * commi...
Ben CarmenBen Carmen
69d931e1016Merge pull request #481 in SHRINE/shrine from Fix-Of-Unable-to-Delete-Query-Term to release/1.26.6 * commit '99dc836...
dwalenddwalend
58edd2eab0bTurning query updates into commands to update the query for SHRINE-3328
David WalendDavid Walend
521feaefebfMerge pull request #478 in SHRINE/shrine from feature/SHRINE-3346-upgrade-to-the-latest-http4s to develop * commit '...
dwalenddwalend
4cb8ff5194bConfig properties for crcClientThreadPoolSize for SHRINE-3352
dwalenddwalend
9d2b994ae49Rearranged things for SHRINE-3351 and did a first pass at SHRINE-3352 - using the new fixed thread pool for the CRC
Ben CarmenBen Carmen
dad414c1938Merge pull request #480 in SHRINE/shrine from bugfix/SHRINE-3348-truncated-breakdown-text to release/1.26.6 * commit...
dwalenddwalend
1e0829c0469Merge remote-tracking branch 'origin/develop' into feature/SHRINE-3351-create-a-general-purpose-execution
dwalenddwalend
354f1199889Able to make a fixed thread pool for SHRINE-3351
Ben CBen C
0f102f0f640Added missing merge back in.
Ben CBen C
da1607ff839changed from padding-right to margin-right.
Ben CBen C
99dc836bdc2Removed premature history refresh.
marc-daniemarc-danie
44b6edd7d10SHRINE-3344 - Replace blocking unsafeRunSync calls in QepService.scala with proper IOs - Change UUID to Long and refa...
Ben CBen C
554d73697eaUpdated the readme
marc-daniemarc-danie
57f69d8825cSHRINE-3344 - Replace blocking unsafeRunSync calls in QepService.scala with proper IOs - fixed broken test
marc-daniemarc-danie
08d90a5a9c0SHRINE-3344 - Replace blocking unsafeRunSync calls in QepService.scala with proper IOs - replace for comprehension wi...
marc-daniemarc-danie
d9db894abfaSHRINE-3344 - Replace blocking unsafeRunSync calls in QepService.scala with proper IOs - moved the code related to cr...
Ben CarmenBen Carmen
4b845a81795Merge pull request #479 in SHRINE/shrine from bugfix/SHRINE-3298-postback-on-rename-query-cancel to release/1.26.6 *...
Ben CBen C
84091418ce0Fix of breakdown text getting cut off.
David WalendDavid Walend
c1bdfbfeb45Changes to npm tests for the merge
David WalendDavid Walend
709a26c69deBumped pom.xml files as part of the merge from release/1.26.6
Ben CBen C
7d3bc349d1cPrevent default instead of stopPropagation prevents the browser postback behavior.
Ben CBen C
7381e493eb7edit
Ben CBen C
8738b0868b1edit of readme
Ben CBen C
16b1aceae3bupdated readme
Ben CBen C
ac4503f43a8edited readme
Ben CarmenBen Carmen
31ce95ccbfcMerge pull request #476 in SHRINE/shrine from bugfix/SHRINE-3270-fix-missing-flagged-message to release/1.26.6 * com...
Ben CarmenBen Carmen
f811bc212e3Merge pull request #477 in SHRINE/shrine from bugfix/SHRINE-3347-fix-highlighting to release/1.26.6 * commit '8ae1ab...
Ben CBen C
682b7142439added readme, tweaked scripts and linter
David WalendDavid Walend
7da4290e2afUpdated http4s to the latest (M7) for SHRINE-3346
marc-daniemarc-danie
bb8478506c1SHRINE-3344 - Replace blocking unsafeRunSync calls in QepService.scala with proper IOs - switched to using Log instea...
Ben CBen C
8ae1ab223e2possible fix of highlighting issue
marc-daniemarc-danie
023952c4e57SHRINE-3344 - Replace blocking unsafeRunSync calls in QepService.scala with proper IOs - removed commented out code
Ben CBen C
9f1aab79cd7message field is now flagMessage
Ben CBen C
7021c09fb22Fixed version numbers in POMs
marc-daniemarc-danie
20fd16afc51SHRINE-3344 - Replace blocking unsafeRunSync calls in QepService.scala with proper IOs - removed unused function
Ben CBen C
48c978ebc25Update of starter snapshot test
Ben CBen C
4714829ad03Updated shrine-api-war POM to execute against version 2 of the Webclient
marc-daniemarc-danie
26957843139Merge branch 'release/1.26.6' of https://open.med.harvard.edu/stash/scm/shrine/shrine into bugfix/SHRINE-3344-replace...
marc-daniemarc-danie
a0122a5035cSHRINE-3339 - Add missing result status HUB_WILL_SUBMIT - moved status to correct place
Ben CBen C
8923e83f4c6created local dev environment
David WalendDavid Walend
465be7303c9Updated pom.xml version to 1.26.6.2-SNAPSHOT
David WalendDavid Walend
b9f2f9046ecUpdated pom.xml versions to 1.26.7.1-SNAPSHOT
Ben CBen C
2464fdaab18Added transforms for testing with Jest.
Ben CBen C
41e43fc5d18pushing changes for production build
Ben CBen C
1974e573e3fMerge branch 'develop' into 2.0-webclient
David WalendDavid Walend
44adbf827a5Merge pull request #474 in SHRINE/shrine from bugfix/SHRINE-3345-lost-fork-join-pool-thread-envelope to develop * co...
David WalendDavid Walend
7f38618834eUnused import for SHRINE-3345
David WalendDavid Walend
2e0b8db0e57Added lots of blocking for SHRINE-3345
Ben CarmenBen Carmen
9342f66af66Merge pull request #473 in SHRINE/shrine from swap-long-polling2 to develop * commit 'd5cda38ecb474821e3ba0bcb0eb635...
bendcarmenbendcarmen
d5cda38ecb4swapped polling API
bendcarmenbendcarmen
1d83a63e476removal of test comment
bendcarmenbendcarmen
0b989b18a2eRevert "Swap of polling api call" This reverts commit fef0571ef0273226af5945490688495b8524b730.
bendcarmenbendcarmen
fef0571ef02Swap of polling api call
bendcarmenbendcarmen
bbf9b6caafcrefactor
bendcarmenbendcarmen
7998caaa9e6Merge branch 'develop' into 2.0-webclient-SNAPSHOT
bendcarmenbendcarmen
24344cb7408testing git mapping between 1.0 and 2.0
bendcarmenbendcarmen
beeac04ee17refactor
bendcarmenbendcarmen
1603a02bdc6refactor
bendcarmenbendcarmen
c012099a2c7changed deprecated to version1
bendcarmenbendcarmen
54ccb902acemoved deprecated items
bendcarmenbendcarmen
00da619b28cchanged directory name of 1.0 shrine-webclient from shrine-webclient to shrine-webclient-1.0
bendcarmenbendcarmen
71139385646Merge branch 'develop' into 2.0-webclient-SNAPSHOT
bendcarmenbendcarmen
7569dfbda0aChanged pom to 2.0-webclient-SNAPSHOT
David WalendDavid Walend
6de4fa95554Merge pull request #471 in SHRINE/shrine from bugfix/SHRINE-3343-hack-to-fix-the-thread-pool-leak to develop * commi...
dwalenddwalend
4a3a72c7ed9Hack to fix a thread pool leak in SHRINE-3343
Ben CarmenBen Carmen
1333fb67d9dMerge pull request #469 in SHRINE/shrine from feature/SHRINE-3338-set-default-number to develop * commit '8a2ceedf45...
David WalendDavid Walend
3c81cc7e10eMerge pull request #470 in SHRINE/shrine from bugfix/SHRINE-3341-long-poll-not-being-triggered to develop * commit '...
bendcarmenbendcarmen
8a2ceedf458Added the defaultNumberOfOntologyChildren to the static service.
David WalendDavid Walend
9dc4b01c3a3Trailing todo cleanup
David WalendDavid Walend
30ebaef8b8eAdded calls to the notification triggers for SHRINE-3341, which helps new results arrive in the UI
Marc-Danie NazaireMarc-Danie Nazaire
8be0ffa6d5bMerge pull request #468 in SHRINE/shrine from bugfix/SHRINE-3339-add-missing-result-status-hub_will_submit to develop...
bendcarmenbendcarmen
4b741c60317Added 10000 as a default value for the Ontology children setting.
Ben CarmenBen Carmen
bf1d00743cdMerge pull request #467 in SHRINE/shrine from bugfix/SHRINE-3302-flickering-flag-unflag to develop * commit 'c5c5497...
marc-daniemarc-danie
6a7f2713522SHRINE-3339 - Add missing result status HUB_WILL_SUBMIT - moved status to correct place
marc-daniemarc-danie
158cdace6c4SHRINE-3339 - Add missing result status HUB_WILL_SUBMIT - added new status to statuses list
marc-daniemarc-danie
65a6a1ab9f5SHRINE-3339 - Add missing result status HUB_WILL_SUBMIT - minor edit
marc-daniemarc-danie
85e8ad1b7c6SHRINE-3339 - Add missing result status HUB_WILL_SUBMIT