SHRINE
  1. SHRINE

shrine

Public
  1. SHRINE
  2. shrine

All Branches Graph  

        
AuthorCommitMessageCommit dateBuilds
Ben CBen C
63cde70a4b5Fix of failing build
Ben CarmenBen Carmen
ef090a23cc3Merge pull request #407 in SHRINE/shrine from bugfix/SHRINE-3253-missing-query-name to release/1.26.5 * commit 'd416...
Ben CarmenBen Carmen
33c11fed6ddMerge pull request #406 in SHRINE/shrine from bugfix/SHRINE-3212-processing-at-site to release/1.26.5 * commit '4850...
Ben CBen C
d416fae6d7bGit push, fixed issue of missing name....React changed Component lifecycle method in version 16.3.
David WalendDavid Walend
557bf6cda8fMerge pull request #405 in SHRINE/shrine from feature/SHRINE-3249-upgrade-http4s-and-maybe-other to develop * commit...
Ben CBen C
4850f0799b5Fix to ensure that site status says "Processing at Site" instead of "Query Submitted" when networkId is received.
David WalendDavid Walend
23c8c2d135eMerge remote-tracking branch 'origin/release/1.26.5' into develop
David WalendDavid Walend
9e18067a145Updated a lot of dependencies for SHRINE-3249
Ben CarmenBen Carmen
79406c81de5Merge pull request #404 in SHRINE/shrine from bugfix/SHRINE-3250-fix-status-message-format to release/1.26.5 * commi...
Ben CBen C
31b81ae9dafSaving work on sanitizing html
Ben CBen C
7ba3150a328Potential fix of Query Status text spacing
David WalendDavid Walend
5e47d2cccd7Merge pull request #402 in SHRINE/shrine from bugfix/SHRINE-3241-webclient-is-unable-to-retrieve to release/1.26.5 *...
Ben CBen C
1ca5a3a6c30Utilizing the queryFlaggingInstructions field if provided.
David WalendDavid Walend
857cb343f85Merge pull request #401 in SHRINE/shrine from feature/SHRINE-3248-report-very-old-queued-queries to release/1.26.5 *...
David WalendDavid Walend
7df7211a711Build a ReadQueryDefinitionResponse without a RunQueryRequest for SHRINE-3241
David WalendDavid Walend
d5bb1862285Changed the hard-coded wait into a config property for SHRINE-3248
David WalendDavid Walend
c2a2cfbf95bWas able to add a date field to the adapter's old DAO model for SHRIEN-3248
David WalendDavid Walend
9670b0e7c10Checking in the outer structure before adding a field to the adapter's brittle old data model for SHRIEN-3248
David WalendDavid Walend
72bf2ef5ca3Moved develop to 1.26.6.1-SNAPSHOT
David WalendDavid Walend
a1cfd6f7a7eMoved pom.xml version to 1.26.5.2-SNAPSHOT before creating the release branch
Marc-Danie NazaireMarc-Danie Nazaire
cd6beaab263Merge pull request #400 in SHRINE/shrine from bugfix/SHRINE-3243-fix-for-finding-researcher-when to develop * commit...
marc-daniemarc-danie
610eb724c28SHRINE-3243 - Fix for finding researcher when running the network health test - Modified to throw a specific Exceptio...
marc-daniemarc-danie
cb3ea25999cSHRINE-3243 - Fix for finding researcher when running the network health test
David WalendDavid Walend
c3b562652dcMerge pull request #399 in SHRINE/shrine from bugfix/SHRINE-3196-occasional-data-race-lost-in to develop * commit '7...
David WalendDavid Walend
0d90c36d722Merge pull request #398 in SHRINE/shrine from bugfix/SHRINE-3238-hub-s-database-needs-to-be-able to develop * commit...
dwalenddwalend
7e2876ce687Possible fix for the database race in SHRINE-3196 . It should at least be much more survivable.
dwalenddwalend
853cb8a9cbcStray comment cleanup
dwalenddwalend
1edc7e6ea8eStray comment cleanup
dwalenddwalend
2d683e19e38Handle queries that the hub has never heard of more gracefully for SHRINE-3238
dwalenddwalend
ea90df8dc1cNow using flatmap and returning an Option[Item] for upserts for SHRINE-3238
David WalendDavid Walend
38aa59564e3Merge pull request #397 in SHRINE/shrine from bugfix/SHRINE-3236-interpret-reinterpret-status to develop * commit '4...
dwalenddwalend
45be6e5fbcaSwitched off QUEUED query polling for SHRINE-3236
dwalenddwalend
53e59fb201bStoring errors found while begging for QUEUED query results is very hard. Moving on for SHRINE-3236
dwalenddwalend
65315973490Fixed null pointer exception for SHRINE-3237
David WalendDavid Walend
33cfc453b40More logging for SHRINE-3237
David WalendDavid Walend
432e622398aFix for queued query xml response woes in SHRINE-3236
Marc-Danie NazaireMarc-Danie Nazaire
7f07b5f9684Merge pull request #396 in SHRINE/shrine from bugfix/SHRINE-3222-fix-sorting-of-previous-queries to develop * commit...
marc-daniemarc-danie
e68206a3a34SHRINE-3222 - Fix sorting of previous queries - fixed broken tests
Marc-Danie NazaireMarc-Danie Nazaire
f7944d62aa3Merge pull request #395 in SHRINE/shrine from bugfix/SHRINE-3222-fix-sorting-of-previous-queries to develop * commit...
marc-daniemarc-danie
f38295c51d8SHRINE-3222 - Fix sorting of previous queries - fixed sorting with skip
marc-daniemarc-danie
319ed10d333SHRINE-3222 - Fix sorting of previous queries
Ben CBen C
9c3fbdd8508Quick fix of Submitted appearing when query is idle.
Ben CarmenBen Carmen
05530dc56fdMerge pull request #354 in SHRINE/shrine from feature/mock-sse to develop * commit '08b5ece51f9c3311a7e299dd95a11d7a...
Ben CarmenBen Carmen
08b5ece51f9Merge pull request #394 in SHRINE/shrine from Feature/mock-sse to feature/mock-sse * commit 'fc03c6be5848ba85afd99bd...
Ben CBen C
fc03c6be584Merge with develop
Ben CBen C
d858a3be812Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine into develop
Marc-Danie NazaireMarc-Danie Nazaire
714d006f785Merge pull request #393 in SHRINE/shrine from feature/SHRINE-3220-add-flagging-instructions-to to develop * commit '...
Ben CBen C
4d391a3cc38Changed wording to avoid confusion
Ben CarmenBen Carmen
215fc0765fcMerge pull request #391 in SHRINE/shrine from feature/SHRINE-3154-collect-flag-query-changes-at to develop * commit ...
David WalendDavid Walend
6dca8ae359dFound a minor bug in updateQueryStatus while testing SHRINE-3154
marc-daniemarc-danie
97866990663SHRINE-3220 - Add Flagging Instructions to webclient section of shrine.conf
David WalendDavid Walend
25d48c58cc4Merge branch 'feature/SHRINE-3175-flag-a-query' into feature/SHRINE-3154-collect-flag-query-changes-at
bendcarmenbendcarmen
16b2fcacdfbSolution for latency in showing pending fetch state for rename, flag and unflag calls.
Ben CBen C
3aa12d41027A few style tweaks and added a missing component back.
Ben CBen C
43b41f3355dFixed the loader
Ben CBen C
5111779350eCleanup of unused components.
Ben CBen C
b4829fb8712Merge branch 'develop' into feature/SHRINE-3175-flag-a-query
Ben CBen C
0c9cd869efbPossible Solution for flagging, unflagging and renaming a query.
Ben CBen C
bceb098bcd5Added snapshot tests
Ben CBen C
3282dc59e13Saving work
David WalendDavid Walend
4048ad80aecKnew I
David WalendDavid Walend
354c76f2c27Cleaning up some stale comments for SHRINE-3154
David WalendDavid Walend
17029c9f411Flagging/unflagging of queries for SHRINE-3154
Ben CBen C
ecff643340esaving work on modal, query rename and flagging
marc-daniemarc-danie
7e1b34e45c9SHRINE-3186- Remove shrine-proxy war file (server side)
Marc-Danie NazaireMarc-Danie Nazaire
a2a0fddabbeMerge pull request #390 in SHRINE/shrine from feature/SHRINE-3193-detect-and-send-incremental-query to develop * com...
marc-daniemarc-danie
eb4afe01d0cSHRINE-3193 - Detect and send incremental query results to the web client - removed redundant triggerDataChangeFor call
marc-daniemarc-danie
548f5843c95SHRINE-3193 - Detect and send incremental query results to the web client - added test
marc-daniemarc-danie
10b895ef22bSHRINE-3096 - Run Network Health Connectivity test with real data - added Jira ticket comment
marc-daniemarc-danie
ad98de06623SHRINE-3193 - Detect and send incremental query results to the web client - fixed sending of data when not responding...
Ben CBen C
e8731f75678saving work
Ben CBen C
5b8cd92623dMerge branch 'develop' into feature/SHRINE-3175-flag-a-query
Ben CBen C
5f756ced447added removed tests back in after fixing build
Ben CBen C
fe2e4deb5deFixed breaking build...I think.
Ben CBen C
25fdac52e9dFiguring out why build is failing
Ben CBen C
d533357dd4cFixed failing snapshot tests
Ben CarmenBen Carmen
7fc1d33b70cMerge pull request #389 in SHRINE/shrine from feature/SHRINE-3077-previous-queries-table to develop * commit 'c7cd7f...
Ben CBen C
c7cd7f5c40aCode cleanup
Ben CBen C
c5e0f21b5eaSaving work
Ben CBen C
ae5617a136cMerge branch 'develop' into feature/SHRINE-3077-previous-queries-table
Ben CBen C
ccc58a66487Potential solution for SHRINE-3077
marc-daniemarc-danie
8e20b45e5d6SHRINE-3193 - Detect and send incremental query results to the web client
Ben CBen C
dd32acf8959Saving Changes
Ben CBen C
8ba3e2c4a18Saving work
Marc-Danie NazaireMarc-Danie Nazaire
e6bb7ce35dbMerge pull request #387 in SHRINE/shrine from feature/SHRINE-3096-run-network-health-connectivity to develop * commi...
marc-daniemarc-danie
86792750c47SHRINE-3096 - Run Network Health Connectivity test with real data - renamed timeout to timeLimit and fixed saving of ...
David WalendDavid Walend
5cc2df3f0b0Merge pull request #388 in SHRINE/shrine from feature/SHRINE-3153-collect-renames-of-queries-in to develop * commit ...
David WalendDavid Walend
ef51960c52aSent the message and solved the db puzzle for SHRINE-3115
marc-daniemarc-danie
b1511f2c283SHRINE-3096 - Run Network Health Connectivity test with real data - merge with develop
marc-daniemarc-danie
ece9aa639eaSHRINE-3096 - Run Network Health Connectivity test with real data - merge with develop
David WalendDavid Walend
1a16fa6b6a1Merge remote-tracking branch 'origin/develop' into feature/SHRINE-3153-collect-renames-of-queries-in
David WalendDavid Walend
50b65604c98The works should be able to accept and process a query rename command for SHRINE-3153
marc-daniemarc-danie
e2a3b0d3b8fSHRINE-3096 - Run Network Health Connectivity test with real data - added circe-config-version property to the pom file
David WalendDavid Walend
c73c4e6ee56Merge pull request #386 in SHRINE/shrine from bugfix/SHRINE-3147-at-adapter-startup-look-for-queued to develop * com...
marc-daniemarc-danie
547b6e2ece5SHRINE-3096 - Run Network Health Connectivity test with real data - common out code for building web app
marc-daniemarc-danie
5348e79e1b3SHRINE-3096 - Run Network Health Connectivity test with real data - cleaned up imports
marc-daniemarc-danie
aea9a6565ffSHRINE-3096 - Run Network Health Connectivity test with real data - fixed broken test
dwalenddwalend
9c7939ce340todo pass for SHRINE-3147
dwalenddwalend
7f9abc4532cMerge branch 'develop' into bugfix/SHRINE-3147-at-adapter-startup-look-for-queued
dwalenddwalend
db4ff29ea0dLast couple of details to get right to get a QUEUED query result back for SHRINE-3147
marc-daniemarc-danie
99cb78eb82fSHRINE-3096 - Run Network Health Connectivity test with real data - make timeout required
dwalenddwalend
22fdcb00b1fLearned about the difference between toSeq and toList in Squyrrl for SHRINE-3147
Ben CBen C
416f0225c3aUpgraded version of node sass from 4.5.3 to 4.11.0
marc-daniemarc-danie
d6c343474edSHRINE-3096 - Run Network Health Connectivity test with real data - reset maxRetries back to 8
marc-daniemarc-danie
e0c7a6da672SHRINE-3096 - Run Network Health Connectivity test with real data - removed unused function
marc-daniemarc-danie
c47148098f5SHRINE-3096 - Run Network Health Connectivity test with real data - added missing web app files
marc-daniemarc-danie
52aa70e7ba0SHRINE-3096 - Run Network Health Connectivity test with real data - modified to only display query results after time...
Ben CBen C
399ea5505edChange of workingDirectoryPath
David WalendDavid Walend
e3d5b5e2be9Connecting all the wires for SHRINE-3147
marc-daniemarc-danie
4743243a672SHRINE-3211 - Move configuration of connectivity test to shrine.conf
marc-daniemarc-danie
31de989df19Merge branches 'develop' and 'feature/SHRINE-3096-run-network-health-connectivity' of https://open.med.harvard.edu/st...
dwalenddwalend
8cccbcaae56Check on queued queries in an IO for SHRINE-3147
Ben CBen C
9b8b7ba1ae2Fixed path in pom.xml
Ben CBen C
389211dc6ceUpdates to POM files for the steward and dashboard client apps
David WalendDavid Walend
b0c73a3016aWork toward checking queued queries for SHRINE-3147
marc-daniemarc-danie
4ed8de055c7SHRINE-3096 - Run Network Health Connectivity test with real data - removed hard-coded node and unused function
Ben CBen C
3f38205fa7aFixed breaking unit tests
Ben CBen C
a9722fb6cedslight edit to distinguish build and install-test-build
Ben CarmenBen Carmen
b804037b092Merge pull request #384 in SHRINE/shrine from feature/SHRINE-3009-email-error-to-admin to develop * commit '717751fd...
Ben CBen C
212ff45d93cPotential solution for SHRINE-3110
Ben CBen C
717751fd210Added error message for JSON response parse error
Ben CBen C
d4d31b529f1Rolled in recommendations from code review
David WalendDavid Walend
5810d700ed0Create a ReadQueryResultAdapter from config for SHRINE-3147
Ben CBen C
57da1bb8360Saving changes to package.json
David WalendDavid Walend
6942b97a965Merge remote-tracking branch 'origin/develop' into bugfix/SHRINE-3147-at-adapter-startup-look-for-queued
dwalenddwalend
aad6d78a65fStarting comments for how to get QUEUED query results back from i2b2's CRC for SHRINE-3147
David WalendDavid Walend
e31d4019553Merge pull request #381 in SHRINE/shrine from feature/SHRINE-3146-create-find-the-entry-point-for to develop * commi...
marc-daniemarc-danie
3188f79c119Merge branches 'develop' and 'feature/SHRINE-3096-run-network-health-connectivity' of https://open.med.harvard.edu/st...
marc-daniemarc-danie
03678892038SHRINE-3096 - Run Network Health Connectivity test with real data - uses real data
bendcarmenbendcarmen
7579380cd47Potential solution for SHRINE-3009
bendcarmenbendcarmen
c581563d3d5changed back to components
bendcarmenbendcarmen
4c0baa8eb9bgit messed up, trying to fix it.
bendcarmenbendcarmen
63cb481dea8saving change
bendcarmenbendcarmen
b3371c3a5f8Merge branch 'develop' into feature/SHRINE-3009-email-admin
David WalendDavid Walend
bce146f26baMerge branch 'develop' into bugfix/SHRINE-3147-at-adapter-startup-look-for-queued
bendcarmenbendcarmen
9f9f7532a0bPotential Solution for Error Dialog/Admin Email
David WalendDavid Walend
fd8c7484d80Merge pull request #383 in SHRINE/shrine from feature/SHRINE-3041-refactor-to-make-adding-the-network to develop * c...
bendcarmenbendcarmen
80249c2f16fWorking example
Marc-Danie NazaireMarc-Danie Nazaire
b0c42f69c88Merge pull request #379 in SHRINE/shrine from feature/SHRINE-3117-add-mappings-for-the-new-query to develop * commit...
David WalendDavid Walend
4dd9b986694Last few details to wrap up code for SHRINE-3041
dwalenddwalend
21d24224671Network configuration (except for network health) for SHRINE-3041
dwalenddwalend
91aefe8365eModify nodes for SHRINE-3041
bendcarmenbendcarmen
0a70c479e17Some cleanup
bendcarmenbendcarmen
d9b32b79d83Refactored shrineSnippets into Components
David WalendDavid Walend
c96fd059adeMerge pull request #382 in SHRINE/shrine from bugfix/SHRINE-3202-isha-created-an-itemversionracelostexception to deve...
David WalendDavid Walend
72b976fd85dStarted web APIs for SHRINE-3041
bendcarmenbendcarmen
711db35353cMerge branch 'feature/SHRINE-3009-email-admin' into task/SHRINE-3084-error-pop-up
bendcarmenbendcarmen
39349dc220cRetrived webclient config data.
David WalendDavid Walend
1d91bfdb103Separated out the call to the CRC and its aftermath to make reporting status easier for SHRINE-3202
David WalendDavid Walend
8a488ec4c88Merge remote-tracking branch 'origin/develop' into feature/SHRINE-3146-create-find-the-entry-point-for
David WalendDavid Walend
fee4415e98btodo sweep before code review for SHRINE-3146
David WalendDavid Walend
e38347ecb1cMade the entry point to ask the CRC for query updates for SHRINE-3146
Ben CarmenBen Carmen
6bea26098a7Merge pull request #380 in SHRINE/shrine from feature/SHRINE-3007-query-poll-status to develop * commit '0c322241f6c...
David WalendDavid Walend
c6f79ab83a2Separated the call to see if the CRC even knows about the query for SHRINE-3146
bendcarmenbendcarmen
0c322241f6cAdded internal status and changed Complete to Completed
marc-daniemarc-danie
b365e402d46SHRINE-3117 - Add mappings for the new query statuses - code review changes
David WalendDavid Walend
ab9b371e930Extending the Either further for SHRINE-2146
David WalendDavid Walend
5d2eef538feExtending the Either further for SHRINE-2146
David WalendDavid Walend
0a03d9a1a61Called out readInstanceResults to see if a query is done and safe to ask for infomation SHRINE-3146
David WalendDavid Walend
606f49b36bbBetter error handling for the count call in SHRINE-3146
David WalendDavid Walend
f270b266ed5Factored out retrieving queued breakdowns from the works for SHRINE-3146
David WalendDavid Walend
e8ef6877419Moved where the audit of the sent result is stored for SHRINE-3146
bendcarmenbendcarmen
eaef5a3e4caPotential Solution for Query Statuses
marc-daniemarc-danie
fef1acc562dSHRINE-3117 - Add mappings for the new query statuses
Marc-Danie NazaireMarc-Danie Nazaire
74b6f2c4329Merge pull request #378 in SHRINE/shrine from feature/SHRINE-3185-remove-shrine-metadata-war to develop * commit 'a0...
bendcarmenbendcarmen
7e777e7b3e7ignore a failing snapshot test to get build working
Ben CarmenBen Carmen
6e5b5a56117Merge pull request #377 in SHRINE/shrine from feature/SHRINE-3008-show-query-result-status to develop * commit 'f776...
David WalendDavid Walend
247e5ccbc73Merge branch 'feature/SHRINE-3146-create-find-the-entry-point-for' of https://open.med.harvard.edu/stash/scm/shrine/s...
David WalendDavid Walend
6d487013a59Some cleanup of how breakdowns are ignored for SHRINE-3146
marc-daniemarc-danie
a09e624c63cMerge branches 'develop' and 'feature/SHRINE-3185-remove-shrine-metadata-war' of https://open.med.harvard.edu/stash/s...
dwalenddwalend
6088c09d6b1Merge remote-tracking branch 'origin/develop' into feature/SHRINE-3146-create-find-the-entry-point-for
David WalendDavid Walend
259993dc3a6Merge pull request #376 in SHRINE/shrine from bugfix/SHRINE-3199-topic-name-is-missing-in-shrine-dev1 to develop * c...
marc-daniemarc-danie
d51163c6028SHRINE-3185 - Remove shrine-metadata war file
bendcarmenbendcarmen
f77645fa983Potentially Finished Site Result Statuses
David WalendDavid Walend
31e86aa2c0fAdded the topic name to the i2b2 xml to run a query for SHRINE-3199
David WalendDavid Walend
55fb97456cbRemoved another layer of gloop for SHRINE-3146
Marc-Danie NazaireMarc-Danie Nazaire
5db024d069cMerge pull request #375 in SHRINE/shrine from feature/SHRINE-3181-add-site-administrator-email to develop * commit '...
marc-daniemarc-danie
3691b5dc506SHRINE-3181 - Add Site Administrator Email, Username Label and Password Label to webclient section in shrine.conf - m...
David WalendDavid Walend
8788e1f0a6aSerialized the calls to the CRC for breakdown results because the CRC realy can't handle that. For SHRINE-3146
David WalendDavid Walend
f264ded3854Comments to guide ironing out the QUEUED query code for SHRINE-3146
marc-daniemarc-danie
4f960bfac4fSHRINE-3181 - Add Site Administrator Email, Username Label and Password Label to webclient section in shrine.conf
David WalendDavid Walend
b7e397f96d4Merge pull request #366 in SHRINE/shrine from feature/SHRINE-2724-the-dsa-can-require-topic-ids to develop * commit ...
David WalendDavid Walend
4b81533351dMerge pull request #370 in SHRINE/shrine from feature/SHRINE-3144-upgrade-to-the-latest-scala-maven to develop * com...
David WalendDavid Walend
e6dd67d3e5cMerge pull request #357 in SHRINE/shrine from feature/SHRINE-3021-change-the-rest-of-the-mom-web to develop * commit...
David WalendDavid Walend
9cfcd9b28e0Setting the version back to 1.26.5.1-SNAPSHOT
David WalendDavid Walend
bfd85199909Merge conflicts resoved from 1.26.4.2
David WalendDavid Walend
49ef96714a7Messing with pom.xml to avoid merge conflicts
David WalendDavid Walend
ee6f93f8ed9Merge pull request #372 in SHRINE/shrine from feature/SHRINE-2473-remove-unused-includeaggregateresults to develop *...