 elizah | 77c3386b03f | Merge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-508 | | |
 Eliza Huang | 9338bd86941 | Merge pull request #1050 in SHRINE/shrine from feature/SHRINE2020-510 to develop
* commit '6717cc8f72b8329f44e04542f... | | |
 Marc-Danie Nazaire | 9824da17fe2 | SHRINE2020-590 - Edit criteria functionality is not working | | |
Marc-Danie Nazaire | bdd9307b9d5 | Merge pull request #1064 in SHRINE/shrine from bugfix/SHRINE2020-599 to develop
* commit 'b120b2118f0e1d86bb5b610a88... | | |
 dwalend | e3d2863835e | Marc-Danie found some squeryl code that crept back into SHRINE2020-515 | | |
dwalend | c3105a6ebf9 | Merging | | |
 David Walend | 1dad1d8d1dc | Merge pull request #1067 in SHRINE/shrine from feature/SHRINE2020-570 to develop
* commit '53e22bda9a44b697cc21c9f38... | | |
elizah | cf64d5de015 | cleanup | | |
elizah | 1895f989587 | force expand on demographic | | |
elizah | b7378399e0a | Merge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-580 | | |
dwalend | 53e22bda9a4 | Rename from code review of SHRINE2020-570 | | |
dwalend | fb036610fa4 | Merge branch 'develop' into feature/SHRINE2020-570 | | |
dwalend | 45c88451bb5 | merging develop | | |
 Bill Simons | 50028057bf9 | Merge pull request #1066 in SHRINE/shrine from bugfix/SHRINE2020-614 to develop
* commit '7f93b358b7f5ee2dbe382d659b... | | |
dwalend | bbc0a07ba82 | Marc-Danie review comments for SHRINE2020-515 | | |
dwalend | 3ace84865bb | Added ability to test that 500 errors produce logs when they come from inside our servlet for SHRINE2020-513 | | |
Bill Simons | 7f93b358b7f | rename index to keep consistent suffix | | |
Marc-Danie Nazaire | 44dc30d2eeb | Merge pull request #1065 in SHRINE/shrine from feature/SHRINE2020-506 to develop
* commit '9b6f568869e38d7b3559c6d47... | | |
Marc-Danie Nazaire | 9b6f568869e | Merge from develop | | |
Marc-Danie Nazaire | 3993a0d9852 | Merge pull request #1068 in SHRINE/shrine from feature/SHRINE2020-504 to develop
* commit 'ad0052101fdf3ffacfc3043b4... | | |
Marc-Danie Nazaire | b120b2118f0 | Merge from develop | | |
Marc-Danie Nazaire | 09f7370511e | Merge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into bugfix/SHRINE2020-599 | | |
Marc-Danie Nazaire | bda30b2940b | Merge pull request #1059 in SHRINE/shrine from feature/SHRINE2020-501 to develop
* commit '5fda4e3c5ef83146ad05c8b12... | | |
Marc-Danie Nazaire | 5fda4e3c5ef | SHRINE2020-501 - Replace calls to functions in SquerylAdapterDao to corresponding function in QueryHistoryDb - rename... | | |
Marc-Danie Nazaire | cee0458fcc5 | SHRINE2020-501 - Replace calls to functions in SquerylAdapterDao to corresponding function in QueryHistoryDb - update... | | |
Marc-Danie Nazaire | 1f4232b124a | SHRINE2020-501 - Replace calls to functions in SquerylAdapterDao to corresponding function in QueryHistoryDb - update... | | |
Marc-Danie Nazaire | e3e529767b2 | Merge branch 'feature/SHRINE2020-501' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into bugfix/SHRINE... | | |
Marc-Danie Nazaire | 848e5c39000 | SHRINE2020-501 - Replace calls to functions in SquerylAdapterDao to corresponding function in QueryHistoryDb - Added ... | | |
dwalend | b0b47733253 | Assigned log levels to all raw problems for SHRINE2020-515, and fixed SHRINE2020-544 in the process | | |
dwalend | f033c3d7fe0 | Addded ability to log problems at a problem-defined level for SHRINE2020-515 | | |
Marc-Danie Nazaire | 29e64849cc4 | SHRINE2020-501 - Replace calls to functions in SquerylAdapterDao to corresponding function in QueryHistoryDb - Remove... | | |
Marc-Danie Nazaire | c6cd7bdb338 | SHRINE2020-501 - Replace calls to functions in SquerylAdapterDao to corresponding function in QueryHistoryDb - Fixed ... | | |
Marc-Danie Nazaire | 4a63033c8f1 | SHRINE2020-501 - Replace calls to functions in SquerylAdapterDao to corresponding function in QueryHistoryDb - Fixed ... | | |
dwalend | 1088b6ad530 | Cleanup for SHRINE2020-570 | | |
dwalend | 377cf4dba23 | Got the network, local node, and message queue cached for SHRINE2020-570 | | |
elizah | 179db203537 | use reset text | | |
 bcarmen | ad0052101fd | saving work | | |
bcarmen | 37a2e150ef0 | saving updated snapshot test | | |
bcarmen | 110ad6f3302 | added s onto demographic distributions | | |
bcarmen | cf86ad10198 | Merge branch 'develop' into feature/SHRINE2020-518 | | |
elizah | d10fcca6fc0 | Merge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-580 | | |
elizah | ba3c60277ed | inline alert | | |
bcarmen | df9368f3fa6 | saving work | | |
bcarmen | acf86bddab3 | saving work | | |
bcarmen | 336202b8b1a | removed unused file | | |
bcarmen | e1c40a0b5ab | made recommended changes from BA review | | |
bcarmen | 9b6baf480c9 | Merge branch 'develop' into feature/SHRINE2020-506 | | |
elizah | bd38a2d41af | rename alert box | | |
Eliza Huang | 88ebd244451 | Merge pull request #1057 in SHRINE/shrine from feature/SHRINE2020-526 to develop
* commit '1fee77a251bc46f9cc0cb5bd8... | | |
elizah | 1fee77a251b | Merge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-526 | | |
 Ben Carmen | 58f75efb262 | Merge pull request #1055 in SHRINE/shrine from bugfix/SHRINE2020-578 to develop
* commit '065dc683e20f6a5aef5ee469b0... | | |
Bill Simons | d926d2413a6 | Remove unnecessary drops and data migrations... not needed for a fresh install | | |
Marc-Danie Nazaire | 368e5993a6a | SHRINE2020-507 - Display a link to download the site specific csv file - Removed content disposition header in response | | |
Bill Simons | f47737a50ae | Remove create database statements from mssql scripts | | |
Marc-Danie Nazaire | 006b0e4c3a6 | Added rename of I2B2ResultEnvelope | | |
Marc-Danie Nazaire | 875f71e0d0b | Merge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-501
# Co... | | |
bcarmen | 065dc683e20 | saving work | | |
bcarmen | 0fd6af5d6e3 | saving work | | |
elizah | 5e1f105ad51 | offset y | | |
elizah | 43fa4684d7b | fix text | | |
bcarmen | 30822e8bc15 | Merge branch 'develop' into bugfix/SHRINE2020-578 | | |
elizah | 8eb37c3a5b6 | merge from develop | | |
Marc-Danie Nazaire | 08bf4e1a0db | Merge pull request #1051 in SHRINE/shrine from feature/SHRINE2020-499 to develop
* commit '6db33c373c03e5a59b945dc10... | | |
Marc-Danie Nazaire | 6db33c373c0 | SHRINE2020-499 - Migrate the BREAKDOWN_RESULT table to Slick - Renamed I2b2ResultEnvelope to I2b2Result | | |
Marc-Danie Nazaire | 1f6640ba839 | SHRINE2020-599 - Modify Aim3Service to use QueryHistoryDB - More code cleanup | | |
Marc-Danie Nazaire | fd84495301a | SHRINE2020-599 - Modify Aim3Service to use QueryHistoryDB - More code cleanup | | |
bcarmen | 560740ff122 | saving work | | |
Marc-Danie Nazaire | 782981318a8 | SHRINE2020-599 - Modify Aim3Service to use QueryHistoryDB - Code cleanup | | |
Marc-Danie Nazaire | 3d72e8834a9 | SHRINE2020-599 - Modify Aim3Service to use QueryHistoryDB - Code cleanup | | |
Marc-Danie Nazaire | 071c8ae94b4 | SHRINE2020-599 - Modify Aim3Service to use QueryHistoryDB - Fixed testReadI2b2AdminQueryingUsers test | | |
dwalend | d6223fccbec | Code cleanup, planning for SHRINE2020-570, and renamed webClientTimeOut to receiveWaitTime | | |
Marc-Danie Nazaire | 6692d77fc5b | SHRINE2020-599 - Modify Aim3Service to use QueryHistoryDB - modified to use distinctOn | | |
David Walend | ab6fef7d2fc | Merge pull request #1058 in SHRINE/shrine from feature/SHRINE2020-569 to develop
* commit '73c4a9089c46ed264f88169c6... | | |
bcarmen | 5ae816bf939 | saving work | | |
bcarmen | a8bea489959 | Merge branch 'feature/SHRINE2020-591' into feature/SHRINE2020-506 | | |
Marc-Danie Nazaire | 0d86ea5aba4 | SHRINE2020-599 - Modify Aim3Service to use QueryHistoryDB | | |
David Walend | 480b3914f56 | Merge pull request #1062 in SHRINE/shrine from feature/SHRINE2020-612 to feature/SHRINE2020-506
* commit '26cd3f147a... | | |
dwalend | 26cd3f147aa | Sorting for SHRINE2020-612 | | |
elizah | 0e371d9ad59 | fix test | | |
elizah | 47092071cdf | rm config | | |
elizah | 027ec543f07 | fix tests | | |
elizah | af63961bf71 | remove logger config | | |
elizah | 2ddaa9091a7 | consolidate to api log | | |
elizah | 494557ad396 | Merge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-516 | | |
elizah | 7dce257ea7c | Merge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-508 | | |
elizah | aab563c47b9 | config in xml | | |
dwalend | 73c4a9089c4 | Merge from develop | | |
Bill Simons | ea78213dd8b | Use an index name less than 30 chars to get the script to work on Oracle versions < 12.2 | | |
Bill Simons | 50bb0c8a200 | Change comment to `/*` style because `--` style was failing in sqlplus; remove incorrect `/` buffer execution charact... | | |
Bill Simons | dac3ee3f13e | get oracle base scripts in working order for auto-deployment; remove hub scripts for oracle and mssql as we will curr... | | |
dwalend | 390572b6230 | -1 signals 10 or fewer, and must be filtered out for SHRINE2020-612 | | |
dwalend | 4de2cef20f3 | Stray todo in SHRINE2020-612 | | |
dwalend | acb0070ad24 | Removed the bits that keep breakdowns from showing in the new UI for SHRINE2020-612 | | |
dwalend | a33340e8519 | Now supplying the breakdowns for SHRINE2020-612 | | |
dwalend | 4890394c5b2 | Some code cleanup for SHRINE2020-612 | | |
elizah | 9cc10f357bd | cleanup | | |
elizah | 33672232db0 | fix condition | | |
elizah | fa955d7625a | Merge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-580 | | |
elizah | facaada1bd1 | Merge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-526 | | |
elizah | 7f151d7252e | handle tooltip close | | |
dwalend | f3df970d000 | Merge remote-tracking branch 'origin/develop' into feature/SHRINE2020-612 | | |
dwalend | 3a164342f7f | Pass one of breakdowns - getting the request in for SHRINE2020-612 | | |
David Walend | 85261259257 | Merge pull request #1061 in SHRINE/shrine from bugfix/SHRINE2020-597-revive-act-audit-metrics-prototype to develop
*... | | |
dwalend | c8793f754b8 | Stray println for SHRINE2020-597 | | |
Marc-Danie Nazaire | e8eb78dcdb6 | SHRINE2020-507 - Added stub api call for creating the demographic - fixed imports | | |
Marc-Danie Nazaire | 3725bc7a714 | Merge branch 'feature/SHRINE2020-507' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRIN... | | |
Marc-Danie Nazaire | 33fb6f81569 | SHRINE2020-507 - Added stub api call for creating the demographic | | |
dwalend | 64cd6174cc3 | Merging | | |
Marc-Danie Nazaire | ca99a50afc3 | SHRINE2020-501 - Replace calls to functions in SquerylAdapterDao to corresponding function in QueryHistoryDb - Remove... | | |
Marc-Danie Nazaire | 5ed8a861adf | SHRINE2020-501 - Replace calls to functions in SquerylAdapterDao to corresponding function in QueryHistoryDb - Remove... | | |
dwalend | ab8cd1055e7 | Merge remote-tracking branch 'origin/develop' into feature/SHRINE2020-569 | | |
dwalend | bf382198598 | Fixed logging, but theres mroe to do for SHRINE2020-597 | | |
David Walend | b3c2e3ec88c | Merge pull request #1056 in SHRINE/shrine from bugfix/SHRINE2020-594 to develop
* commit '640d85270d7b0c8bc4c785da8c... | | |
Marc-Danie Nazaire | cd658feb5e3 | SHRINE2020-501 - Replace calls to functions in SquerylAdapterDao to corresponding function in QueryHistoryDb - Fixed ... | | |
elizah | 1c25137ac5e | display alert | | |
Marc-Danie Nazaire | 8a67ece03f9 | Merge branches 'develop' and 'feature/SHRINE2020-499' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine in... | | |
Marc-Danie Nazaire | 923729bd22b | SHRINE2020-501 - Replace calls to functions in SquerylAdapterDao to corresponding function in QueryHistoryDb - remove... | | |
Marc-Danie Nazaire | 0b86fc81c96 | Merge branch 'feature/SHRINE2020-499' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRIN... | | |
Marc-Danie Nazaire | 392d1178072 | SHRINE2020-501 - Replace calls to functions in SquerylAdapterDao to corresponding function in QueryHistoryDb | | |
dwalend | 8019c1106c3 | cleared a todo for SHRINE2020-569 | | |
dwalend | f568408e259 | Ran a test and things look better - tests are pretty uneven - for SHRINE2020-369 | | |
bcarmen | e73d3a14e2e | saving work | | |
bcarmen | 8562b4fe783 | fixed package-lock.json | | |
elizah | 647d8f7af9a | show tooltip | | |
elizah | aa480393d7a | add copied tooltip | | |
dwalend | cbfc3b2e4ff | Now running vs scale-up for SHRINE2020-569 | | |
bcarmen | ba8d3371f19 | fixed failing unit test | | |
bcarmen | d645da9a530 | saving work | | |
dwalend | e51c5e86cba | Now getting some good performance numbers for SHRINE2020-569 | | |
dwalend | 40e015cdaf4 | timer delay. three of four stats calculated correctly. Will fix time per query next. | | |
dwalend | 8deb8d8e169 | Closer to driving a real load for SHRINE2020-569 | | |
bcarmen | 5892c91d67b | saving work | | |
dwalend | 4c2f3364a98 | Measuring the time for SHRINE2020-569 | | |
dwalend | 606c55ece64 | Merging fix from SHRINE2020-594 | | |
dwalend | 640d85270d7 | Switched the logic for setting up queues for a netowrk to work with Queues instead of MomQueueNames to fix SHRINE2020... | | |
dwalend | 33f8b816051 | Got a query working in a script for SHRINE2020-569 | | |
bcarmen | 61ad3ad04c8 | saving work | | |
bcarmen | f6ca7c988aa | Merge branch 'develop' into feature/SHRINE2020-518 | | |
elizah | 0142882bdc4 | fix snap | | |
bcarmen | b7dc44aca11 | saving work | | |
David Walend | fbbfcd310cf | Merge pull request #1053 in SHRINE/shrine from feature/SHRINE2020-539 to develop
* commit '0799516b9337498435f5bda58... | | |
David Walend | 5e69f3294ec | Merge pull request #1054 in SHRINE/shrine from bugfix/SHRINE2020-293 to develop
* commit '51be31e48c7b65bdf78647922f... | | |
dwalend | 0b6d93121db | Revived the hub client command line test befor digging into a load driver for SHRINE2020-569 | | |
dwalend | 0799516b933 | Marc-Danie spotted a typo in SHRINE2020-539 | | |
bcarmen | 4289c762666 | added snapshot change | | |
bcarmen | 453aa19e4bc | Merge branch 'develop' into feature/SHRINE2020-518 | | |
elizah | ad71233c5d5 | using div not card | | |
dwalend | d3146057132 | Moved all dispatchers (hub and downstream) to use parallel dispatch after opening the envelope for SHRINE2020-569 | | |
bcarmen | ff104c728f5 | possible fix of drag and drop highlight issues | | |
elizah | 3a1c8677f36 | Merge branch 'feature/SHRINE2020-508' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRIN... | | |
elizah | d0dea43aa23 | config logLevel in xml | | |
dwalend | 51be31e48c7 | Fixed cut-paste error for SHRINE2020-293 | | |
bcarmen | 01405d63b07 | Merge branch 'develop' into bugfix/SHRINE2020-578 | | |
elizah | fc46dd10ec9 | default log lvl to info | | |
elizah | e09fd9cb177 | using dev node | | |
elizah | 9fd6d23b3be | Merge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-519 | | |
bcarmen | 831b1ae78b2 | Merge branch 'develop' into bugfix/SHRINE2020-369 | | |
bcarmen | 970c936341d | fix of error when start query fails | | |
dwalend | cfe172eeb30 | Review feedback from Bill for SHRINE2020-539 | | |
elizah | 0ef606da1cf | Merge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-507 | | |
Marc-Danie Nazaire | fe2c720fdb9 | Added back missing implicit to val resultOutputType | | |
elizah | d6910275864 | fix snap test | | |
elizah | 9e24d09ec43 | merge db changes | | |
Marc-Danie Nazaire | a335e8a32e8 | SHRINE2020-499 - Migrate the BREAKDOWN_RESULT table to Slick - Fixed merge issue | | |
Marc-Danie Nazaire | 07c5485d026 | Merge branch 'feature/SHRINE2020-495' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRIN... | | |
Marc-Danie Nazaire | c79fc43949b | Merge pull request #1021 in SHRINE/shrine from feature/SHRINE2020-495 to develop
* commit '8007ccb1afa59c6c77bc421d6... | | |
Marc-Danie Nazaire | 8007ccb1afa | SHRINE2020-495 - Migrate the COUNT_RESULT and ERROR_RESULT table to Slick - code cleanup | | |
David Walend | 4a7efefccb1 | Merge pull request #1045 in SHRINE/shrine from feature/SHRINE2020-539 to develop
* commit '2538fe40d5d9a779987010914... | | |
Ben Carmen | ee98a625385 | Merge pull request #1047 in SHRINE/shrine from bugfix/SHRINE2020-421 to develop
* commit '2d8ba2ebc0042310e89b180089... | | |
bcarmen | 2d8ba2ebc00 | saving work | | |
elizah | baeb2fa66b9 | remove . | | |
Ben Carmen | b85db89a48d | Merge pull request #1042 in SHRINE/shrine from bugfix/SHRINE2020-572 to develop
* commit '74242226b4bba209e065e87f7a... | | |
bcarmen | 74242226b4b | Merge branch 'develop' into bugfix/SHRINE2020-572 | | |
bcarmen | 122196257f7 | Merge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into develop | | |
bcarmen | 3de5786dff5 | Merge branch 'develop' into feature/SHRINE2020-573 | | |
Ben Carmen | e3dcc7d6610 | Merge pull request #1048 in SHRINE/shrine from bugfix/SHRINE2020-576 to develop
* commit '043d1d6d4548f3a7b9b6b65774... | | |
elizah | c164a4164cb | update snap | | |
elizah | f9ce178a2a6 | change icon and phrase | | |
bcarmen | 8e926fa693e | saving work | | |
elizah | d46c8d5f4fc | change hyper link location | | |
elizah | 8bed5b402a1 | add download icon | | |
elizah | 10707c5d829 | merge develop into branch | | |
elizah | 61111da9a7c | fix select queued query | | |
Marc-Danie Nazaire | 385c2e3d1e0 | SHRINE2020-500 - Migrate remaining functions in SquerylAdapterDao to Slick - added storeBreakdownFailures | | |
Eliza Huang | e6e3c8d5e11 | Merge pull request #987 in SHRINE/shrine from bugfix/SHRINE2020-399 to develop
* commit 'c3c8da177c595cc54b348cf2b97... | | |
elizah | c3c8da177c5 | Merge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into bugfix/SHRINE2020-399 | | |
David Walend | 3af6f497a65 | Merge pull request #1049 in SHRINE/shrine from feature/SHRINE2020-514 to develop
* commit 'ec6447102cf980de092c53bf4... | | |
Marc-Danie Nazaire | c2e772096d2 | SHRINE2020-500 - Migrate remaining functions in SquerylAdapterDao to Slick - fixed typo in imports | | |
| Next → |
