SHRINE
  1. SHRINE

shrine

Public
  1. SHRINE
  2. shrine

All Branches Graph  

        
AuthorCommitMessageCommit dateBuilds
Ben CBen C
3b0104f7903Fix of i2b2 xml and client miscommunication
Marc-Danie NazaireMarc-Danie Nazaire
4318e66936bMerge pull request #527 in SHRINE/shrine from feature/SHRINE-3395-find-a-better-way-to-store-the to release/1.26.7 *...
Ben CBen C
d8992bff020Saving work
David WalendDavid Walend
46ea67e03e8Merge pull request #525 in SHRINE/shrine from feature/SHRINE-3188-move-the-remaining-dashboardservice to release/1.26...
marc-daniemarc-danie
92f660bff3eSHRINE-3395 - Find a better way to store the network health connectivity test results - changed any return type to Unit
dwalenddwalend
bed63f7bf12Marc-Danie's review comments for SHRINE-3188
dwalenddwalend
1663e93b036Merge remote-tracking branch 'origin/release/1.26.7' into feature/SHRINE-3188-move-the-remaining-dashboardservice
dwalenddwalend
6cdca576da6Revert "Merge remote-tracking branch 'origin/develop' into feature/SHRINE-3409-sign-and-verify-signatures-on" This r...
dwalenddwalend
f8602138c68Merge remote-tracking branch 'origin/develop' into feature/SHRINE-3409-sign-and-verify-signatures-on
dwalenddwalend
1a6c248123fMore todo sweep for SHRINE-3409
dwalenddwalend
4c2dec356a0todo sweep for 3409
dwalenddwalend
50519015b73Merging
dwalenddwalend
78ad8f06930Added more stuff to the signature for SHRINE-3409
dwalenddwalend
aa65e3bf853Added some solid error handling for SHRINE-3409
marc-daniemarc-danie
26745c1396aSHRINE-3395 - Find a better way to store the network health connectivity test results - added test for inserting into...
marc-daniemarc-danie
4104d5a1404SHRINE-3395 - Find a better way to store the network health connectivity test results - fixed failing test
dwalenddwalend
ff520b6a82eChecking signatures for SHRINE-3409
marc-daniemarc-danie
d4706eb5bc3SHRINE-3395 - Find a better way to store the network health connectivity test results
dwalenddwalend
60625e81f66Signing the queryXML for SHRINE-3409
Marc-Danie NazaireMarc-Danie Nazaire
dd3c22b5890Merge pull request #526 in SHRINE/shrine from feature/SHRINE-3392-as-a-hub-sys-admin-i-should-be to release/1.26.7 *...
dwalenddwalend
96e3ee6c715Added a spot for a signature in the Query class for SHRINE-3409
marc-daniemarc-danie
e45f6d6ccaeSHRINE-3392 - As a HUB Sys Admin, I should be cc-ed on outgoing email notifications in the event that a node fails th...
marc-daniemarc-danie
e0fd690dc04SHRINE-3392 - As a HUB Sys Admin, I should be cc-ed on outgoing email notifications in the event that a node fails th...
marc-daniemarc-danie
d43c085ea16SHRINE-3392 - As a HUB Sys Admin, I should be cc-ed on outgoing email notifications in the event that a node fails th...
dwalenddwalend
f8f9d81162bRearranging the deck chairs for SHRINE-3409
marc-daniemarc-danie
1636a9a60d1Merge branch 'release/1.26.7' of https://open.med.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE-3194-move-t...
marc-daniemarc-danie
547e09abbe5SHRINE-3194 - Move the steward app into shrine-api - removed comment
Marc-Danie NazaireMarc-Danie Nazaire
2717b8e8c74Merge pull request #523 in SHRINE/shrine from feature/SHRINE-3182-port-the-dsa-app-requestlogroute to release/1.26.7 ...
dwalenddwalend
d73bb069859Cleanup at the end of SHRINE-3188
dwalenddwalend
028e75716f0Restored the hub section for SHRINE-3188
marc-daniemarc-danie
d34fa59cbebSHRINE-3194 - Move the steward app into shrine-api - Fixed the URL to request new a topic in the shrine-webclient
marc-daniemarc-danie
14f5cd83d95SHRINE-3194 - Move the steward app into shrine-api - Cleaned up imports
marc-daniemarc-danie
33bb597e9e3SHRINE-3194 - Move the steward app into shrine-api - Removed more unused files and some minor code fixes
marc-daniemarc-danie
62b7b20caa9SHRINE-3194 - Move the steward app into shrine-api - Removed the steward-war module, spray dependencies in the Stewar...
dwalenddwalend
97bd6498549Added optionalParts to the dashboard server for SHRINE-3188
dwalenddwalend
5ff912ea2ecDashboard's i2b2 section for SHRINE-3188
dwalenddwalend
72e70487603Short-circuited the queryAdaptertest for SHRINE-3188
marc-daniemarc-danie
021ec39a131SHRINE-3194 - Move the steward app into shrine-api - Steward app is now calling the http4s Stewardservice and is loca...
dwalenddwalend
546b2b9a315General status is succeeding for SHRINE-3188
marc-daniemarc-danie
c666e6ca312Merge branch 'release/1.26.7' of https://open.med.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE-3182-port-t...
Marc-Danie NazaireMarc-Danie Nazaire
8d7504cf91fMerge pull request #522 in SHRINE/shrine from feature/SHRINE-3184-port-the-dsa-authenticated-routes to release/1.26.7...
marc-daniemarc-danie
4d0f27cef13SHRINE-3184 - Port the DSA app requestLogRoute to http4s - moved Authorizer back to net.shrine.api.steward.pmauth to ...
marc-daniemarc-danie
4562bd33d13Merge branches 'feature/SHRINE-3182-port-the-dsa-app-requestlogroute' and 'release/1.26.7' of https://open.med.harvar...
Marc-Danie NazaireMarc-Danie Nazaire
796086220eaMerge pull request #520 in SHRINE/shrine from feature/SHRINE-3184-port-the-dsa-authenticated-routes to release/1.26.7...
marc-daniemarc-danie
93ca7017b80Merge branch 'release/1.26.7' of https://open.med.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE-3184-port-t...
marc-daniemarc-danie
36c9b69839aSHRINE-3182 - Port the DSA app requestLogRoute to http4s - merged with SHRINE-3184 branch
marc-daniemarc-danie
245189e0f14SHRINE-3184 - Port the DSA app requestLogRoute to http4s - moved Authorizer to net.shrine.authorization
dwalenddwalend
4a4b1b9604aAdded whoami for SHRINE-3188
marc-daniemarc-danie
2312630d186SHRINE-3182 - Port the DSA app requestLogRoute to http4s - fixed unit test
marc-daniemarc-danie
d96a4501514SHRINE-3182 - Port the DSA app requestLogRoute to http4s - added about/createTopicsMode route and unit test
dwalenddwalend
649b678391bMerge commit '1b789732ec8' into feature/SHRINE-3188-move-the-remaining-dashboardservice
dwalenddwalend
1c8b83656ffTests for the adapter section for SHRINE-3188
marc-daniemarc-danie
b3a4991dc62SHRINE-3184 - Port the DSA app requestLogRoute to http4s - cleaned up the imports for the unit tests
dwalenddwalend
13faab7577eMerge branch 'release/1.26.7' into feature/SHRINE-3188-move-the-remaining-dashboardservice
dwalenddwalend
4f8c54ae909Changing develop to build 1.27.1.1-SNAPSHOT and letting it idle for a while
marc-daniemarc-danie
2341201482bSHRINE-3184 - Port the DSA authenticated routes to http4s - cleaned up imports, dependencies and updated deprecated code
dwalenddwalend
2f4e25d5f1cMoving to the release branch for 1.26.7.x SNAPSHOTs
dwalenddwalend
120c1a217caParking part-way through the adapter work in the dashboard for SHRINE-3188
Ben CBen C
1b789732ec8Pointed to /dashboard/user/whoami
marc-daniemarc-danie
fc24b44e3e9Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE-3184-port-the-dsa-...
Ben CBen C
5f478e5ed6aSaving work on displaying a network error from i2b2 xml
marc-daniemarc-danie
1e7cd438defSHRINE-3184 - Port the DSA authenticated routes to http4s - finished adding unit tests for the authenticated api calls
dwalenddwalend
7b0e2563c4bConfig now from shrine-api.war for SHRINE-3188
marc-daniemarc-danie
2d6f3a8fe7fSHRINE-3184 - Port the DSA authenticated routes to http4s - even more unit tests
dwalenddwalend
dc29cadbb0aQuickie tests for the dashboard's QEP and keystore APIs for SHRINE-3188
dwalenddwalend
a7e7fbb2979keystore is passing tests for SHRINE-3188
marc-daniemarc-danie
9e21fa969abSHRINE-3184 - Port the DSA authenticated routes to http4s - added more unit tests
dwalenddwalend
9d2de730deeChasing an implicit for SHRINE-3188
dwalenddwalend
3c86bcc5bdbReworked the dashboard's QEP to not bug shrine.war for SHRINE-3188
marc-daniemarc-danie
38f312ed88bSHRINE-3184 - Port the DSA authenticated routes to http4s - more unit tests
Ben CarmenBen Carmen
5293370c1a7Merge pull request #519 in SHRINE/shrine from bugfix/SHRINE-3359-add-missing-runquery-labels to develop * commit 'de...
David WalendDavid Walend
f956ebdb724Merge pull request #518 in SHRINE/shrine from bugfix/SHRINE-3360-webclient-queries-are-coming to develop * commit 'b...
marc-daniemarc-danie
9cdbbfb276bSHRINE-3184 - Port the DSA authenticated routes to http4s - more unit tests
marc-daniemarc-danie
1d257a564dbSHRINE-3184 - Port the DSA authenticated routes to http4s - more unit tests
Ben CBen C
de235a46e21moved width of inputQueryName style to css class
marc-daniemarc-danie
2971df2611aSHRINE-3184 - Port the DSA authenticated routes to http4s - added more unit tests
marc-daniemarc-danie
84b8ec8c1b0SHRINE-3184 - Port the DSA authenticated routes to http4s - updated tests to include whoami and added editTopicRequest
Ben CBen C
06b73ffbc2dPotential Solution for missing labels in run query pop-up
Ben CBen C
8108429bba3Added unit tests.
dwalenddwalend
b4e994b8803Getting errors to propagate out to the client for SHRINE-3360
marc-daniemarc-danie
e6c420dc284SHRINE-3184 - Port the DSA authenticated routes to http4s - added requestTopicAccess
Marc-Danie NazaireMarc-Danie Nazaire
62b042fb706Merge pull request #509 in SHRINE/shrine from feature/SHRINE-2900-connect-the-network-health-emailer to develop * co...
marc-daniemarc-danie
aaf657e7c2cSHRINE-2900 - Connect the network health emailer to the connectivity test - update dependencies
marc-daniemarc-danie
b972b8249d9SHRINE-3184 - Port the DSA authenticated routes to http4s - added unit test
Ben CarmenBen Carmen
aed809ee7cbMerge pull request #517 in SHRINE/shrine from bugfix/SHRINE-3387-fix-query-error-state to develop * commit 'b37949e0...
marc-daniemarc-danie
0da078c927fSHRINE-2900 - Connect the network health emailer to the connectivity test - eliminated an unsafeRunSync call
marc-daniemarc-danie
4576a05a24bMerge branches 'develop' and 'feature/SHRINE-2900-connect-the-network-health-emailer' of https://open.med.harvard.edu...
David WalendDavid Walend
d9b4e0a24ccMerge pull request #516 in SHRINE/shrine from bugfix/SHRINE-3388-optional-afterversion-parameter to develop * commit...
David WalendDavid Walend
ff184eb226fMerge pull request #515 in SHRINE/shrine from bugfix/SHRINE-3350-replace-uses-of-the-monix-scheduler to develop * co...
marc-daniemarc-danie
3de0b7c463aSHRINE-2900 - Connect the network health emailer to the connectivity test - added more logging
Ben CBen C
b37949e0039A simpler way to hanle this.
Ben CBen C
16168a8e33bFix of misleading query status message on query level error
Ben CBen C
ecd8d0a317bSaving unit tests.
dwalenddwalend
73f6b827dd3afterVersion parameter is now optional for SHRINE-3388
Ben CarmenBen Carmen
cecfd150277Merge pull request #514 in SHRINE/shrine from bugfix/remove-10-sec-poll-delay to develop * commit '95eaf2bfd20389883...
dwalenddwalend
0e5a0a5a8afMerged from develop
dwalenddwalend
0b002014276Stray ugly comment
David WalendDavid Walend
3edf1ff1b10Merge pull request #510 in SHRINE/shrine from feature/SHRINE-3068-improve-how-the-realm-is-retrieved to develop * co...
dwalenddwalend
21528bb5e1eQuick review of SHRINE-3350
dwalenddwalend
8ece6822ab2Cleanup for SHRINE-3350
marc-daniemarc-danie
5a909ee7320SHRINE-3184 - Port the DSA authenticated routes to http4s - added return of response to include json when asJson is t...
dwalenddwalend
b44330ec5e8Merge remote-tracking branch 'origin/bugfix/remove-10-sec-poll-delay' into bugfix/SHRINE-3350-replace-uses-of-the-mon...
Ben CBen C
95eaf2bfd20removed 10 secons before restarting poll
dwalenddwalend
f30632ee768Merge remote-tracking branch 'origin/develop' into bugfix/SHRINE-3350-replace-uses-of-the-monix-scheduler
dwalenddwalend
a9be97cb176Pulling the triggers for SHRINE-3350
marc-daniemarc-danie
386e4450dadSHRINE-3184 - Port the DSA authenticated routes to http4s - added retrieval of topics for a researcher
Ben CarmenBen Carmen
ee082f5cfb1Merge pull request #512 in SHRINE/shrine from feature/SHRINE-3308-swap-out-long-polling to develop * commit 'c294e7d...
marc-daniemarc-danie
0b7ced4634aSHRINE-3184 - Port the DSA authenticated routes to http4s - added all the authorized steward api calls
dwalenddwalend
f6a880ea4f3Merge remote-tracking branch 'origin/feature/SHRINE-3308-swap-out-long-polling' into bugfix/SHRINE-3350-replace-uses-...
Ben CarmenBen Carmen
726accb5c03Merge pull request #513 in SHRINE/shrine from feature/SHRINE-3174-show-bold-unread-queries to develop * commit 'e7eb...
dwalenddwalend
4da6beeb2a7Long polling with an update test passes for SHRINE-3350
dwalenddwalend
efb8f51d63ePolling with no changes works for SHRINE-3350
Ben CBen C
d83c44e375bmerge of develop
Ben CBen C
e7eb0b1bdc7Bold unobserved queries.
dwalenddwalend
5b6d47176eaStart of tests for SHRINE-3350 - testing just getting the datastructure back.
Ben CBen C
c294e7d5fa7add long polling back in
Ben CarmenBen Carmen
9db4daa5ee7Merge pull request #511 in SHRINE/shrine from bugfix/SHRINE-3373-fix-delay-for-query-history to develop * commit '18...
marc-daniemarc-danie
38c9c92e677SHRINE-3184 - Port the DSA authenticated routes to http4s
marc-daniemarc-danie
27b05dce523SHRINE-2900 - Connect the network health emailer to the connectivity test - Fixed the term extraction for the email a...
dwalenddwalend
ae11ef1305cPut a more IO-centric version of the QueryChangeNotifier into the works for SHRINE-3350
Ben CBen C
1880dbe8ac6Fix of delay showing a previous query.
Ben CBen C
48ebfd68dc8replaced Enzyme with react-test-renderer for Snapshot and integration tests.
marc-daniemarc-danie
80a4eedbfd1SHRINE-2900 - Connect the network health emailer to the connectivity test - Reorganized the code a bit, added more er...
marc-daniemarc-danie
553f24ba67fSHRINE-2900 - Connect the network health emailer to the connectivity test - Made the delay for the connectivity test ...
dwalenddwalend
aedb318e939Merging from develop
David WalendDavid Walend
e338e6806c4Merge pull request #507 in SHRINE/shrine from bugfix/SHRINE-3384-admin-dashboard-problem-log-the to develop * commit...
marc-daniemarc-danie
68b56a08eebSHRINE-2900 - Connect the network health emailer to the connectivity test - Replaced Timer with ScheduledExecutorServ...
dwalenddwalend
c559a093b71Removed BearerAuthentiation for SHRINE-3068
marc-daniemarc-danie
8ac928781fbSHRINE-2900 - Connect the network health emailer to the connectivity test - Removed try in return type of selectMostR...
marc-daniemarc-danie
638f5a5b037Merge branches 'develop' and 'feature/SHRINE-2900-connect-the-network-health-emailer' of https://open.med.harvard.edu...
marc-daniemarc-danie
e12e84cac71SHRINE-2900 - Connect the network health emailer to the connectivity test - made the adminEmail required
Ben CBen C
bd038c5dd7cFunctioning Export to CSV.
dwalenddwalend
e24376d42aeRemoved the shrine.authenticate.usersource.domain for SHRINE-3068
dwalenddwalend
9a436ce2df2Removed shrine.authenticate.realm for SHRINE-3068
marc-daniemarc-danie
11d86a731d4SHRINE-2900 - Connect the network health emailer to the connectivity test - removed comment
marc-daniemarc-danie
b1cf3a73c65SHRINE-2900 - Connect the network health emailer to the connectivity test - removed the api calls to test the sening ...
dwalenddwalend
c77a0bebae1Missed a test somehow. Fixing with the right magic string.
David WalendDavid Walend
a09582681e9Merge pull request #508 in SHRINE/shrine from feature/SHRINE-3342-create-default-values-for-static-data-src-main to d...
marc-daniemarc-danie
d3a312fd0a0SHRINE-2900 - Connect the network health emailer to the connectivity test - code cleanup
marc-daniemarc-danie
ed53e1f1230SHRINE-2900 - Connect the network health emailer to the connectivity test - more merge remnants
marc-daniemarc-danie
ee6dfff9254SHRINE-2900 - Connect the network health emailer to the connectivity test - merge with develop
marc-daniemarc-danie
5c265719e8dSHRINE-2900 - Connect the network health emailer to the connectivity test - modified to send email to adapter node
marc-daniemarc-danie
58186fe00f2SHRINE-2900 - Connect the network health emailer to the connectivity test - replaced Monix scheduler with Java TimerTask
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