 Marc-Danie Nazaire | 3bf38f189d8 | Pull request #1426: Feature/SHRINE2020 1392 - Create TOU Acknowledgement Page Post login
Merge in SHRINE/shrine from... | | |
Marc-Danie Nazaire | b85c3ecf7eb | Pull request #1431: SHRINE2020-1490 - Modify the Oracle sql to remove the check constraint on TYPE column of the QUER... | | |
 David Walend | caf724a4a9c | Pull request #1433: Column name and order fixes for SHRINE2020-1488
Merge in SHRINE/shrine from bugfix/SHRINE2020-14... | | |
 dwalend | ea048f4b7d9 | Column name and order fixes for SHRINE2020-1488 | | |
 Xav | 9876698e98f | Merge branch 'develop' into feature/SHRINE2020-1465 | | |
Xav | 67c05b180ba | SHRINE2020-1465 : merge from develop | | |
dwalend | dd1cf113d57 | Merge remote-tracking branch 'origin/milestone/4.2.0-M1' into develop | | |
dwalend | 3b8c7a4f43f | Merge branch 'milestone/4.2.0-M1' into develop | | |
Marc-Danie Nazaire | 496fd878a2c | SHRINE2020-1489 - Fix alphanumeric sorting of breakdown results | | |
Marc-Danie Nazaire | 53dc50d4345 | SHRINE2020-1490 - Modify the Oracle sql to remove the check constraint on TYPE column of the QUERY_RESULT table to be... | | |
Marc-Danie Nazaire | 3283c8c21ed | SHRINE2020-1490 - Modify the Oracle sql to remove the check constraint on TYPE column of the QUERY_RESULT table to be... | | |
dwalend | c36834207e1 | Some QEP tests for SHRINE2020-1477 | | |
dwalend | bd2f14604ab | QEP to/from translation to v2 for SHRINE2020-1477 passes all existing tests | | |
Marc-Danie Nazaire | 0e9b53be850 | SHRINE2020-1484 - Temporal > Count patients button gets disabled by entering correct value in And text box in case us... | | |
Marc-Danie Nazaire | d3e62590039 | Pull request #1430: SHRINE2020-1484 - Temporal > Count patients button gets disabled by entering correct value in And... | | |
Marc-Danie Nazaire | 0a8586c7802 | Update version in POM to 3.3.1 | | |
David Walend | b41c1e9964e | Pull request #1429: Bugfix/SHRINE2020 1481
Merge in SHRINE/shrine from bugfix/SHRINE2020-1481 to milestone/4.2.0-M1
... | | |
dwalend | a9aafa52e11 | Translating linked concept groups to i2b2 panel timing for SHRINE2020-1477 | | |
Marc-Danie Nazaire | 5a24b59e319 | SHRINE2020-1392-Create TOU Acknowledgement Page Post login -Removed terms of use text config override in docker | | |
Marc-Danie Nazaire | 4a800d7818b | Merge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-1392 | | |
Xavier Haurie | 607cdf7fb6e | Pull request #1421: SHRINE2020-1467 back-end: pass TOU from config file to the front end
Merge in SHRINE/shrine from... | | |
Marc-Danie Nazaire | e7a8e648571 | SHRINE2020-1467 - Configurable text for TOU Acknowledgment- Removed comments for shrine.conf used in qep service tests | | |
Marc-Danie Nazaire | 13462217827 | SHRINE2020-1484 - Temporal > Count patients button gets disabled by entering correct value in And text box in case us... | | |
dwalend | 81b3aef4d4e | Some round-trip tests for SHRINE2020-1477 | | |
dwalend | e1f77bcf8b9 | Structure for linked concept groups for SHRINE2020-1477 | | |
Marc-Danie Nazaire | b204642288a | SHRINE2020-1482 - Temporal Query > On reloading a query with Less thans equals to selected in by/And operator, it alw... | | |
Marc-Danie Nazaire | d7bf3c16300 | Pull request #1428: SHRINE2020-1482 - Temporal Query > On reloading a query with Less thans equals to selected in by/... | | |
dwalend | cf8db0412fa | Moved the test query strings into code for SHRINE2020-1481 | | |
dwalend | ca65bb66f1d | Removed some stray printlns for SHRINE2020-1481 | | |
Marc-Danie Nazaire | ba03b203ff7 | SHRINE2020-1467 - Configurable text for TOU Acknowledgment- Made termsOfUseText webclient config not optional | | |
Marc-Danie Nazaire | 1311ac2cf64 | SHRINE2020-1467 - Configurable text for TOU Acknowledgment- Cleanup shrine-setup configs | | |
Marc-Danie Nazaire | 8e19dda3e05 | SHRINE2020-1482 - Temporal Query > On reloading a query with Less thans equals to selected in by/And operator, it alw... | | |
Marc-Danie Nazaire | 7bcac6a831d | SHRINE2020-1465 - Small edit of comment for bannerText | | |
Marc-Danie Nazaire | e22f7cce3b7 | SHRINE2020-1465 - Reset value of i2b2ShrineProjectName | | |
Marc-Danie Nazaire | 9f3bc33c0a1 | SHRINE2020-1465 - Fixed bannerText and i2b2ShrineProjectName in the shrine-setup configs | | |
dwalend | b43d024edd5 | Interpretted time constraint logic in i2b2 xml for SHRINE2020-1481 | | |
Xav | 5c0dff8ada5 | SHRINE2020-1465 : integrate PR feedback | | |
dwalend | 46b04ec59a4 | Moved the revision to 4.2.0-M1 | | |
David Walend | 1a12a28e122 | Pull request #1427: Feature/SHRINE2020 1266
Merge in SHRINE/shrine from feature/SHRINE2020-1266 to develop
* commit... | | |
Xav | 24ce97924bb | SHRINE2020-1465 : integrate PR feedback | | |
Xav | 3e03a777fdc | SHRINE2020-1465 : integrate PR feedback | | |
dwalend | a5c734a1b8c | Arg. Test case for SHRINE2020-1266 | | |
dwalend | d16c9926910 | Post-BA-review cleanup for SHRINE2020-1266 | | |
dwalend | eb068c22ba3 | Lower case and for SHRINE2020-1266 | | |
Marc-Danie Nazaire | 934c8126bb0 | Merge branch 'SHRINE2020-1467-back-end' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHR... | | |
Marc-Danie Nazaire | 13e18bb0fd0 | SHRINE2020-1467 - Configurable text for TOU Acknowledgment | | |
dwalend | 5a86f32d6f1 | Some refactoring to make the code more readable for SHRINE2020-1266 | | |
Xav | cbf0d53457d | SHRINE2020-1465 : got tid of i2b2ShrineNetworkBanner | | |
dwalend | 2388c0b55c7 | All that and just one space to fix for SHRINE2020-1266 | | |
Xav | 8e13d5e067a | Merge branch 'SHRINE2020-1465' into feature/SHRINE2020-1465 | | |
Xav | f86b01b7276 | SHRINE2020-1465 : uses reference.conf files | | |
dwalend | 0e76f73b6bd | I think the whole checklist for the latest changes to the query-as-text for SHRINE2020-1266 | | |
dwalend | 0c3c39ba022 | Changed comparison words in stand-off constraints in timelines to symbols for SHRINE2020-1266 | | |
Marc-Danie Nazaire | 3cb720d9fda | SHRINE2020-1469 - Detect change in TOU | | |
Marc-Danie Nazaire | fad8107d925 | SHRINE2020-1469 - Detect change in TOU | | |
Marc-Danie Nazaire | ab6120a31f3 | SHRINE2020-1469 - Detect change in TOU | | |
Marc-Danie Nazaire | b26420cf921 | SHRINE2020-1468 - Client side implementation for (Remember for 30 days) - Added front-end tests | | |
Marc-Danie Nazaire | a42b094bec2 | SHRINE2020-1468 - Client side implementation for (Remember for 30 days) - Do not show terms of text popup until the ... | | |
dwalend | 35dd841086c | Change to time-bound concept groups for SHRINE2020-1266 | | |
dwalend | ab4c2b8f595 | Added a quick test to help Nic Dobbins with leaf - not really for SHRINE2020-1266 | | |
dwalend | 61cf2d1cee9 | Merge remote-tracking branch 'origin/develop' into feature/SHRINE2020-1266 | | |
Marc-Danie Nazaire | f79a0de56f4 | SHRINE2020-1468 - Client side implementation for (Remember for 30 days) | | |
Xav | 48d2bd3a123 | SHRINE2020-1467-back-end last bits from the PR | | |
Marc-Danie Nazaire | 7f31765cfbb | Merge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-1392 | | |
Marc-Danie Nazaire | 076d031f763 | Pull request #1425: SHRINE2020-1268 - Add validation to date fields for event relationships
Merge in SHRINE/shrine f... | | |
Marc-Danie Nazaire | f5eda7d56cf | SHRINE2020-1268 - Add validation to date fields for event relationships - Fixed max time span value issue | | |
dwalend | 8f90a1a474f | Merge remote-tracking branch 'origin/develop' into feature/SHRINE2020-1266 | | |
Marc-Danie Nazaire | 5659c715c52 | SHRINE2020-1268 - Add validation to date fields for event relationships - Created new function preventNonIntegerInput | | |
Marc-Danie Nazaire | 1b0629180aa | SHRINE2020-1268 - Add validation to date fields for event relationships - allow 0 for secondary time span value | | |
Marc-Danie Nazaire | 112758e7ffb | Pull request #1424: Feature/SHRINE2020 1267 -Expand/collapse layout to event relationships (Material UI)
Merge in SH... | | |
David Walend | 634c77f648e | Pull request #1416: Feature/SHRINE2020 1446
Merge in SHRINE/shrine from feature/SHRINE2020-1446 to develop
* commit... | | |
Marc-Danie Nazaire | 07e38f89047 | SHRINE2020-1392-Create TOU Acknowledgement Page Post login - Changes button label to I Acknowledge | | |
Marc-Danie Nazaire | e5600744acc | SHRINE2020-1392-Create TOU Acknowledgement Page Post login - Do not close dialog on clicking ESC button | | |
Marc-Danie Nazaire | d6e21805738 | SHRINE2020-1392-Create TOU Acknowledgement Page Post login | | |
Xav | 9b8e58c1d96 | SHRINE2020-1465 : move "Powered by the NCATS CTSA Program" to the footer, based on SHRINE2020-1412 | | |
Xav | 039cf3a90a4 | SHRINE2020-1465 : remove "the" from static text around network name; move "Powered by the NCATS CTSA Program" to the ... | | |
Xav | c27ff6cf32b | SHRINE2020-1465 : create new config setting for banner text distinct from network name | | |
Xav | cd009c709b7 | SHRINE2020-1467 back-end: improvements as per PR: do not set termsOfUseText where it already has a defaukt value | | |
Xav | 41bc4b5c36e | SHRINE2020-1467 back-end: pass TOU from config file to the front end | | |
Marc-Danie Nazaire | fe15fbf23fd | SHRINE2020-1268 - Add validation to date fields for event relationships | | |
Xav | 55904930c9d | SHRINE2020-1265 : rename shrine.conf setting to specify the content of the "please accept this verbiage" text | | |
Xav | fdb60a1cd61 | SHRINE2020-1265 : add shrine.conf setting to specify the content of the "please accept this verbiage" text | | |
David Walend | 8ebdeba03b7 | Pull request #1418: Changed the front-end javascript build to a pom to get rid of the empty jar warning for SHRINE202... | | |
David Walend | 5c8f810ecdf | Pull request #1417: Handled the ugly part of parsing a strange message for SHRINE2020-1424
Merge in SHRINE/shrine fr... | | |
dwalend | 1cf3dc87fd3 | Merge branch 'feature/SHRINE2020-1443' into feature/SHRINE2020-1446 | | |
dwalend | 4191760a623 | Changed the front-end javascript build to a pom to get rid of the empty jar warning for SHRINE2020-1428 | | |
dwalend | 82cb4797378 | Can do a little better to make sure the xml is in the exception message for SHRINE2020-1424 | | |
dwalend | 60fca9d63a8 | Handled the ugly part of parsing a strange message for SHRINE2020-1424 | | |
Marc-Danie Nazaire | 2ae9331f521 | SHRINE2020-1267 - Expand/collapse layout to event relationships (Material UI) - Fix wrapping of readable section | | |
Marc-Danie Nazaire | 1a339f53aa3 | SHRINE2020-1267 - Expand/collapse layout to event relationships (Material UI) - Fix wrapping of editable section and ... | | |
dwalend | a4b83921ddf | Found some old stand-in code while testing SHRINE2020-1266 | | |
Marc-Danie Nazaire | 5f669eeb11d | SHRINE2020-1267 - Expand/collapse layout to event relationships (Material UI) | | |
dwalend | b2d4c8d3307 | todo sweep for SHRINE2020-1266 | | |
dwalend | 13f029c6ffe | More html text for SHRINE2020-1266 | | |
dwalend | 3a80d32674d | Merge remote-tracking branch 'origin/develop' into feature/SHRINE2020-1266 | | |
dwalend | c28cac6a2e6 | Added html text for relationships and event time spans for SHRINE2020-1266 | | |
Xavier Haurie | 436451935de | Pull request #1407: Feature/SHRINE2020 1265c
Merge in SHRINE/shrine from feature/SHRINE2020-1265c to develop
* comm... | | |
dwalend | 30e3167860b | Test of getNetwork I made while working with Nic | | |
dwalend | 0f02a72ff46 | Figured out help and version for SHRINE2020-1443 | | |
dwalend | 9b370410294 | got real messages for help and version for SHRINE2020-1466 | | |
dwalend | 8ecb20f2eed | Merge branch 'feature/SHRINE2020-1443' into feature/SHRINE2020-1446 | | |
dwalend | aed6aee312b | Prereview cleanup for SHRINE2020-1443 | | |
dwalend | 8a3c853fdb5 | Result CSV from the qep's database for SHRINE2020-1443 | | |
dwalend | 80676a1b9ea | Researchers now sourced from the QEP data for SHRINE2020-1443 | | |
dwalend | 3c408f465c6 | Using the QEP's tables for queries for SHRINE2020-1443 | | |
dwalend | 93c818d78a7 | Fixing counts for SHRINE2020-1443 | | |
dwalend | 6f75a1d064b | Fixing counts for SHRINE2020-1446 | | |
dwalend | 9ec57878b12 | Lots of renaming for SHRINE2020-1446 | | |
dwalend | 443a5c3bbf3 | More renaming for SHRINE2020-1446 | | |
dwalend | 09d71676dbf | Copied the tool for SHRINE2020-1446 | | |
dwalend | 3284038b5ee | Removed the hub audit tool for SHRINE2020-1446 | | |
dwalend | 4bc67ae9757 | Result column rename for SHRINE2020-1443 | | |
dwalend | b3501ad8f52 | Reordered query columns for SHRINE2020-1443 | | |
dwalend | 066ba004336 | Renamed query columns per Anupama for SHRINE2020-1443 | | |
dwalend | cf3aaf32d64 | Anupama's decisions for the researcher CSV for SHRINE2020-1443 | | |
David Walend | 03b7daa6d5c | Pull request #1415: Feature/SHRINE2020 1442
Merge in SHRINE/shrine from feature/SHRINE2020-1442 to develop
* commit... | | |
Marc-Danie Nazaire | e5e6e4dbd74 | SHRINE2020-1265 - Augment time gap to event relationship - renamed timeConstraint1 and timeConstraint2 to primaryTime... | | |
Marc-Danie Nazaire | 11373b01f7f | SHRINE2020-1265 - Augment time gap to event relationship - renamed timeSpan1 and timeSpan2 to primaryTimeSpan and sec... | | |
Marc-Danie Nazaire | 04f67973f95 | SHRINE2020-1265 - Added unit tests for two time spans | | |
Marc-Danie Nazaire | 36af6179a78 | SHRINE2020-1265 - Code review changes from Dave | | |
Marc-Danie Nazaire | 2902ca1793b | SHRINE2020-1265 - Reduced font size of timeline link area in UI to reduce text wrapping | | |
Marc-Danie Nazaire | 3001c6c3e16 | SHRINE2020-1265 - Disable days if time span 1 is not enabled | | |
Marc-Danie Nazaire | 0fa13a88505 | SHRINE2020-1265 - Fix reload of time span operator | | |
Marc-Danie Nazaire | 6b49bfab640 | SHRINE2020-1265 - Removed magic strings and disable time span 2 if time span 1 is not selected | | |
dwalend | d0731678a22 | Merge remote-tracking branch 'origin/develop' into feature/SHRINE2020-1442 | | |
David Walend | 4a344e06a28 | Pull request #1413: Feature/SHRINE2020 1441
Merge in SHRINE/shrine from feature/SHRINE2020-1441 to develop
* commit... | | |
dwalend | 8e121707437 | Marc-Danie spotted a problem with newer versions of mysql and distinct SHRINE2020-1442 | | |
dwalend | 6c1b6a7746f | Merge branch 'feature/SHRINE2020-1441' into feature/SHRINE2020-1442 | | |
dwalend | c0c919f7a8d | Marc-Danie found a problem with distinct in contemporary mariadb versions SHRINE2020-1441 | | |
dwalend | 82464af9436 | Added a column for the query json for SHRINE2020-1442 | | |
dwalend | c7f72fc2bcc | Merge remote-tracking branch 'origin/develop' into feature/SHRINE2020-1442 | | |
David Walend | 23be1c058e4 | Pull request #1414: Removing the last bits of the DSA from the codebase for SHRINE2020-1384
Merge in SHRINE/shrine f... | | |
dwalend | 250d07170ca | Hacked in the full text of the query for SHRINE2020-1442 | | |
dwalend | ec48015349b | Filtering the researcher csv by researcher for SHRINE2020-1442 | | |
dwalend | 63013073a07 | Changed from datestamps to time in state for result and query states for SHRINE2020-1442 | | |
Marc-Danie Nazaire | b10a2c22b49 | Merge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-1265c | | |
Marc-Danie Nazaire | a645ca91462 | SHRINE2020-1265 - Fixed extraction of second timespan data | | |
dwalend | e83bdbe2873 | Merge remote-tracking branch 'origin/develop' into feature/SHRINE2020-1442 | | |
Marc-Danie Nazaire | 08a67186e17 | SHRINE2020-1265c - Refactored setting of time span | | |
Marc-Danie Nazaire | 396c79d4c2c | SHRINE2020-1265c-Fixed layout of new time span fields | | |
dwalend | 987547a0d49 | Removing the last bits of the DSA from the codebase for SHRINE2020-1384 | | |
dwalend | 635b32c960b | Now able to select a single researcher for queries or results csvs for SHRINE2020-1442 | | |
dwalend | f12504ec39d | Got a results table for SHRINE2020-1442 | | |
dwalend | 9c983f05ba3 | Some refinements, more on results for SHRINE2020-1442 | | |
dwalend | b681b6e61d5 | Got what I like for queries compiling, broke results, for SHRINE2020-1442 | | |
dwalend | 2542d9b23c5 | Added a csv of researchers for SHRINE2020-1442 | | |
dwalend | f4d2d08d594 | Added a table of researchers for SHRINE2020-1442 | | |
dwalend | a042524741b | Merge remote-tracking branch 'origin/develop' into feature/SHRINE2020-1441 | | |
dwalend | 4c9b23e3d21 | Added skeliton of a command to make a CSV of researchers for SHRINE2020-1441 | | |
dwalend | 3ebe3b0049d | Added a default output file name for SHRINE2020-1441 | | |
dwalend | a1ec8356734 | Handled start and end dates via the scopt API for SHRINE2020-1441 | | |
dwalend | cc57012dbb7 | Tests running in the build for SHRINE2020-1441 | | |
dwalend | ef0daba8e06 | Now using scopt for SHRINE2020-1441 | | |
dwalend | 06d0c359e8f | Added ability to run from any directory for SHRINE2020-1441 | | |
dwalend | d0997a92e0f | Now reading the database password from the command line - without dispalyig it - for SHRINE2020-1441 | | |
Marc-Danie Nazaire | 02a87c02ae9 | Pull request #1412: SHRINE2020-1445 - Fixed issue with missing shrine-api.war when building docker images
Merge in S... | | |
Marc-Danie Nazaire | a1c85674f1c | SHRINE2020-1445 - Fixed issue with missing shrine-api.war when building docker images | | |
dwalend | 4db8c0cea82 | Renamed testDataSource to dataSourceConfig for SHRINE2020-1441 | | |
dwalend | 4a96da18be6 | Copied and renamed the hub metrics tool to make a query metrics tool for SHRINE2020-1441 - currently only works at th... | | |
dwalend | 9c1bf5a7822 | Copied the hub's metric tool into the QEP's for SHRINE2020-1441 | | |
dwalend | bbb9fb88f35 | Made the QEP schema taller SHRINE2020-1441 | | |
Xav | 6546d783c66 | SHRINE2020-1265 : rename timeSpan to timeSpan1 for compatibility with b/e. Not bug free however. | | |
Marc-Danie Nazaire | 907f833d6a1 | Pull request #1411: SHRINE2020-1407 - Fix spacing in the summary panel at the top of the results view
Merge in SHRIN... | | |
Xav | f74613cb8bc | SHRINE2020-1265 : add tests with a single event and 0 or 1 time spans | | |
Xav | 680f6946a4a | SHRINE2020-1265 : add a test with a single event and two time spans, rename variable and JSON file names for clarity | | |
Marc-Danie Nazaire | 004a83bc954 | SHRINE2020-1407 - Fix spacing in the summary panel at the top of the results view | | |
Xav | 558b54c2b50 | SHRINE2020-1265 : add to tests for the QEP service layer | | |
Marc-Danie Nazaire | 11b31da5a9a | Pull request #1410: SHRINE2020-1406 - Settle on layout in the Run Query bar now that topics are gone
Merge in SHRINE... | | |
Xav | 54c92c4d6da | SHRINE2020-1265 : tweak test code and Timeline.scala as needed after adding second timespan | | |
dwalend | 203ea07210e | Added support for 0, 1, or 2 span tags in i2b2 xml for SHRINE2020-1265 | | |
Xav | eaa7844dd33 | Merge branch 'feature/SHRINE2020-1265c' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHR... | | |
Xav | b6a1959d260 | SHRINE2020-1265 : commit WIP so Dave can work on it | | |
Marc-Danie Nazaire | 8e815bae555 | SHRINE2020-1406 - Settle on layout in the Run Query bar now that topics are gone | | |
David Walend | f8df70d7d60 | Pull request #1408: Feature/SHRINE2020 1404
Merge in SHRINE/shrine from feature/SHRINE2020-1404 to develop
* commit... | | |
dwalend | 670914de613 | Cleared a bunch of printlns from tests while sitting in a parking lot trying not to look too seedy for SHRINE2020-1404 | | |
dwalend | e5878115e60 | Cleared up the version conflicts for SHRINE2020-1404 | | |
dwalend | ff719b8ba08 | Use the parameter for the javax servlet api for SHRINE2020-1404 | | |
dwalend | 34bc569fabf | merging | | |
dwalend | 8db89dd62f1 | Checkmarx server URL - getting closer to running checkmarx from maven for SHRINE2020-1415 | | |
dwalend | 826000fafcf | Sorted the properties in the pom.xml for SHRINE2020-1404 | | |
Xav | 3cbffeb51c5 | SHRINE2020-1265 : fix operator drop-down menu | | |
Xav | c3b6b8d2abb | SHRINE2020-1265 : added operator menu | | |
David Walend | c1dc6571493 | 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 | 80e01add8af | Pull request #1403: Feature/SHRINE2020 1431
Merge in SHRINE/shrine from feature/SHRINE2020-1431 to develop
* commit... | | |
Xav | 378ed73f684 | SHRINE2020-1265 : set default timestamp unit to "DAY", not "Day" | | |
Marc-Danie Nazaire | 812f76785c4 | Pull request #1406: SHRINE2020-1405 - Fix setting of kafka version used in docker
Merge in SHRINE/shrine from bugfix... | | |
dwalend | 85f1cc1845f | merging | | |
David Walend | b6e1da58352 | Pull request #1404: Feature/SHRINE2020 1421
Merge in SHRINE/shrine from feature/SHRINE2020-1421 to develop
* commit... | | |
| Next → |
