SHRINE
  1. SHRINE

shrine

Public
  1. SHRINE
  2. shrine

All Branches Graph  

        
AuthorCommitMessageCommit dateBuilds
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
bendcarmenbendcarmen
c5c54974c1fFix for flickering of flagging and query name pencil icons when loading.
Ben CarmenBen Carmen
27caaa1dc66Merge pull request #466 in SHRINE/shrine from bugfix/SHRINE-3275-problem-summary to develop * commit 'f136925915898a...
bendcarmenbendcarmen
f1369259158Fix of broken unit tests.
David WalendDavid Walend
65d97dbedccMerge pull request #465 in SHRINE/shrine from bugfix/SHRINE-3332-on-shrine-qa2-query-6284097453461604792 to develop ...
David WalendDavid Walend
5ed357d8c2dMerge pull request #464 in SHRINE/shrine from bugfix/SHRINE-3333-on-shrine-qa3-8929854896815858575 to develop * comm...
David WalendDavid Walend
5d756edc405Merge pull request #463 in SHRINE/shrine from feature/SHRINE-3336-try-an-isolated-scale-up-test to develop * commit ...
bendcarmenbendcarmen
9deea2ee6daUse the summary and description text of the problem digest.
David WalendDavid Walend
0827631d412Smoothing out some extra calls to the CRC for SHRINE-3332, and making sure the CRC always gets asked about QUEUED que...
Marc-Danie NazaireMarc-Danie Nazaire
d1ec18253feMerge pull request #433 in SHRINE/shrine from feature/SHRINE-3305-remove-the-shrine-proxy-project to develop * commi...
David WalendDavid Walend
d4aa0839facHandling some unrecorded errors for QUEUED queries for SHRINE-3333
David WalendDavid Walend
5efa74d07d5Some testing jigs I made for SHRINE-3336 that I'd like to keep around
David WalendDavid Walend
45f4c0170b3Merge pull request #461 in SHRINE/shrine from bugfix/SHRINE-2926-check-for-xml-injection-in-shrine-s to develop * co...
David WalendDavid Walend
3da9407c994Merge pull request #460 in SHRINE/shrine from feature/SHRINE-3149-interpret-reinterpret-status to develop * commit '...
Ben CarmenBen Carmen
3c6b91f04fcMerge pull request #462 in SHRINE/shrine from feature/SHRINE-3174-bold-updated-queries to develop * commit '3696b05b...
Ben CarmenBen Carmen
2bb45aace1bMerge pull request #458 in SHRINE/shrine from feature/SHRINE-2929-bock-ie-access to develop * commit 'aba20b2e8e1bde...
bendcarmenbendcarmen
3696b05b903Bold updated queries per SHRINE-3174
bendcarmenbendcarmen
aba20b2e8e1Add edge to the restricted browser agents.
Ben CarmenBen Carmen
66536687507Merge pull request #459 in SHRINE/shrine from bugfix/SHRINE-3330-fix-problem-digest-parsing to develop * commit 'bf8...
David WalendDavid Walend
cba0bcc6cc2Got the build working with the new XML library for SHRINE-2926
David WalendDavid Walend
ffb5616beecLast pass for SHRINE-3149 . I also fixed SHRINE-3285 on the way
bendcarmenbendcarmen
bf88032820cFix of broken unit test.
bendcarmenbendcarmen
6181c5e95d8Fix of missing problemDigest for Query level status.
David WalendDavid Walend
20e3252f86aWrapping up SHRINE-1619 breakdown handling, and smoothing some error handling in MessageQueueWebClient.
bendcarmenbendcarmen
3090c0357e1Disallow access from an IE browser, notify the researcher to use another.
David WalendDavid Walend
fa47218de08Wrapping up SHRINE-3149
David WalendDavid Walend
d99b3180301Handled some errors in the hub for SHRINE-3149
dwalenddwalend
59f5015e964Merge remote-tracking branch 'origin/develop' into feature/SHRINE-3149-interpret-reinterpret-status
dwalenddwalend
1188b61bdbdUpdating a comment about a future ticket
Ben CarmenBen Carmen
b5798a45693Merge pull request #455 in SHRINE/shrine from bugfix/SHRINE-3317-apply-temporal-constraing-to-all-groups to develop ...
dwalenddwalend
5053d736eefAlmost done with the QueuedQueryPoller's error handling for SHRINE-3149
dwalenddwalend
c3d305f589dMerge remote-tracking branch 'origin/develop' into feature/SHRINE-3149-interpret-reinterpret-status
dwalenddwalend
98036c2425dRecord errors found with QUEUED queries as errors in the database when a query is crazy old for SHRINE-3149 and SHRIN...
dwalenddwalend
932d267d06aTomcat can reply with a 404 during start-up, so a 404 is OK to retry for SHRINE-3323
Marc-Danie NazaireMarc-Danie Nazaire
72fb95f35ccMerge pull request #457 in SHRINE/shrine from bugfix/SHRINE-3053-change-the-check-for-dsa-authorization to develop *...
marc-daniemarc-danie
865628cdb01SHRINE-3053 - Change the check for DSA authorization from hard-coded success to a database call - removed unused test...
Marc-Danie NazaireMarc-Danie Nazaire
5d607325d1dMerge pull request #456 in SHRINE/shrine from bugfix/SHRINE-3053-change-the-check-for-dsa-authorization to develop *...
marc-daniemarc-danie
3a788757bcfSHRINE-3053 - Change the check for DSA authorization from hard-coded success to a database call - added shrine.conf f...
Marc-Danie NazaireMarc-Danie Nazaire
cfe7b98422fMerge pull request #454 in SHRINE/shrine from bugfix/SHRINE-3053-change-the-check-for-dsa-authorization to develop *...
marc-daniemarc-danie
326a997f6edSHRINE-3053 - Change the check for DSA authorization from hard-coded success to a database call - fixed the path to t...
marc-daniemarc-danie
641397bfd7cSHRINE-3053 - Change the check for DSA authorization from hard-coded success to a database call - moved the package.s...
marc-daniemarc-danie
8ad68e30db8SHRINE-3053 - Change the check for DSA authorization from hard-coded success to a database call - Added reference.con...
bendcarmenbendcarmen
c0f8fa6c69dMake sure that the timing for a panel is always in sync with what is selected by the temporal drop down stored in i2b...
Ben CarmenBen Carmen
f96b2ab56c3Merge pull request #452 in SHRINE/shrine from fix-breakdown-parsing to develop * commit 'a19dd7a4140596ea975e11709be...
bendcarmenbendcarmen
a19dd7a4140Added pre 1.26 error statuses.
bendcarmenbendcarmen
005d06c8b89xit of test until I figure out what's happening...allow build to proceed.
bendcarmenbendcarmen
2f56b4f3930fixed a failing snapshot test.
Ben CarmenBen Carmen
7fb25b396d0Merge pull request #453 in SHRINE/shrine from bugfix/SHRINE-3284-fix-email to develop * commit '8a5f5ef0894fe7034731...
bendcarmenbendcarmen
6820e90d140Change of Instution Result component to use internal status.
marc-daniemarc-danie
e975c0fe239SHRINE-3053 - Change the check for DSA authorization from hard-coded success to a database call - update config for test
marc-daniemarc-danie
0777c8d4579SHRINE-3053 - Change the check for DSA authorization from hard-coded success to a database call - added test to check...
marc-daniemarc-danie
ca8e173a4fbSHRINE-3053 - Change the check for DSA authorization from hard-coded success to a database call - removed unused pom ...
marc-daniemarc-danie
ab6b1729cfcSHRINE-3053 - Change the check for DSA authorization from hard-coded success to a database call - removed comment
marc-daniemarc-danie
e21f1199b38SHRINE-3053 - Change the check for DSA authorization from hard-coded success to a database call - removed unused rout...
bendcarmenbendcarmen
8a5f5ef0894Tweak of emailing instruction in error dialog
bendcarmenbendcarmen
99e81314bceremoved unused 'error' field from parse unit test.
bendcarmenbendcarmen
1ad0a75fcbeRemoved unused logic for 'error' element.
dwalenddwalend
bb9c49e1beaMerge remote-tracking branch 'origin/develop' into feature/SHRINE-3149-interpret-reinterpret-status
bendcarmenbendcarmen
cfe0873aa2bFix of unit tests
bendcarmenbendcarmen
735a0f3f791Use internalStatus
marc-daniemarc-danie
7fea9e22badSHRINE-3053 - Change the check for DSA authorization from hard-coded success to a database call - renamed readApprove...
bendcarmenbendcarmen
5a311d1e7b5Fix of breakdown parsing
marc-daniemarc-danie
931559d81e4Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine into bugfix/SHRINE-3053-change-the-che...
marc-daniemarc-danie
9470069b8a5SHRINE-3053 - Change the check for DSA authorization from hard-coded success to a database call - renamed StewardDbTe...
David WalendDavid Walend
1748f892121Merge pull request #451 in SHRINE/shrine from bugfix/SHRINE-3320-shrine-results-do-not-travel to develop * commit '1...
David WalendDavid Walend
15d57c68473Ahem. That should be not-before. For SHRINE-3320
David WalendDavid Walend
c04bbd6efceChecking in an intermediate step for SHRINE-3149
marc-daniemarc-danie
8ce71a6b39eSHRINE-3053 - Change the check for DSA authorization from hard-coded success to a database call - moved StewardDataba...
marc-daniemarc-danie
26e605644c6SHRINE-3053 - Change the check for DSA authorization from hard-coded success to a database call - moved CreateTopicsM...
marc-daniemarc-danie
9972a2643bbSHRINE-3053 - Change the check for DSA authorization from hard-coded success to a database call - moved Model.scala t...
marc-daniemarc-danie
4cc3e3c4ad2SHRINE-3053 - Change the check for DSA authorization from hard-coded success to a database call - moved the steward s...
Ben CarmenBen Carmen
76bfb8a4c01Merge pull request #448 in SHRINE/shrine from use-afterVersion to develop * commit 'eb8b43bb7bd307d2f22c6e21317e5d36...
David WalendDavid Walend
22bee4abb3cMerge pull request #449 in SHRINE/shrine from feature/SHRINE-3005-handle-errors-in-io-based-web to develop * commit ...
Ben CarmenBen Carmen
b1fcd12b343Merge pull request #450 in SHRINE/shrine from feature/SHRINE-2927-swap-xml-parser to develop * commit '60eafe18a93b6...
David WalendDavid Walend
7461a5b753fInterpret i2b2 query states for SHRINE-3149
bendcarmenbendcarmen
60eafe18a93removed unused var
bendcarmenbendcarmen
6f0f897dcbcDisallow IE xml parser.
David WalendDavid Walend
c8d3d735660Merge pull request #445 in SHRINE/shrine from feature/SHRINE-3148-when-the-crc-queues-a-query-start to develop * com...
David WalendDavid Walend
1217b19326bMerge branch 'develop' into feature/SHRINE-3005-handle-errors-in-io-based-web
dwalenddwalend
671675a1a3dBetter error handling for MessageQueueWebClient for SHRINE-3005
Ben CarmenBen Carmen
dc165cb7d91Merge pull request #446 in SHRINE/shrine from improvement/SHRINE-3304-remove-old-webclient to develop * commit '1191...
David WalendDavid Walend
d896186a949Merge pull request #447 in SHRINE/shrine from bugfix/SHRINE-3309-crcresult-cannot-be-cast-to-resultprogress to develo...
bendcarmenbendcarmen
eb8b43bb7bdadded dataVersion/afterVersion to the fetch requests and query state.
Marc-Danie NazaireMarc-Danie Nazaire
26e6dbd4c1cMerge pull request #444 in SHRINE/shrine from bugfix/SHRINE-3315-fix-json-encoding-of-querycellstatus to develop * c...
dwalenddwalend
7023b50060cMerge remote-tracking branch 'origin/bugfix/SHRINE-3315-fix-json-encoding-of-querycellstatus' into feature/SHRINE-314...
bendcarmenbendcarmen
1191cd17a21Removed shrine-webclient directory
marc-daniemarc-danie
b15d5595b25Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine into bugfix/SHRINE-3315-fix-json-encod...
dwalenddwalend
1a68c3d45f9Handled out-of-order results for SHRINE-3309
dwalenddwalend
d99322b4427Renaming problem after putting it in the wiki for SHRINE-3148
dwalenddwalend
08d15aaf179One last thing...
dwalenddwalend
d95f077660dMerge remote-tracking branch 'origin/develop' into feature/SHRINE-3148-when-the-crc-queues-a-query-start
dwalenddwalend
c57299c9659Todo sweep for SHRINE-3148
dwalenddwalend
18045714569Fixing the config missalignment from yesterday for SHRINE-3148
Ben CarmenBen Carmen
e38ca3a0e08Merge pull request #443 in SHRINE/shrine from Unflag-Query-part-2 to develop * commit '2fe7fdbfd1b7e23cfaf8916ee6020...