 dwalend | 5a5ffe50e22 | Handled the ugly part of parsing a strange message for SHRINE2020-1424 | | |
 Marc-Danie Nazaire | a4777e9dd99 | SHRINE2020-1267 - Expand/collapse layout to event relationships (Material UI) - Fix wrapping of readable section | | |
Marc-Danie Nazaire | 8be61bf4536 | SHRINE2020-1267 - Expand/collapse layout to event relationships (Material UI) - Fix wrapping of editable section and ... | | |
dwalend | 1596cfb0d6c | Found some old stand-in code while testing SHRINE2020-1266 | | |
Marc-Danie Nazaire | fdf054402b4 | SHRINE2020-1267 - Expand/collapse layout to event relationships (Material UI) | | |
dwalend | 557019a6e90 | todo sweep for SHRINE2020-1266 | | |
dwalend | 05f5898bb30 | More html text for SHRINE2020-1266 | | |
dwalend | 2128ab1918d | Merge remote-tracking branch 'origin/develop' into feature/SHRINE2020-1266 | | |
dwalend | 21d6de06362 | Added html text for relationships and event time spans for SHRINE2020-1266 | | |
 Xavier Haurie | 9a718ab2d60 | Pull request #1407: Feature/SHRINE2020 1265c
Merge in SHRINE/shrine from feature/SHRINE2020-1265c to develop
* comm... | | |
dwalend | a6009844640 | Test of getNetwork I made while working with Nic | | |
dwalend | 63daeb67dbe | Figured out help and version for SHRINE2020-1443 | | |
dwalend | 10965d615f6 | got real messages for help and version for SHRINE2020-1466 | | |
dwalend | ab767e90846 | Merge branch 'feature/SHRINE2020-1443' into feature/SHRINE2020-1446 | | |
dwalend | b03fef889bc | Prereview cleanup for SHRINE2020-1443 | | |
dwalend | b6595f23ea2 | Result CSV from the qep's database for SHRINE2020-1443 | | |
dwalend | a1dd720df01 | Researchers now sourced from the QEP data for SHRINE2020-1443 | | |
dwalend | d85b6af7c4a | Using the QEP's tables for queries for SHRINE2020-1443 | | |
dwalend | bc1c47ced64 | Fixing counts for SHRINE2020-1443 | | |
dwalend | 885352474a2 | Fixing counts for SHRINE2020-1446 | | |
dwalend | 9b44f5e8fae | Lots of renaming for SHRINE2020-1446 | | |
dwalend | d6e67298335 | More renaming for SHRINE2020-1446 | | |
dwalend | 68a2d72338d | Copied the tool for SHRINE2020-1446 | | |
dwalend | d7d891f83d3 | Removed the hub audit tool for SHRINE2020-1446 | | |
dwalend | c4c061d2e69 | Result column rename for SHRINE2020-1443 | | |
dwalend | 3c497ee8be9 | Reordered query columns for SHRINE2020-1443 | | |
dwalend | b17bfe63454 | Renamed query columns per Anupama for SHRINE2020-1443 | | |
dwalend | 96c88b44644 | Anupama's decisions for the researcher CSV for SHRINE2020-1443 | | |
 David Walend | 7bbeef4f6a4 | Pull request #1415: Feature/SHRINE2020 1442
Merge in SHRINE/shrine from feature/SHRINE2020-1442 to develop
* commit... | | |
Marc-Danie Nazaire | 2691e0d8b9e | SHRINE2020-1265 - Augment time gap to event relationship - renamed timeConstraint1 and timeConstraint2 to primaryTime... | | |
Marc-Danie Nazaire | d1804d41b39 | SHRINE2020-1265 - Augment time gap to event relationship - renamed timeSpan1 and timeSpan2 to primaryTimeSpan and sec... | | |
Marc-Danie Nazaire | 07655b2cef5 | SHRINE2020-1265 - Added unit tests for two time spans | | |
Marc-Danie Nazaire | 031def6bca4 | SHRINE2020-1265 - Code review changes from Dave | | |
Marc-Danie Nazaire | b418daf37aa | SHRINE2020-1265 - Reduced font size of timeline link area in UI to reduce text wrapping | | |
Marc-Danie Nazaire | c2b20c04a7e | SHRINE2020-1265 - Disable days if time span 1 is not enabled | | |
Marc-Danie Nazaire | 52c5e7f44e1 | SHRINE2020-1265 - Fix reload of time span operator | | |
Marc-Danie Nazaire | 5423c10f065 | SHRINE2020-1265 - Removed magic strings and disable time span 2 if time span 1 is not selected | | |
dwalend | 09fe84077bc | Merge remote-tracking branch 'origin/develop' into feature/SHRINE2020-1442 | | |
David Walend | 0e98c0863c2 | Pull request #1413: Feature/SHRINE2020 1441
Merge in SHRINE/shrine from feature/SHRINE2020-1441 to develop
* commit... | | |
dwalend | de8bf075b4a | Marc-Danie spotted a problem with newer versions of mysql and distinct SHRINE2020-1442 | | |
dwalend | 11235e60944 | Merge branch 'feature/SHRINE2020-1441' into feature/SHRINE2020-1442 | | |
dwalend | 1f4e0dd803c | Marc-Danie found a problem with distinct in contemporary mariadb versions SHRINE2020-1441 | | |
dwalend | bb9c1b898af | Added a column for the query json for SHRINE2020-1442 | | |
dwalend | 8dafe5f0405 | Merge remote-tracking branch 'origin/develop' into feature/SHRINE2020-1442 | | |
David Walend | 6691b5d9f0d | Pull request #1414: Removing the last bits of the DSA from the codebase for SHRINE2020-1384
Merge in SHRINE/shrine f... | | |
dwalend | f0ed0ab8807 | Hacked in the full text of the query for SHRINE2020-1442 | | |
dwalend | bed65f5a289 | Filtering the researcher csv by researcher for SHRINE2020-1442 | | |
dwalend | d17bbf2ff43 | Changed from datestamps to time in state for result and query states for SHRINE2020-1442 | | |
Marc-Danie Nazaire | 4b8280268fc | Merge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-1265c | | |
Marc-Danie Nazaire | 61ab0a14bd3 | SHRINE2020-1265 - Fixed extraction of second timespan data | | |
dwalend | 583cf9ead0b | Merge remote-tracking branch 'origin/develop' into feature/SHRINE2020-1442 | | |
Marc-Danie Nazaire | 70adb4e83e8 | SHRINE2020-1265c - Refactored setting of time span | | |
Marc-Danie Nazaire | 86dc2ceec2e | SHRINE2020-1265c-Fixed layout of new time span fields | | |
dwalend | d91af130c2d | Removing the last bits of the DSA from the codebase for SHRINE2020-1384 | | |
dwalend | e34324cc34c | Now able to select a single researcher for queries or results csvs for SHRINE2020-1442 | | |
dwalend | f9637d5a4da | Got a results table for SHRINE2020-1442 | | |
dwalend | 6774b686011 | Some refinements, more on results for SHRINE2020-1442 | | |
dwalend | 639882fdd1b | Got what I like for queries compiling, broke results, for SHRINE2020-1442 | | |
dwalend | 503b0b3f5a4 | Added a csv of researchers for SHRINE2020-1442 | | |
dwalend | 2d0c214c8be | Added a table of researchers for SHRINE2020-1442 | | |
dwalend | f14942b482d | Merge remote-tracking branch 'origin/develop' into feature/SHRINE2020-1441 | | |
dwalend | 9a500279869 | Added skeliton of a command to make a CSV of researchers for SHRINE2020-1441 | | |
dwalend | 0f290d6c60a | Added a default output file name for SHRINE2020-1441 | | |
dwalend | 20a1175773c | Handled start and end dates via the scopt API for SHRINE2020-1441 | | |
dwalend | 04f30ec96bd | Tests running in the build for SHRINE2020-1441 | | |
dwalend | 18e9ad36539 | Now using scopt for SHRINE2020-1441 | | |
dwalend | fb70018b8a8 | Added ability to run from any directory for SHRINE2020-1441 | | |
dwalend | 81ee6081bd6 | Now reading the database password from the command line - without dispalyig it - for SHRINE2020-1441 | | |
Marc-Danie Nazaire | 8c7b0ccdd88 | Pull request #1412: SHRINE2020-1445 - Fixed issue with missing shrine-api.war when building docker images
Merge in S... | | |
Marc-Danie Nazaire | 8c6cca2d22b | SHRINE2020-1445 - Fixed issue with missing shrine-api.war when building docker images | | |
dwalend | f844788879d | Renamed testDataSource to dataSourceConfig for SHRINE2020-1441 | | |
dwalend | 36e83be6538 | Copied and renamed the hub metrics tool to make a query metrics tool for SHRINE2020-1441 - currently only works at th... | | |
dwalend | 74542ff4a51 | Copied the hub's metric tool into the QEP's for SHRINE2020-1441 | | |
dwalend | 4fa3c0fbe73 | Made the QEP schema taller SHRINE2020-1441 | | |
Xav | db1e4aba766 | SHRINE2020-1265 : rename timeSpan to timeSpan1 for compatibility with b/e. Not bug free however. | | |
Marc-Danie Nazaire | bf50d4b7e5d | Pull request #1411: SHRINE2020-1407 - Fix spacing in the summary panel at the top of the results view
Merge in SHRIN... | | |
Xav | 90d0d6e628b | SHRINE2020-1265 : add tests with a single event and 0 or 1 time spans | | |
Xav | 94f82e94c53 | SHRINE2020-1265 : add a test with a single event and two time spans, rename variable and JSON file names for clarity | | |
Marc-Danie Nazaire | 013a6d4e74a | SHRINE2020-1407 - Fix spacing in the summary panel at the top of the results view | | |
Xav | 59a3bc6c9d4 | SHRINE2020-1265 : add to tests for the QEP service layer | | |
Marc-Danie Nazaire | c81f770caf2 | Pull request #1410: SHRINE2020-1406 - Settle on layout in the Run Query bar now that topics are gone
Merge in SHRINE... | | |
Xav | 8075ae732f9 | SHRINE2020-1265 : tweak test code and Timeline.scala as needed after adding second timespan | | |
dwalend | a09f1652d05 | Added support for 0, 1, or 2 span tags in i2b2 xml for SHRINE2020-1265 | | |
Xav | 607b713db10 | Merge branch 'feature/SHRINE2020-1265c' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHR... | | |
Xav | 1d24eca141f | SHRINE2020-1265 : commit WIP so Dave can work on it | | |
Marc-Danie Nazaire | 807d85e5c9c | SHRINE2020-1406 - Settle on layout in the Run Query bar now that topics are gone | | |
David Walend | c248f0d9e97 | Pull request #1408: Feature/SHRINE2020 1404
Merge in SHRINE/shrine from feature/SHRINE2020-1404 to develop
* commit... | | |
dwalend | 24356d39ef0 | Cleared a bunch of printlns from tests while sitting in a parking lot trying not to look too seedy for SHRINE2020-1404 | | |
dwalend | cb8b2eaf485 | Cleared up the version conflicts for SHRINE2020-1404 | | |
dwalend | 3e9558c8657 | Use the parameter for the javax servlet api for SHRINE2020-1404 | | |
dwalend | 90897d52b97 | merging | | |
dwalend | 7ccd7517193 | Checkmarx server URL - getting closer to running checkmarx from maven for SHRINE2020-1415 | | |
dwalend | 1a3121124e4 | Sorted the properties in the pom.xml for SHRINE2020-1404 | | |
Xav | 9442c2130db | SHRINE2020-1265 : fix operator drop-down menu | | |
Xav | abd927a4176 | SHRINE2020-1265 : added operator menu | | |
David Walend | 47e3a0721cd | Pull request #1405: Move to Scala 2.13.11, and a fix in some Authz code that went from warn to error for SHRINE2020-1... | | |
David Walend | 7b2443e8623 | Pull request #1403: Feature/SHRINE2020 1431
Merge in SHRINE/shrine from feature/SHRINE2020-1431 to develop
* commit... | | |
Xav | dd8132b922e | SHRINE2020-1265 : set default timestamp unit to "DAY", not "Day" | | |
Marc-Danie Nazaire | ba830bbd9a8 | Pull request #1406: SHRINE2020-1405 - Fix setting of kafka version used in docker
Merge in SHRINE/shrine from bugfix... | | |
dwalend | e4df7356f2e | merging | | |
David Walend | 3f7e2690a83 | Pull request #1404: Feature/SHRINE2020 1421
Merge in SHRINE/shrine from feature/SHRINE2020-1421 to develop
* commit... | | |
Marc-Danie Nazaire | dbeac2901f7 | SHRINE2020-1405 - Fix setting of kafka version used in docker | | |
Xav | e63113c2320 | SHRINE2020-1265 : make timespan units menu work and submitted to the b/e, although it is still needs to be pre-populated | | |
Xav | a53383f6c66 | SHRINE2020-1265 : fix regression on relationship menu; try to make timespan untis menu work | | |
Xav | 56d6fbc01d2 | Merge branch 'feature/SHRINE2020-1265c' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHR... | | |
Xav | a2741c32ea8 | SHRINE2020-1265 : Many of the UI elements behave as expected, i.e. have state and do not break the f/e-to-b/e interfa... | | |
dwalend | d81f37cc158 | Mergig from develop | | |
dwalend | 9700af4d5b8 | Marc-Danie review comments for SHRINE2020-1431 | | |
dwalend | b5ee7665c21 | Move to Scala 2.13.11, and a fix in some Authz code that went from warn to error for SHRINE2020-1347 | | |
dwalend | b2cf8f096ee | Merge remote-tracking branch 'origin/develop' into SHRINE2020-1378-remove-dsa | | |
dwalend | 46a27680657 | Merge remote-tracking branch 'origin/develop' into feature/SHRINE2020-1421 | | |
dwalend | d762efabb1d | Some sad todos to reenable unit tests after we or slick takes care of some other bugs for SHRINE2020-1421 | | |
dwalend | 29fca669803 | Cleaned up some tests around Loggable for SHRINE2020-1421 | | |
Marc-Danie Nazaire | c3a4b3ac3b6 | SHRINE2020-1265c - Fixed setting of dropdown values | | |
David Walend | 0324684cff9 | Pull request #1401: Switched unit test log level to warn for SHRINE2020-1417
Merge in SHRINE/shrine from feature/SHR... | | |
David Walend | c2031b83d79 | Pull request #1399: Warning goes away when I put both execution sections in the same plugin declaration for SHRINE202... | | |
David Walend | ae9389ac5fa | Pull request #1400: Switched to a less complicated timestamp format for SHRINE2020-1419
Merge in SHRINE/shrine from ... | | |
dwalend | 528062ae529 | Some cleanup while doing SHRINE2020-1431 | | |
dwalend | 45801030f4f | Removed another warning for SHRINE2020-1431 | | |
Xav | 1f233547ea5 | SHRINE2020-1265 : Fix two failing tests after changes | | |
dwalend | 3b3247a00a5 | A couple of tweaks to fix the compile for SHRINE2020-1265 | | |
Xav | 2fdf8055a98 | SHRINE2020-1265c : Try to make it all work for 1 timespan UI widget | | |
Xav | 75a821e0e33 | SHRINE2020-1265c : cherry pick from 1265 (case object examples (that don't compile) for SHRINE2020-1265 e8ffad0ed dwa... | | |
Xav | 065d3231d8d | SHRINE2020-1265c : fix test | | |
Xav | 692d06419af | SHRINE2020-1265c : fix tests | | |
Xav | 982cda32f2d | SHRINE2020-1265 : fix constant names, perhaps temporarily | | |
dwalend | e8ffad0ed4f | case object examples (that don't compile) for SHRINE2020-1265 | | |
dwalend | bd4256e149c | Fixing an indent for SHRINE2020-1431 | | |
Xav | adc1da7e68b | SHRINE2020-1265 : minimal renaming which highlights the need for more renameing/code changes ; rename two failing te... | | |
Xav | 603010a12c1 | SHRINE2020-1265 : implement 1 timespan widget (operator/value/unit) which make it to the API payload, 2 broken f/e te... | | |
dwalend | db41fd75c99 | Adding maven-resources-plugin cleared one of the problems in SHRINE2020-1431 | | |
dwalend | 0ee9164df3d | Cherry-picked the fix for the build jitter problem from SHRINE2020-1393 to SHRINE2020-1265 | | |
dwalend | 22ef86c461f | Switched to a less complicated timestamp format for SHRINE2020-1419 | | |
dwalend | 3606a420b1b | Warning goes away when I put both execution sections in the same plugin declaration for SHRINE2020-1418 | | |
dwalend | 07cd28b9af7 | Switched unit test log level to warn for SHRINE2020-1417 | | |
dwalend | 5065768b871 | Merge branch 'feature/SHRINE2020-1379-remove-topics' into SHRINE2020-1378-remove-dsa | | |
dwalend | 7c3db49ae5a | Merge remote-tracking branch 'origin/develop' into feature/SHRINE2020-1379-remove-topics | | |
dwalend | 6a3da313821 | Merge remote-tracking branch 'origin/develop' into feature/SHRINE2020-1432 | | |
dwalend | 7b7b242bba6 | Log setting to remove all the INFO lines from maven's output for SHRINE2020-1432 | | |
Xav | 3505cae7d6b | Merge branch 'develop' into feature/SHRINE2020-1264 | | |
dwalend | 48593837895 | Parking work on SHRINE2020-1415 while I wait to hear from HMS IT Security about SHRINE using their server | | |
Xav | ae677a5f653 | SHRINE2020-1264: remove some todos | | |
Xav | e55b5bd5965 | Merge branch 'feature/SHRINE2020-1264' into feature/SHRINE2020-1265 | | |
Xav | f21c180efe5 | Revert "created two stateful checkboxes, for SHRINE2020-1265"
This reverts commit 81feae88ea93c3490c850b280d38bdea67... | | |
Xav | ba4b37b944c | SHRINE2020-1264: reset to what it was before started work on 1264 | | |
Marc-Danie Nazaire | 73ea4059adc | Pull request #1397: SHRINE2020-1412 - Remove hard coded tag of "powered by ..." from header and place in footer in 3.... | | |
Marc-Danie Nazaire | 88d9b11200d | SHRINE2020-1412 - Remove hard coded tag of "powered by ..." from header and place in footer in 3.3 line - fixed bad m... | | |
Marc-Danie Nazaire | fdca8d4be00 | Merge branch 'feature/Custom_Breakdowns_3_3_0' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feat... | | |
Marc-Danie Nazaire | 678cfce123e | Pull request #1396: SHRINE2020-1411 - Create new header variable in shrine.conf; remove reference to network name var... | | |
Marc-Danie Nazaire | e514aeeadab | SHRINE2020-1412 - Remove hard coded tag of "powered by ..." from header and place in footer in 3.3 line | | |
Marc-Danie Nazaire | 049ca8e3266 | SHRINE2020-1411 - Create new header variable in shrine.conf; remove reference to network name variable | | |
dwalend | 49675a90563 | Merge remote-tracking branch 'origin/feature/SHRINE2020-1379-remove-topics' into SHRINE2020-1378-remove-dsa | | |
David Walend | d3af4d125e4 | Pull request #1384: Bugfix/SHRINE2020 1393 something strange is going on in the json stored at the qep
Merge in SHRI... | | |
David Walend | f0980cedfed | Pull request #1395: Feature/SHRINE2020 1403
Merge in SHRINE/shrine from feature/SHRINE2020-1403 to SHRINE2020-1378-r... | | |
Xav | 9670f31ada3 | SHRINE2020-1264: works with refactored / more object-oriented code | | |
Marc-Danie Nazaire | 9cc8e5bbab5 | Pull request #1394: SHRINE2020-826 - Bar graphs: Different width size is appearing for 'Demographic distribution by S... | | |
dwalend | 82104105819 | Merge branch 'feature/SHRINE2020-1379-remove-topics' into bugfix/SHRINE2020-1393-something-strange-is-going-on-in-the... | | |
dwalend | afcfb6652a6 | Merge branch 'SHRINE2020-1378-remove-dsa' into feature/SHRINE2020-1403 | | |
dwalend | bf33226f46d | Merging SHRINE2020-1401 from develop | | |
dwalend | b2f149b3f16 | Merge remote-tracking branch 'origin/develop' into feature/SHRINE2020-1379-remove-topics | | |
David Walend | a503cb4e60e | Pull request #1390: Bugfix/SHRINE2020 1401
Merge in SHRINE/shrine from bugfix/SHRINE2020-1401 to develop
* commit '... | | |
dwalend | 2f439c3da7d | Merge remote-tracking branch 'origin/feature/SHRINE2020-1379-remove-topics' into bugfix/SHRINE2020-1393-something-str... | | |
dwalend | efdc01e3d07 | Updating this SHRINE 1.20-era sql for SHRINE2020-1403 | | |
dwalend | b409caa6b66 | Some more topics to remove from json tests for SHRINE2020-1403 | | |
Xav | 81feae88ea9 | created two stateful checkboxes, for SHRINE2020-1265 | | |
David Walend | 9f573160799 | Pull request #1387: Feature/SHRINE2020 1390
Merge in SHRINE/shrine from feature/SHRINE2020-1390 to feature/SHRINE202... | | |
Marc-Danie Nazaire | 0ece84183ce | SHRINE2020-826 - Bar graphs: Different width size is appearing for 'Demographic distribution by Sex' bar graph as com... | | |
dwalend | 253c998fcc5 | Removed more topics for SHRINE2020-1403 | | |
dwalend | 8710abf2547 | Removed almost all things topic, and the v1 protocol for SHRINE2020-1403 | | |
Marc-Danie Nazaire | 2b4af141eb0 | Pull request #1393: SHRINE2020-1397 - New breakdowns are displayed under heading Demographic distribution.
Merge in ... | | |
Marc-Danie Nazaire | 301e71638b4 | Pull request #1392: SHRINE2020-1398 - Whole screen goes white on clicking outside new breakdown pop-up
Merge in SHRI... | | |
Xav | 6fb9b437c64 | made relationship values in the front end match the back-end, for SHRINE2020-1264 | | |
Marc-Danie Nazaire | 6810b81a825 | SHRINE2020-1397 - New breakdowns are displayed under heading Demographic distribution. Also tooltip for download icon... | | |
Xav | c1a5dbc45ae | made relationship not optional, for SHRINE2020-1264 | | |
Marc-Danie Nazaire | 08ce4d668e4 | SHRINE2020-1398 - Whole screen goes white on clicking outside new breakdown pop-up | | |
dwalend | 61e441cde72 | More and more merging | | |
dwalend | 59e29da310f | Merging | | |
dwalend | f629570f449 | Merging remove topics into remove dsa | | |
dwalend | c49c0cf3ba3 | merging from develop | | |
dwalend | 3d2a60d7137 | Merge remote-tracking branch 'origin/develop' into bugfix/SHRINE2020-1401 | | |
Xav | ec4a1035a8c | made relationship not optional, for SHRINE2020-1264 | | |
dwalend | 86c431502d9 | Dropping unused reporting plugins from the QEP pom.xml for SHRINE2020-1401 | | |
Xav | 31cea3b0fd2 | changed "occurrenceValue" to "relationship" in the code, fixed unit f/e tests accordingly, for SHRINE2020-1264 | | |
dwalend | 69c72e39946 | Some more cleanup for SHRINE2020-1401 | | |
dwalend | 5b7c2e0571f | Moved all the plugin version numbers to the big list of versions for SHRINE2020-1401 | | |
dwalend | de63b40c165 | Docker plugin is now building without downloanding log4j for SHRINE2020-1401 | | |
Marc-Danie Nazaire | de6bf34ca1e | SHRINE2020-1390 - Remove topic selection and create, widgets, and topic id fields from the front-end code - Adjusted ... | | |
Xav | cab75b62380 | Merge branch 'develop' into feature/SHRINE2020-1264 | | |
| Next → |
