 Marc-Danie Nazaire | 58ea3053261 | SHRINE2020-1405 - Fix setting of kafka version used in docker | | |
 Xav | 4d4d2efd436 | SHRINE2020-1265 : make timespan units menu work and submitted to the b/e, although it is still needs to be pre-populated | | |
Xav | 2e63090c7a1 | SHRINE2020-1265 : fix regression on relationship menu; try to make timespan untis menu work | | |
Xav | 134c5029eb9 | Merge branch 'feature/SHRINE2020-1265c' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHR... | | |
Xav | 25983ac5eb2 | 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 | a008ca7ee2b | Mergig from develop | | |
dwalend | 5b6ff99e480 | Marc-Danie review comments for SHRINE2020-1431 | | |
dwalend | 5320415c79e | Move to Scala 2.13.11, and a fix in some Authz code that went from warn to error for SHRINE2020-1347 | | |
dwalend | 7acd90ad683 | Merge remote-tracking branch 'origin/develop' into SHRINE2020-1378-remove-dsa | | |
dwalend | a60eb592448 | Merge remote-tracking branch 'origin/develop' into feature/SHRINE2020-1421 | | |
dwalend | 6881e88905a | Some sad todos to reenable unit tests after we or slick takes care of some other bugs for SHRINE2020-1421 | | |
dwalend | 99f06267745 | Cleaned up some tests around Loggable for SHRINE2020-1421 | | |
Marc-Danie Nazaire | 5a314911a91 | SHRINE2020-1265c - Fixed setting of dropdown values | | |
 David Walend | 3f8b7da21c2 | Pull request #1401: Switched unit test log level to warn for SHRINE2020-1417
Merge in SHRINE/shrine from feature/SHR... | | |
David Walend | edafa33e82d | Pull request #1399: Warning goes away when I put both execution sections in the same plugin declaration for SHRINE202... | | |
David Walend | 19b8166184c | Pull request #1400: Switched to a less complicated timestamp format for SHRINE2020-1419
Merge in SHRINE/shrine from ... | | |
dwalend | d96650d2f29 | Some cleanup while doing SHRINE2020-1431 | | |
dwalend | 26db582b292 | Removed another warning for SHRINE2020-1431 | | |
Xav | 2368780911f | SHRINE2020-1265 : Fix two failing tests after changes | | |
dwalend | 856cc42d404 | A couple of tweaks to fix the compile for SHRINE2020-1265 | | |
Xav | da7df14ff76 | SHRINE2020-1265c : Try to make it all work for 1 timespan UI widget | | |
Xav | 892715c52b4 | SHRINE2020-1265c : cherry pick from 1265 (case object examples (that don't compile) for SHRINE2020-1265 11df7f86a dwa... | | |
Xav | 45d7623ff63 | SHRINE2020-1265c : fix test | | |
Xav | 2122d9c50d7 | SHRINE2020-1265c : fix tests | | |
Xav | d33c213b97a | SHRINE2020-1265 : fix constant names, perhaps temporarily | | |
dwalend | 11df7f86a44 | case object examples (that don't compile) for SHRINE2020-1265 | | |
dwalend | c0abba20bcc | Fixing an indent for SHRINE2020-1431 | | |
Xav | 34d19ec161a | SHRINE2020-1265 : minimal renaming which highlights the need for more renameing/code changes ; rename two failing te... | | |
Xav | df0e23642a9 | SHRINE2020-1265 : implement 1 timespan widget (operator/value/unit) which make it to the API payload, 2 broken f/e te... | | |
dwalend | 5aaf528410f | Adding maven-resources-plugin cleared one of the problems in SHRINE2020-1431 | | |
dwalend | 011b136ab51 | Cherry-picked the fix for the build jitter problem from SHRINE2020-1393 to SHRINE2020-1265 | | |
dwalend | cc0c95ffd5e | Switched to a less complicated timestamp format for SHRINE2020-1419 | | |
dwalend | c156d2b3d2a | Warning goes away when I put both execution sections in the same plugin declaration for SHRINE2020-1418 | | |
dwalend | 022a45a35ae | Switched unit test log level to warn for SHRINE2020-1417 | | |
dwalend | eefd07a39a9 | Merge branch 'feature/SHRINE2020-1379-remove-topics' into SHRINE2020-1378-remove-dsa | | |
dwalend | 3b0f5ad08a4 | Merge remote-tracking branch 'origin/develop' into feature/SHRINE2020-1379-remove-topics | | |
dwalend | 53c45b7b430 | Merge remote-tracking branch 'origin/develop' into feature/SHRINE2020-1432 | | |
dwalend | 27e56672c50 | Log setting to remove all the INFO lines from maven's output for SHRINE2020-1432 | | |
Xav | 3ae365b827d | Merge branch 'develop' into feature/SHRINE2020-1264 | | |
dwalend | 1ae99d91332 | Parking work on SHRINE2020-1415 while I wait to hear from HMS IT Security about SHRINE using their server | | |
Xav | d5345fc70cf | SHRINE2020-1264: remove some todos | | |
Xav | 461508d3479 | Merge branch 'feature/SHRINE2020-1264' into feature/SHRINE2020-1265 | | |
Xav | 3725f458ac5 | Revert "created two stateful checkboxes, for SHRINE2020-1265"
This reverts commit 02a9f5c3aaaa44a0b90dc73c38317dccca... | | |
Xav | 9f472dca278 | SHRINE2020-1264: reset to what it was before started work on 1264 | | |
Marc-Danie Nazaire | 1e5a34df067 | Pull request #1397: SHRINE2020-1412 - Remove hard coded tag of "powered by ..." from header and place in footer in 3.... | | |
Marc-Danie Nazaire | 19dfcdf07c8 | 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 | 512d172631d | Merge branch 'feature/Custom_Breakdowns_3_3_0' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feat... | | |
Marc-Danie Nazaire | 718c8d53d97 | Pull request #1396: SHRINE2020-1411 - Create new header variable in shrine.conf; remove reference to network name var... | | |
Marc-Danie Nazaire | 3b9f4033301 | SHRINE2020-1412 - Remove hard coded tag of "powered by ..." from header and place in footer in 3.3 line | | |
Marc-Danie Nazaire | fb1341fc0ee | SHRINE2020-1411 - Create new header variable in shrine.conf; remove reference to network name variable | | |
dwalend | 37f0a269af6 | Merge remote-tracking branch 'origin/feature/SHRINE2020-1379-remove-topics' into SHRINE2020-1378-remove-dsa | | |
David Walend | 5baa2554955 | Pull request #1384: Bugfix/SHRINE2020 1393 something strange is going on in the json stored at the qep
Merge in SHRI... | | |
David Walend | d8c3f996b22 | Pull request #1395: Feature/SHRINE2020 1403
Merge in SHRINE/shrine from feature/SHRINE2020-1403 to SHRINE2020-1378-r... | | |
Xav | 451a391e7b3 | SHRINE2020-1264: works with refactored / more object-oriented code | | |
Marc-Danie Nazaire | e64c0b2b453 | Pull request #1394: SHRINE2020-826 - Bar graphs: Different width size is appearing for 'Demographic distribution by S... | | |
dwalend | 9aa81c15309 | Merge branch 'feature/SHRINE2020-1379-remove-topics' into bugfix/SHRINE2020-1393-something-strange-is-going-on-in-the... | | |
dwalend | fcd8aa1359d | Merge branch 'SHRINE2020-1378-remove-dsa' into feature/SHRINE2020-1403 | | |
dwalend | 61d7039576c | Merging SHRINE2020-1401 from develop | | |
dwalend | 6edc08d034c | Merge remote-tracking branch 'origin/develop' into feature/SHRINE2020-1379-remove-topics | | |
David Walend | c6341a87e95 | Pull request #1390: Bugfix/SHRINE2020 1401
Merge in SHRINE/shrine from bugfix/SHRINE2020-1401 to develop
* commit '... | | |
dwalend | 1af6c3d0cca | Merge remote-tracking branch 'origin/feature/SHRINE2020-1379-remove-topics' into bugfix/SHRINE2020-1393-something-str... | | |
dwalend | ec3576b24db | Updating this SHRINE 1.20-era sql for SHRINE2020-1403 | | |
dwalend | cd3e2b2e7f8 | Some more topics to remove from json tests for SHRINE2020-1403 | | |
Xav | 02a9f5c3aaa | created two stateful checkboxes, for SHRINE2020-1265 | | |
David Walend | 1d1c321de7c | Pull request #1387: Feature/SHRINE2020 1390
Merge in SHRINE/shrine from feature/SHRINE2020-1390 to feature/SHRINE202... | | |
Marc-Danie Nazaire | 1be20ca4f32 | SHRINE2020-826 - Bar graphs: Different width size is appearing for 'Demographic distribution by Sex' bar graph as com... | | |
dwalend | 28d320d20ce | Removed more topics for SHRINE2020-1403 | | |
dwalend | bcafb7cce21 | Removed almost all things topic, and the v1 protocol for SHRINE2020-1403 | | |
Marc-Danie Nazaire | 9b96c4d55c7 | Pull request #1393: SHRINE2020-1397 - New breakdowns are displayed under heading Demographic distribution.
Merge in ... | | |
Marc-Danie Nazaire | fb6f9a0bf4d | Pull request #1392: SHRINE2020-1398 - Whole screen goes white on clicking outside new breakdown pop-up
Merge in SHRI... | | |
Xav | 9096c441bbc | made relationship values in the front end match the back-end, for SHRINE2020-1264 | | |
Marc-Danie Nazaire | f118b15251d | SHRINE2020-1397 - New breakdowns are displayed under heading Demographic distribution. Also tooltip for download icon... | | |
Xav | 77745c20b10 | made relationship not optional, for SHRINE2020-1264 | | |
Marc-Danie Nazaire | 1e4fd367bc5 | SHRINE2020-1398 - Whole screen goes white on clicking outside new breakdown pop-up | | |
dwalend | 3525e1c31de | More and more merging | | |
dwalend | 5fbe0986767 | Merging | | |
dwalend | 51601d1f756 | Merging remove topics into remove dsa | | |
dwalend | 600325ed05e | merging from develop | | |
dwalend | 814f116f0c8 | Merge remote-tracking branch 'origin/develop' into bugfix/SHRINE2020-1401 | | |
Xav | 1cd407ac2e3 | made relationship not optional, for SHRINE2020-1264 | | |
dwalend | 762b780d4e2 | Dropping unused reporting plugins from the QEP pom.xml for SHRINE2020-1401 | | |
Xav | 1f7554ece48 | changed "occurrenceValue" to "relationship" in the code, fixed unit f/e tests accordingly, for SHRINE2020-1264 | | |
dwalend | 7102b9c603a | Some more cleanup for SHRINE2020-1401 | | |
dwalend | f55f89ed962 | Moved all the plugin version numbers to the big list of versions for SHRINE2020-1401 | | |
dwalend | bce97b78e51 | Docker plugin is now building without downloanding log4j for SHRINE2020-1401 | | |
Marc-Danie Nazaire | a3d9feedc6a | SHRINE2020-1390 - Remove topic selection and create, widgets, and topic id fields from the front-end code - Adjusted ... | | |
Xav | 0d2b3d6f3af | Merge branch 'develop' into feature/SHRINE2020-1264 | | |
Xav | dd3cdbdc4b3 | Merge branch 'feature/SHRINE2020-1263' into develop | | |
David Walend | 8c3784e2a1e | Pull request #1386: Feature/SHRINE2020 1389
Merge in SHRINE/shrine from feature/SHRINE2020-1389 to feature/SHRINE202... | | |
dwalend | fd0b69d4574 | Marc-Danie found another topic to remove for SHRINE2020-1389 | | |
Xav | a76059429da | Works nicely in the f/e, but may not line up with the b/e, for SHRINE2020-1264 | | |
Xav | 8ede1c7b9a6 | Merge branch 'feature/SHRINE2020-1263' into feature/SHRINE2020-1264 | | |
Xav | 7ec5c376423 | fine-tune exception message for SHRINE2020-1264 | | |
Xav | 0c17b8a0b5c | Minor clean-up for SHRINE2020-1263 | | |
Xav | fe8d9988fc0 | Refactor TimelineLink to take EventConstraint parameters for SHRINE2020-1263 | | |
David Walend | 3060e24f8fb | Pull request #1383: Feature/SHRINE2020 1388
Merge in SHRINE/shrine from feature/SHRINE2020-1388 to feature/SHRINE202... | | |
David Walend | dc269aae02f | Pull request #1388: Feature/SHRINE2020 1383
Merge in SHRINE/shrine from feature/SHRINE2020-1383 to SHRINE2020-1378-r... | | |
David Walend | a184b90de27 | Pull request #1389: Fixed a few unlikely vulnerabilities for SHRINE2020-1395
Merge in SHRINE/shrine from bugfix/SHRI... | | |
dwalend | cf996af3aa7 | Fixed a few unlikely vulnerabilities for SHRINE2020-1395 | | |
dwalend | 3db9c84cfdc | Some dead properties in some tests while reviewing SHRINE2020-1383 | | |
dwalend | 91eeaf58e21 | Use the modern driver name instead of the backwards-compatible alias in the example context.xml file - SHRINE2020-575 | | |
David Walend | 05a4d571e61 | Pull request #1385: Feature/SHRINE2020 1381
Merge in SHRINE/shrine from feature/SHRINE2020-1381 to SHRINE2020-1378-r... | | |
David Walend | e1e42354f7e | Pull request #1381: Feature/SHRINE2020 1387
Merge in SHRINE/shrine from feature/SHRINE2020-1387 to feature/SHRINE202... | | |
dwalend | ab240af8d88 | Now with empty database schema files for SHRINE2020-1383 | | |
dwalend | f022df740f1 | Adding the DSA database schema back for SHRINE2020-1383 | | |
Marc-Danie Nazaire | b35a3acac02 | Pull request #1382: Feature/SHRINE2020 1357 - Allow user to select "advanced options" for breakdowns
Merge in SHRINE... | | |
dwalend | 15508e6f0df | Removed all things 'steward' for SHRINE2020-1383 | | |
dwalend | 787957b1056 | Removed all the DSA back-end code for SHRINE2020-1383 | | |
dwalend | 94e49bd8c1c | Removed dependencies on DSA code from the https services for SHRINE2020-1383 | | |
dwalend | 352b1c4a9a5 | Merge branch 'bugfix/SHRINE2020-1393-something-strange-is-going-on-in-the-json-stored-at-the-qep' into feature/SHRINE... | | |
dwalend | dd2d324973d | Fixed some time stamp jitter in a test for SHRINE2020-1393 | | |
dwalend | 30e01fbc3f9 | Adding test back to do in a separate ticket | | |
Xav | 97088009510 | fine-tune exception message for SHRINE2020-1263 | | |
dwalend | e7b75e75a50 | Removed DSA front-end code for SHRINE2020-1381 | | |
Xav | ecdf7b9e421 | more clean up for SHRINE2020-1263 | | |
dwalend | 96db62d62f3 | Removed DSA UI code from the build for SHRINE2020-1381 | | |
dwalend | 355b38e6eba | Merge branch 'feature/SHRINE2020-1389' into feature/SHRINE2020-1390 | | |
dwalend | 631341a92bb | A character is 24px tall - for SHRINE2020-1389 | | |
dwalend | 20b8dc2e9c4 | Removed projectId - a topic in sheep's clothing - for SHRINE2020-1390 | | |
David Walend | 7ef75563419 | Pull request #1380: Feature/SHRINE2020 1386
Merge in SHRINE/shrine from feature/SHRINE2020-1386 to feature/SHRINE202... | | |
dwalend | 870de027478 | Cleaned out topics from the javascript code for SHRINE2020-1390 | | |
Xav | d7917ddaa06 | further make "ANY" the default value for the event-anchor/aggregateOperator, along with some cleanup, for SHRINE2020-... | | |
dwalend | 605138f29d6 | Shrinking the result panel now that we're not showing the topic anymore for SHRINE2020-1389 | | |
Xav | 6a2d7488b73 | reinstate response.json needed for f/e testing, for SHRINE2020-1263 | | |
Xav | d52f827eb36 | Continue making "ANY" the default value of the aggregateOperator in a query timeline link for SHRINE2020-1263 | | |
Xav | e192d8194ac | Continue making "ANY" the default value of the aggregateOperator in a query timeline link for SHRINE2020-1263 | | |
dwalend | 1796bbe1cce | Fixed javascript unit test for SHRINE2020-1389 | | |
dwalend | d1bcc13f96e | Check to see if I broke javascript building when I updated brew last night - SHRINE2020-1389 | | |
Marc-Danie Nazaire | be1297f9ea3 | SHRINE2020-1357-Allow user to select "advanced options" for breakdowns - Added new category property to example shrin... | | |
Marc-Danie Nazaire | 7546b86b1cc | SHRINE2020-1357-Allow user to select "advanced options" for breakdowns - Fixed breakdown group header css | | |
dwalend | 89f91136233 | Removed DSA dependencies from the QEP for SHRINE2020-1388 | | |
dwalend | ba0faef24cd | Pushing topics into default values of the structures shared with the javascript for SHRINE2020-1388 | | |
dwalend | 0a15045f4b0 | Deleting more dead code for SHRINE2020-1388 | | |
dwalend | 78fa1609c9d | The Qep no longer uses a QueryAuthorizationService for SHRINE2020-1388 | | |
dwalend | 30eb72136e2 | Removed DSA references from the QepService and QueryRunner for SHRINE2020-1388 | | |
dwalend | 61184e6681f | Removed topics from the audit database for SHRINE2020-1388 | | |
Marc-Danie Nazaire | f709af3e69e | SHRINE2020-1357-Allow user to select "advanced options" for breakdowns - Addd more custom breakdowns to docker network | | |
Marc-Danie Nazaire | c38b7f170b4 | SHRINE2020-1357-Allow user to select "advanced options" for breakdowns - Fixed mssql statement to allow null in data_... | | |
Marc-Danie Nazaire | 0f98d80704a | SHRINE2020-1357-Allow user to select "advanced options" for breakdowns - Fixed mssql statement to allow null in data_... | | |
Marc-Danie Nazaire | 2952625bcba | SHRINE2020-1357-Allow user to select "advanced options" for breakdowns - Fixed sql to allow null in data_key column o... | | |
Marc-Danie Nazaire | 3deaa0c92c6 | SHRINE2020-1357-Allow user to select "advanced options" for breakdowns - Allow null in data_key column of the breakdo... | | |
Marc-Danie Nazaire | d8c28ed1758 | SHRINE2020-1357-Allow user to select "advanced options" for breakdowns - Minor front-end code cleanup | | |
Marc-Danie Nazaire | 3ede3e0a468 | Merge branch 'feature/Custom_Breakdowns_3_3_0' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feat... | | |
Marc-Danie Nazaire | 248c244dbaf | SHRINE2020-1357-Allow user to select "advanced options" for breakdowns - Clean up docker README.md | | |
Marc-Danie Nazaire | f0e6e681743 | SHRINE2020-1357-Allow user to select "advanced options" for breakdowns - Added checkmark for when advance options is ... | | |
dwalend | b224a2454d4 | Deleted topics from v2 for SHRINE2020-1387 | | |
dwalend | 5ef4d459a02 | Cleaning out more topic-related stuff from the hub for SHRINE2020-1387 | | |
dwalend | 6f12d52d657 | Remove the hub's topic table for SHRINE2020-1387 | | |
dwalend | ec6dca987a3 | Removed topics from the hub for SHRINE2020-1387 | | |
dwalend | 4f0719a6267 | Removed topic from RunQueryAtHub and propagated the change for SHRINE2020-1387 | | |
dwalend | 0d0266c57e5 | Remove topic columns from the adapter's database for SHRINE2020-1386 | | |
Marc-Danie Nazaire | 6671a0768dc | SHRINE2020-1357-Allow user to select "advanced options" for breakdowns - make data_key nullable in oracle | | |
dwalend | 3f4b9c328dd | Removed topics from the command from the hub to the adapters to run a query for SHRINE2020-1386 | | |
dwalend | 303973f0f8c | Removed topics from i2b2 xml for SHRINE2020-1386 | | |
Marc-Danie Nazaire | bda647ecc8b | SHRINE2020-1357-Allow user to select "advanced options" for breakdowns - Renamed api call to get data distribution types | | |
Marc-Danie Nazaire | 0819e8b25d5 | Merge branch 'feature/SHRINE2020-1364' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRI... | | |
Marc-Danie Nazaire | b14ca537c26 | Pull request #1377: Feature/SHRINE2020 1364 - Create api call to get the breakdown output types
Merge in SHRINE/shri... | | |
Marc-Danie Nazaire | 33e535f6017 | SHRINE2020-1364 - Renamed getDataDistributionTypes api call to dataDistributionTypes | | |
Marc-Danie Nazaire | a4b759ef679 | SHRINE2020-1357-Allow user to select "advanced options" for breakdowns - Fixed breakdown label | | |
Xav | 241e5ba1c31 | Update Docker README.md | | |
Xav | 33f176d3faf | 1263 PR: rename E(e)ventAnchor to A(a)ggregateOperator in the i2b2Protocol package | | |
Marc-Danie Nazaire | 2e0eff4abe6 | SHRINE2020-1357-Allow user to select "advanced options" for breakdowns - Modified to use the new format for the dataD... | | |
Marc-Danie Nazaire | 359d35c80f0 | SHRINE2020-1357-Allow user to select "advanced options" for breakdowns - Added missing classes | | |
Marc-Danie Nazaire | f14e3ee460e | Merge branch 'feature/SHRINE2020-1364' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRI... | | |
Marc-Danie Nazaire | 02913fac9d4 | SHRINE2020-1357-Allow user to select "advanced options" for breakdowns - Made getDataDistributionTypes api call unaut... | | |
Marc-Danie Nazaire | c30786ea1ca | SHRINE2020-1357-Allow user to select "advanced options" for breakdowns - Moved getDataDistributionTypes api call to t... | | |
Marc-Danie Nazaire | a61f1268ac7 | SHRINE2020-1357-Allow user to select "advanced options" for breakdowns - Changed breakdownResultOutputTypes config fo... | | |
dwalend | 03adb628fc3 | Merging develop into SHRINE2020-1263 | | |
David Walend | 18d29f5027d | Pull request #1379: Feature/SHRINE2020 1366
Merge in SHRINE/shrine from feature/SHRINE2020-1366 to develop
* commit... | | |
David Walend | 98356a3e68f | Pull request #1378: Bugfix/SHRINE2020 1303
Merge in SHRINE/shrine from bugfix/SHRINE2020-1303 to develop
* commit '... | | |
Marc-Danie Nazaire | 217883ff29e | SHRINE2020-1357-Allow user to select "advanced options" for breakdowns - Fixed sort order to breakdown labels to be a... | | |
Marc-Danie Nazaire | c56a8878da1 | SHRINE2020-1357-Allow user to select "advanced options" for breakdowns - Fixed update mssql script to remove type col... | | |
Xav | 65f2eb21d60 | merge 1262 into 1269 with conflicts. May be broken (polling for queries get cancelled). | | |
Marc-Danie Nazaire | 415de8cc6ba | SHRINE2020-1357-Allow user to select "advanced options" for breakdowns - Update mssql script to remove type column ch... | | |
Marc-Danie Nazaire | 447d11aabbf | SHRINE2020-1357-Allow user to select "advanced options" for breakdowns - Update mssql script to remove type column ch... | | |
Xav | ce9bb34e864 | merge with conflicts | | |
Xav | 09976d17b38 | PR feedback - make EventBoundary constants uppercase (i=e,g, EventBoundary.START) | | |
dwalend | 0becabebd9f | Merge remote-tracking branch 'origin/develop' into feature/SHRINE2020-1262 | | |
dwalend | 2cb69d24e3b | stray merge bit | | |
Xav | ae2db2d4d7e | PR feedback | | |
dwalend | 0fe941f4735 | merging | | |
dwalend | 8eae88c3c9a | Merging | | |
David Walend | 77d639730a0 | Pull request #1375: Feature/SHRINE2020 1362
Merge in SHRINE/shrine from feature/SHRINE2020-1362 to develop
* commit... | | |
dwalend | 9d599b90025 | merging | | |
David Walend | c8a40bfa3c5 | Pull request #1376: Feature/SHRINE2020 1373
Merge in SHRINE/shrine from feature/SHRINE2020-1373 to develop
* commit... | | |
dwalend | ad431e864a2 | Updating jmx tests for SHRINE2020-1303 | | |
Xav | ae17224c0c5 | merge develop - with conflicts | | |
Marc-Danie Nazaire | 60e7ef53e22 | SHRINE2020-1357-Allow user to select "advanced options" for breakdowns - Update oracle sql statement to update type c... | | |
| Next → |
