 Xav | 13b0b92b11a | Merge branch 'feature/SHRINE2020-1263' into develop | | |
 David Walend | 5e8a8add079 | Pull request #1386: Feature/SHRINE2020 1389
Merge in SHRINE/shrine from feature/SHRINE2020-1389 to feature/SHRINE202... | | |
 dwalend | c794afa804c | Marc-Danie found another topic to remove for SHRINE2020-1389 | | |
Xav | 99237efc002 | Works nicely in the f/e, but may not line up with the b/e, for SHRINE2020-1264 | | |
Xav | 163db810a16 | Merge branch 'feature/SHRINE2020-1263' into feature/SHRINE2020-1264 | | |
Xav | e3af9d3f7c9 | fine-tune exception message for SHRINE2020-1264 | | |
Xav | f82d8819f0d | Minor clean-up for SHRINE2020-1263 | | |
Xav | d74c7583519 | Refactor TimelineLink to take EventConstraint parameters for SHRINE2020-1263 | | |
David Walend | 6e19bd7ef86 | Pull request #1383: Feature/SHRINE2020 1388
Merge in SHRINE/shrine from feature/SHRINE2020-1388 to feature/SHRINE202... | | |
David Walend | 646e4e52ab3 | Pull request #1388: Feature/SHRINE2020 1383
Merge in SHRINE/shrine from feature/SHRINE2020-1383 to SHRINE2020-1378-r... | | |
David Walend | 223d9d901e8 | Pull request #1389: Fixed a few unlikely vulnerabilities for SHRINE2020-1395
Merge in SHRINE/shrine from bugfix/SHRI... | | |
dwalend | f4594774503 | Fixed a few unlikely vulnerabilities for SHRINE2020-1395 | | |
dwalend | 4c74ca79138 | Some dead properties in some tests while reviewing SHRINE2020-1383 | | |
dwalend | 60297e149ae | Use the modern driver name instead of the backwards-compatible alias in the example context.xml file - SHRINE2020-575 | | |
David Walend | c2cb33d0462 | Pull request #1385: Feature/SHRINE2020 1381
Merge in SHRINE/shrine from feature/SHRINE2020-1381 to SHRINE2020-1378-r... | | |
David Walend | abe05d0e166 | Pull request #1381: Feature/SHRINE2020 1387
Merge in SHRINE/shrine from feature/SHRINE2020-1387 to feature/SHRINE202... | | |
dwalend | bda0c15f607 | Now with empty database schema files for SHRINE2020-1383 | | |
dwalend | 67f8050ae60 | Adding the DSA database schema back for SHRINE2020-1383 | | |
 Marc-Danie Nazaire | d8c0f1305b3 | Pull request #1382: Feature/SHRINE2020 1357 - Allow user to select "advanced options" for breakdowns
Merge in SHRINE... | | |
dwalend | dd667884dfe | Removed all things 'steward' for SHRINE2020-1383 | | |
dwalend | 9b2d1b29adb | Removed all the DSA back-end code for SHRINE2020-1383 | | |
dwalend | 9607759192b | Removed dependencies on DSA code from the https services for SHRINE2020-1383 | | |
dwalend | 6e7dd56a2f3 | Merge branch 'bugfix/SHRINE2020-1393-something-strange-is-going-on-in-the-json-stored-at-the-qep' into feature/SHRINE... | | |
dwalend | 2c149dfbf7c | Fixed some time stamp jitter in a test for SHRINE2020-1393 | | |
dwalend | 679dc515982 | Adding test back to do in a separate ticket | | |
Xav | e025fe564d0 | fine-tune exception message for SHRINE2020-1263 | | |
dwalend | 5bc544a3d5a | Removed DSA front-end code for SHRINE2020-1381 | | |
Xav | 2f57a9a6b67 | more clean up for SHRINE2020-1263 | | |
dwalend | 3c476b644fd | Removed DSA UI code from the build for SHRINE2020-1381 | | |
dwalend | 49540efb365 | Merge branch 'feature/SHRINE2020-1389' into feature/SHRINE2020-1390 | | |
dwalend | fc20cee7bfa | A character is 24px tall - for SHRINE2020-1389 | | |
dwalend | 0c5f04555b8 | Removed projectId - a topic in sheep's clothing - for SHRINE2020-1390 | | |
David Walend | bcd87c766b1 | Pull request #1380: Feature/SHRINE2020 1386
Merge in SHRINE/shrine from feature/SHRINE2020-1386 to feature/SHRINE202... | | |
dwalend | d7dad8cf653 | Cleaned out topics from the javascript code for SHRINE2020-1390 | | |
Xav | 18c0c9dab88 | further make "ANY" the default value for the event-anchor/aggregateOperator, along with some cleanup, for SHRINE2020-... | | |
dwalend | 334e10e005f | Shrinking the result panel now that we're not showing the topic anymore for SHRINE2020-1389 | | |
Xav | 50093d66912 | reinstate response.json needed for f/e testing, for SHRINE2020-1263 | | |
Xav | 89765499197 | Continue making "ANY" the default value of the aggregateOperator in a query timeline link for SHRINE2020-1263 | | |
Xav | 48a70b1e1ca | Continue making "ANY" the default value of the aggregateOperator in a query timeline link for SHRINE2020-1263 | | |
dwalend | 3bfd7c69cc8 | Fixed javascript unit test for SHRINE2020-1389 | | |
dwalend | 3d7c6067fdb | Check to see if I broke javascript building when I updated brew last night - SHRINE2020-1389 | | |
Marc-Danie Nazaire | 444336af22e | SHRINE2020-1357-Allow user to select "advanced options" for breakdowns - Added new category property to example shrin... | | |
Marc-Danie Nazaire | c19535ac901 | SHRINE2020-1357-Allow user to select "advanced options" for breakdowns - Fixed breakdown group header css | | |
dwalend | a7ba7b2e616 | Removed DSA dependencies from the QEP for SHRINE2020-1388 | | |
dwalend | e7d748232cb | Pushing topics into default values of the structures shared with the javascript for SHRINE2020-1388 | | |
dwalend | eca35bddaea | Deleting more dead code for SHRINE2020-1388 | | |
dwalend | 9ddb0ed5ec9 | The Qep no longer uses a QueryAuthorizationService for SHRINE2020-1388 | | |
dwalend | 46e4c4f510c | Removed DSA references from the QepService and QueryRunner for SHRINE2020-1388 | | |
dwalend | 4dc482e7a1c | Removed topics from the audit database for SHRINE2020-1388 | | |
Marc-Danie Nazaire | aaf94d498ce | SHRINE2020-1357-Allow user to select "advanced options" for breakdowns - Addd more custom breakdowns to docker network | | |
Marc-Danie Nazaire | 818b3467fcc | SHRINE2020-1357-Allow user to select "advanced options" for breakdowns - Fixed mssql statement to allow null in data_... | | |
Marc-Danie Nazaire | 29f4cec1570 | SHRINE2020-1357-Allow user to select "advanced options" for breakdowns - Fixed mssql statement to allow null in data_... | | |
Marc-Danie Nazaire | 3e3c0e76639 | SHRINE2020-1357-Allow user to select "advanced options" for breakdowns - Fixed sql to allow null in data_key column o... | | |
Marc-Danie Nazaire | 787d6cd9daa | SHRINE2020-1357-Allow user to select "advanced options" for breakdowns - Allow null in data_key column of the breakdo... | | |
Marc-Danie Nazaire | 0fd8cad08d2 | SHRINE2020-1357-Allow user to select "advanced options" for breakdowns - Minor front-end code cleanup | | |
Marc-Danie Nazaire | 4aecc134dd3 | Merge branch 'feature/Custom_Breakdowns_3_3_0' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feat... | | |
Marc-Danie Nazaire | 36ef2f950d3 | SHRINE2020-1357-Allow user to select "advanced options" for breakdowns - Clean up docker README.md | | |
Marc-Danie Nazaire | 5c1ceee73d7 | SHRINE2020-1357-Allow user to select "advanced options" for breakdowns - Added checkmark for when advance options is ... | | |
dwalend | 9595fdc4932 | Deleted topics from v2 for SHRINE2020-1387 | | |
dwalend | 4eae4de5e71 | Cleaning out more topic-related stuff from the hub for SHRINE2020-1387 | | |
dwalend | 37915871797 | Remove the hub's topic table for SHRINE2020-1387 | | |
dwalend | 1ff6fab55ee | Removed topics from the hub for SHRINE2020-1387 | | |
dwalend | b551046b995 | Removed topic from RunQueryAtHub and propagated the change for SHRINE2020-1387 | | |
dwalend | 973c9c48877 | Remove topic columns from the adapter's database for SHRINE2020-1386 | | |
Marc-Danie Nazaire | ec82eaa3041 | SHRINE2020-1357-Allow user to select "advanced options" for breakdowns - make data_key nullable in oracle | | |
dwalend | a6115af2730 | Removed topics from the command from the hub to the adapters to run a query for SHRINE2020-1386 | | |
dwalend | cb2f492f09c | Removed topics from i2b2 xml for SHRINE2020-1386 | | |
Marc-Danie Nazaire | 758aeb806a7 | SHRINE2020-1357-Allow user to select "advanced options" for breakdowns - Renamed api call to get data distribution types | | |
Marc-Danie Nazaire | f2702b95466 | Merge branch 'feature/SHRINE2020-1364' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRI... | | |
Marc-Danie Nazaire | fc57da3c333 | Pull request #1377: Feature/SHRINE2020 1364 - Create api call to get the breakdown output types
Merge in SHRINE/shri... | | |
Marc-Danie Nazaire | 05675a921ab | SHRINE2020-1364 - Renamed getDataDistributionTypes api call to dataDistributionTypes | | |
Marc-Danie Nazaire | f6fb419004b | SHRINE2020-1357-Allow user to select "advanced options" for breakdowns - Fixed breakdown label | | |
Xav | 49827bd78bd | Update Docker README.md | | |
Xav | 9c169463c48 | 1263 PR: rename E(e)ventAnchor to A(a)ggregateOperator in the i2b2Protocol package | | |
Marc-Danie Nazaire | 519dabf2d23 | SHRINE2020-1357-Allow user to select "advanced options" for breakdowns - Modified to use the new format for the dataD... | | |
Marc-Danie Nazaire | 3b7e441a37d | SHRINE2020-1357-Allow user to select "advanced options" for breakdowns - Added missing classes | | |
Marc-Danie Nazaire | d0186e6f529 | Merge branch 'feature/SHRINE2020-1364' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRI... | | |
Marc-Danie Nazaire | a54e457c676 | SHRINE2020-1357-Allow user to select "advanced options" for breakdowns - Made getDataDistributionTypes api call unaut... | | |
Marc-Danie Nazaire | b13a4b84da6 | SHRINE2020-1357-Allow user to select "advanced options" for breakdowns - Moved getDataDistributionTypes api call to t... | | |
Marc-Danie Nazaire | ef28c294401 | SHRINE2020-1357-Allow user to select "advanced options" for breakdowns - Changed breakdownResultOutputTypes config fo... | | |
dwalend | bb749b08af3 | Merging develop into SHRINE2020-1263 | | |
David Walend | f14c93dd3b6 | Pull request #1379: Feature/SHRINE2020 1366
Merge in SHRINE/shrine from feature/SHRINE2020-1366 to develop
* commit... | | |
David Walend | e32aa9dd56c | Pull request #1378: Bugfix/SHRINE2020 1303
Merge in SHRINE/shrine from bugfix/SHRINE2020-1303 to develop
* commit '... | | |
Marc-Danie Nazaire | ae5fec0e0b8 | SHRINE2020-1357-Allow user to select "advanced options" for breakdowns - Fixed sort order to breakdown labels to be a... | | |
Marc-Danie Nazaire | 31a98954739 | SHRINE2020-1357-Allow user to select "advanced options" for breakdowns - Fixed update mssql script to remove type col... | | |
Xav | 4e9cd34b118 | merge 1262 into 1269 with conflicts. May be broken (polling for queries get cancelled). | | |
Marc-Danie Nazaire | 2174d3812ff | SHRINE2020-1357-Allow user to select "advanced options" for breakdowns - Update mssql script to remove type column ch... | | |
Marc-Danie Nazaire | 0e4d2779b7a | SHRINE2020-1357-Allow user to select "advanced options" for breakdowns - Update mssql script to remove type column ch... | | |
Xav | 21d2155e48c | merge with conflicts | | |
Xav | de96b32ab83 | PR feedback - make EventBoundary constants uppercase (i=e,g, EventBoundary.START) | | |
dwalend | 013fefaa8a6 | Merge remote-tracking branch 'origin/develop' into feature/SHRINE2020-1262 | | |
dwalend | df014e6fb95 | stray merge bit | | |
Xav | e444b3c91ac | PR feedback | | |
dwalend | ff87322dfe1 | merging | | |
dwalend | 4e1ce0e4607 | Merging | | |
David Walend | ed939f7069a | Pull request #1375: Feature/SHRINE2020 1362
Merge in SHRINE/shrine from feature/SHRINE2020-1362 to develop
* commit... | | |
dwalend | bc32d8718f1 | merging | | |
David Walend | 89004441de7 | Pull request #1376: Feature/SHRINE2020 1373
Merge in SHRINE/shrine from feature/SHRINE2020-1373 to develop
* commit... | | |
dwalend | d013dd9d713 | Updating jmx tests for SHRINE2020-1303 | | |
Xav | 9ddf355f557 | merge develop - with conflicts | | |
Marc-Danie Nazaire | fc2718586c2 | SHRINE2020-1357-Allow user to select "advanced options" for breakdowns - Update oracle sql statement to update type c... | | |
Xav | 75990d9f55d | refactor f/e to match b/e API | | |
Xav | 1c4749cf188 | push so that the b/e changes can be looked at | | |
Marc-Danie Nazaire | 778f763ef9a | SHRINE2020-1357-Allow user to select "advanced options" for breakdowns - Removed NOT NULL in the oracle update statement | | |
Marc-Danie Nazaire | c050b5d29d0 | SHRINE2020-1357-Allow user to select "advanced options" for breakdowns - Updated badge to indicate advanced data dist... | | |
dwalend | 86b531d0641 | Shifted calls to the CRC to the CRC's execution context for SHRINE2020-1303 | | |
Marc-Danie Nazaire | 12a73811f42 | SHRINE2020-1357-Allow user to select "advanced options" for breakdowns - Added badge to indicate data distribution wa... | | |
dwalend | c7b35ff9730 | Bill's review comments and a jmeter update for SHRINE2020-1362 | | |
Marc-Danie Nazaire | 9e072102638 | SHRINE2020-1357-Allow user to select "advanced options" for breakdowns - fixed api call to call data distribution types | | |
 Bill Simons | 00a0955a28a | Clean up README | | |
Marc-Danie Nazaire | 111ed511142 | SHRINE2020-1357-Allow user to select "advanced options" for breakdowns - updated front-end snapshot | | |
Marc-Danie Nazaire | b833868e8b6 | SHRINE2020-1357-Allow user to select "advanced options" for breakdowns | | |
Marc-Danie Nazaire | 44380f5e924 | SHRINE2020-1364 - Create api call to get the breakdown output types - Added check only parse valid data distribution ... | | |
Marc-Danie Nazaire | 2656e92b16b | SHRINE2020-1364 - Create api call to get the breakdown output types - Modified unit test to read expected json from file | | |
Marc-Danie Nazaire | c3771a571bb | SHRINE2020-1364 - Create api call to get the breakdown output types - Added unit test | | |
Bill Simons | 7972cf06fea | Convert docker dev env to legacy MOM | | |
dwalend | a05b9bb5929 | Added optional item version field to UpdateQueryAtAdapter for SHRINE2020-1366 | | |
dwalend | 002e5e71266 | Added expectedVersion field to UpdateQueryAtQep commands for SHRINE2020-1366 | | |
Xav | 649b4efe24a | temporary push so Dave can have a look | | |
dwalend | 56e73a8f7d5 | merging PR changes to the Query class | | |
Marc-Danie Nazaire | ebf15295afa | SHRINE2020-1364 - Create api call to get the breakdown output types | | |
dwalend | edc5534c797 | Now using the right list of breakdown names for SHRINE2020-1373 | | |
dwalend | 2d35b4bb17f | Removed unused output fields in json read tests for SHRINE2020-1373 | | |
dwalend | 378054beaa4 | Removed the output enum for SHRINE2020-1373 | | |
dwalend | 7d8456a34b7 | Getting all the breakdowns in to match current behavior for SHRINE2020-1373 | | |
dwalend | b4bb805200d | Added a list of breakdown names for SHRINE2020-1373 | | |
dwalend | ed171ce42e4 | My review pass of SHRINE2020-1362 | | |
Marc-Danie Nazaire | 118e7e48a99 | Merge branch 'feature/Custom_Breakdowns_3_3_0' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feat... | | |
Marc-Danie Nazaire | 85c62c97dbe | Pull request #1374: Bugfix/SHRINE2020 1363 get docker working
Merge in SHRINE/shrine from bugfix/SHRINE2020-1363-get... | | |
Marc-Danie Nazaire | 2593fec6c5b | SHRINE2020-1363-Get docker working - Cleaned out some kafka and sso related items | | |
dwalend | 5d7c1fd4db2 | More renaming of QUEUED query methods and some future tickets for SHRINE2020-1362 | | |
dwalend | eaa31db22c9 | Renamed to emphasize that the old messages are for QUEUED query updates only for SHRINE2020-1362 | | |
dwalend | 85933b1fc58 | Used the new UpdateResult messages in the adapter's not-queued query handling for SHRINE2020-1362 | | |
dwalend | 95b2d0500ed | Now able to receive and process the UpdateResult messsages for SHRINE2020-1362 | | |
dwalend | 12ddeec9782 | Update with results and try to unwind itemVersion conflicts - now in the hub db for SHRINE2020-1362 | | |
Marc-Danie Nazaire | 12a226a8763 | SHRINE2020-1364 - Create api call to get the breakdown output types - changed TYPE column from enum to varchar in QUE... | | |
Marc-Danie Nazaire | 760145fb626 | Merge branch 'bugfix/SHRINE2020-1363-get-docker-working' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine... | | |
Marc-Danie Nazaire | ed19f540291 | SHRINE2020-1363-Get docker working - Removed references to kafka | | |
dwalend | 8026036dce3 | merging | | |
dwalend | dd39079b8ca | First pass of the new result updates for SHRINE2020-1362 | | |
Marc-Danie Nazaire | b248fea43a0 | SHRINE2020-1363-Get docker working - Fixed duplicate caused by merge | | |
Xav | c8278e8304c | Merge branch 'feature/SHRINE2020-1262' into feature/SHRINE2020-1263 | | |
Marc-Danie Nazaire | a402ae441bb | Merge branch 'feature/Custom_Breakdowns_3_3_0' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into bugf... | | |
Marc-Danie Nazaire | f834cd09de7 | Revert new changes for breakdowns | | |
David Walend | f149e1c701f | Pull request #1372: Feature/SHRINE2020 1360
Merge in SHRINE/shrine from feature/SHRINE2020-1360 to develop
* commit... | | |
Marc-Danie Nazaire | c5a1ae35b4e | Merge branch 'feature/Custom_Breakdowns_3_3_0' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into bugf... | | |
Marc-Danie Nazaire | 31a2dc5f3c1 | Revert new changes for breakdowns | | |
Marc-Danie Nazaire | 607265528c7 | Merge branch 'feature/Custom_Breakdowns_3_3_0' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into bugf... | | |
Marc-Danie Nazaire | 06cd52e08b3 | Cleared out database update scripts | | |
Marc-Danie Nazaire | 02c52bce64c | Fixed POM versions | | |
Marc-Danie Nazaire | f8fa82ba6bf | Merge branch 'feature/Custom_Breakdowns_3_3_0' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into bugf... | | |
Marc-Danie Nazaire | 7f2281b8a82 | Fixed POM versions | | |
dwalend | 5f016bc415b | Added UpdateResult to actually carry Results for SHRINE2020-1362 | | |
dwalend | f22f019351e | Moved some json test files for SHRINE2020-1362 | | |
dwalend | 9d897ad528a | Renamed existin result updates to BestEffort before creating full-state for SHRINE2020-1362 | | |
dwalend | 69ac91fe32a | Revert "Added a predicted item version for result updates for SHRINE2020-1362"
This reverts commit e3ff28321f4c7c362... | | |
dwalend | cb944da33b1 | Revert "Added an optional result id to messages about results for SHRINE2020-1362"
This reverts commit 50128bbd5cee7... | | |
dwalend | 7a7202ebbb7 | Revert "Added predictedItemVersion fields to messages about Queries for SHRINE2020-1362"
This reverts commit fd6a725... | | |
Marc-Danie Nazaire | fe80f1f3065 | SHRINE2020-1364 - Create api call to get the breakdown output types - changed TYPE column from enum to varchar in QUE... | | |
Marc-Danie Nazaire | 0e0760a400b | SHRINE2020-1363-Get docker working - Cleanup base POM | | |
Marc-Danie Nazaire | 26bdb90c065 | SHRINE2020-1363-Get docker working - Updated to java 17 | | |
Marc-Danie Nazaire | 092374a44d9 | SHRINE2020-1363-Get docker working - removed docker from base POM | | |
Marc-Danie Nazaire | f744805f65e | SHRINE2020-1363-Get docker working | | |
Xav | bc0fa41ceee | fix the spacing between the elements of the timeline links definition UI | | |
Xav | cd838338199 | merge SHRINE2020-1262 into SHRINE2020-1263; fix some test failures; change names in f/e from **aggregateOperator** to... | | |
dwalend | fd6a725f995 | Added predictedItemVersion fields to messages about Queries for SHRINE2020-1362 | | |
Xav | 0bb97784a51 | fix spacing of elements in timeline link as per BA review - SHRINE2020-1262 | | |
dwalend | 50128bbd5ce | Added an optional result id to messages about results for SHRINE2020-1362 | | |
dwalend | e3ff28321f4 | Added a predicted item version for result updates for SHRINE2020-1362 | | |
dwalend | 3e85570a1a4 | Comment in wrong file for SHRINE2020-1360 | | |
Xav | 0ecc6b4c02a | merge develop, with conflicts | | |
Xav | 907c02ca7a6 | rename fromStartOrEnd to boundary | | |
Xav | 3e98c9ca373 | merge develop, with conflicts | | |
Xav | 40ba5d15704 | rename "startOrEnd" to "boundary" | | |
David Walend | 52fd2f7282d | Pull request #1368: Feature/SHRINE2020 1352
Merge in SHRINE/shrine from feature/SHRINE2020-1352 to develop
* commit... | | |
Xav | 656eecf58b2 | rename aggregateOperator* to eventAnchor* | | |
Xav | 3dad77ee317 | rename fromStartOrEnd to boundary | | |
Xav | c887995ef5b | rename fromStartOrEnd to boundary | | |
Xav | 0ee1c0181b7 | Merge branch 'feature/SHRINE2020-1262' into feature/SHRINE2020-1263 | | |
Xav | 2b9df831c03 | Merge branch 'develop' into feature/SHRINE2020-1262 | | |
David Walend | 8e038fb3ded | Pull request #1365: Feature/SHRINE2020 1350
Merge in SHRINE/shrine from feature/SHRINE2020-1350 to develop
* commit... | | |
Xav | ea8ff83887d | minor clean-up | | |
Xav | f75c162e99c | merge 1262 (and hence recent changes to 1350) with conflicts | | |
Xav | 8e0d5f3a1b5 | resolve merge conflicts (merging 1350 into 1262) | | |
dwalend | 1e2d8518f9f | Cleanup for SHRINE2020-1360 | | |
Xav | c548759c01c | add "Last" option to Event Anchor drop-down and b/e | | |
dwalend | adff2203ebd | Rename and new json encoder for query and result states for SHRINE2020-1360 | | |
dwalend | 6557affb848 | Big move before redefining the json for SHRINE2020-1360 | | |
| Next → |
