 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... | | |
Xav | ad50df276d3 | refactor f/e to match b/e API | | |
Xav | 14f2a585364 | push so that the b/e changes can be looked at | | |
Marc-Danie Nazaire | 31de168e934 | SHRINE2020-1357-Allow user to select "advanced options" for breakdowns - Removed NOT NULL in the oracle update statement | | |
Marc-Danie Nazaire | 9158fb9804c | SHRINE2020-1357-Allow user to select "advanced options" for breakdowns - Updated badge to indicate advanced data dist... | | |
dwalend | 97fda89b12f | Shifted calls to the CRC to the CRC's execution context for SHRINE2020-1303 | | |
Marc-Danie Nazaire | 80e0f2306f0 | SHRINE2020-1357-Allow user to select "advanced options" for breakdowns - Added badge to indicate data distribution wa... | | |
dwalend | 9232ec77554 | Bill's review comments and a jmeter update for SHRINE2020-1362 | | |
Marc-Danie Nazaire | d83f4d5e37a | SHRINE2020-1357-Allow user to select "advanced options" for breakdowns - fixed api call to call data distribution types | | |
 Bill Simons | 34a8f25000d | Clean up README | | |
Marc-Danie Nazaire | 4e16af97eaf | SHRINE2020-1357-Allow user to select "advanced options" for breakdowns - updated front-end snapshot | | |
Marc-Danie Nazaire | a10718879d2 | SHRINE2020-1357-Allow user to select "advanced options" for breakdowns | | |
Marc-Danie Nazaire | eda286febb1 | SHRINE2020-1364 - Create api call to get the breakdown output types - Added check only parse valid data distribution ... | | |
Marc-Danie Nazaire | 9961d12d863 | SHRINE2020-1364 - Create api call to get the breakdown output types - Modified unit test to read expected json from file | | |
Marc-Danie Nazaire | a80412788d4 | SHRINE2020-1364 - Create api call to get the breakdown output types - Added unit test | | |
Bill Simons | a8f8e01d5a9 | Convert docker dev env to legacy MOM | | |
dwalend | eff3a432f2f | Added optional item version field to UpdateQueryAtAdapter for SHRINE2020-1366 | | |
dwalend | 9148a14bc57 | Added expectedVersion field to UpdateQueryAtQep commands for SHRINE2020-1366 | | |
Xav | 808ab01ea5c | temporary push so Dave can have a look | | |
dwalend | 62e8001aff5 | merging PR changes to the Query class | | |
Marc-Danie Nazaire | b0597a02a69 | SHRINE2020-1364 - Create api call to get the breakdown output types | | |
dwalend | 4c2adb75093 | Now using the right list of breakdown names for SHRINE2020-1373 | | |
dwalend | a6b90e6950f | Removed unused output fields in json read tests for SHRINE2020-1373 | | |
dwalend | 441c66b37bc | Removed the output enum for SHRINE2020-1373 | | |
dwalend | 8812795ce7a | Getting all the breakdowns in to match current behavior for SHRINE2020-1373 | | |
dwalend | 3f152663a9e | Added a list of breakdown names for SHRINE2020-1373 | | |
dwalend | 919456b311d | My review pass of SHRINE2020-1362 | | |
Marc-Danie Nazaire | 12b3cf6db39 | Merge branch 'feature/Custom_Breakdowns_3_3_0' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feat... | | |
Marc-Danie Nazaire | 1f8ee6c3223 | Pull request #1374: Bugfix/SHRINE2020 1363 get docker working
Merge in SHRINE/shrine from bugfix/SHRINE2020-1363-get... | | |
Marc-Danie Nazaire | ee082f76d95 | SHRINE2020-1363-Get docker working - Cleaned out some kafka and sso related items | | |
dwalend | bd7605f95d3 | More renaming of QUEUED query methods and some future tickets for SHRINE2020-1362 | | |
dwalend | 9eff10a61b0 | Renamed to emphasize that the old messages are for QUEUED query updates only for SHRINE2020-1362 | | |
dwalend | 8f3e8dbee49 | Used the new UpdateResult messages in the adapter's not-queued query handling for SHRINE2020-1362 | | |
dwalend | 0e27d9a7271 | Now able to receive and process the UpdateResult messsages for SHRINE2020-1362 | | |
dwalend | 43ca49e1966 | Update with results and try to unwind itemVersion conflicts - now in the hub db for SHRINE2020-1362 | | |
Marc-Danie Nazaire | 4c5b233bbf8 | SHRINE2020-1364 - Create api call to get the breakdown output types - changed TYPE column from enum to varchar in QUE... | | |
Marc-Danie Nazaire | 0970bb8d588 | Merge branch 'bugfix/SHRINE2020-1363-get-docker-working' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine... | | |
Marc-Danie Nazaire | 211985edf6d | SHRINE2020-1363-Get docker working - Removed references to kafka | | |
dwalend | 75610476e2a | merging | | |
dwalend | 12270d60bce | First pass of the new result updates for SHRINE2020-1362 | | |
Marc-Danie Nazaire | b1215045db0 | SHRINE2020-1363-Get docker working - Fixed duplicate caused by merge | | |
Xav | b75d8af6350 | Merge branch 'feature/SHRINE2020-1262' into feature/SHRINE2020-1263 | | |
Marc-Danie Nazaire | 4ba417a22af | Merge branch 'feature/Custom_Breakdowns_3_3_0' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into bugf... | | |
Marc-Danie Nazaire | 74f2d6c1ef0 | Revert new changes for breakdowns | | |
David Walend | 0d025f45372 | Pull request #1372: Feature/SHRINE2020 1360
Merge in SHRINE/shrine from feature/SHRINE2020-1360 to develop
* commit... | | |
Marc-Danie Nazaire | 20f527a9d6b | Merge branch 'feature/Custom_Breakdowns_3_3_0' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into bugf... | | |
Marc-Danie Nazaire | 8c25e8e8f3e | Revert new changes for breakdowns | | |
Marc-Danie Nazaire | f60d59bc651 | Merge branch 'feature/Custom_Breakdowns_3_3_0' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into bugf... | | |
Marc-Danie Nazaire | c09bf2a0162 | Cleared out database update scripts | | |
Marc-Danie Nazaire | 031c51c4725 | Fixed POM versions | | |
Marc-Danie Nazaire | 9254eae8869 | Merge branch 'feature/Custom_Breakdowns_3_3_0' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into bugf... | | |
Marc-Danie Nazaire | 4218118e959 | Fixed POM versions | | |
dwalend | b355aab84a2 | Added UpdateResult to actually carry Results for SHRINE2020-1362 | | |
dwalend | 4171ec27d89 | Moved some json test files for SHRINE2020-1362 | | |
dwalend | aaf066e4d3b | Renamed existin result updates to BestEffort before creating full-state for SHRINE2020-1362 | | |
dwalend | 01b8ed45f25 | Revert "Added a predicted item version for result updates for SHRINE2020-1362"
This reverts commit 2df1f911684d5fc83... | | |
dwalend | 2b9cd1f682a | Revert "Added an optional result id to messages about results for SHRINE2020-1362"
This reverts commit 96c285d5f353f... | | |
dwalend | 1c4260005ec | Revert "Added predictedItemVersion fields to messages about Queries for SHRINE2020-1362"
This reverts commit ff5aa77... | | |
Marc-Danie Nazaire | 9433e0fc7d7 | SHRINE2020-1364 - Create api call to get the breakdown output types - changed TYPE column from enum to varchar in QUE... | | |
Marc-Danie Nazaire | 98a3a7a074e | SHRINE2020-1363-Get docker working - Cleanup base POM | | |
Marc-Danie Nazaire | e967cb1e4f9 | SHRINE2020-1363-Get docker working - Updated to java 17 | | |
Marc-Danie Nazaire | 132b757889d | SHRINE2020-1363-Get docker working - removed docker from base POM | | |
Marc-Danie Nazaire | 58804e35b2a | SHRINE2020-1363-Get docker working | | |
Xav | ece1a0d0fdb | fix the spacing between the elements of the timeline links definition UI | | |
Xav | ed67cb4089c | merge SHRINE2020-1262 into SHRINE2020-1263; fix some test failures; change names in f/e from **aggregateOperator** to... | | |
dwalend | ff5aa77a6cc | Added predictedItemVersion fields to messages about Queries for SHRINE2020-1362 | | |
Xav | 226c7f8eb77 | fix spacing of elements in timeline link as per BA review - SHRINE2020-1262 | | |
dwalend | 96c285d5f35 | Added an optional result id to messages about results for SHRINE2020-1362 | | |
dwalend | 2df1f911684 | Added a predicted item version for result updates for SHRINE2020-1362 | | |
dwalend | 1665c091149 | Comment in wrong file for SHRINE2020-1360 | | |
Xav | 3acff4ac302 | merge develop, with conflicts | | |
Xav | 7f61df45535 | rename fromStartOrEnd to boundary | | |
Xav | 832b6c6d55a | merge develop, with conflicts | | |
Xav | 674859bc3cd | rename "startOrEnd" to "boundary" | | |
David Walend | e2203220561 | Pull request #1368: Feature/SHRINE2020 1352
Merge in SHRINE/shrine from feature/SHRINE2020-1352 to develop
* commit... | | |
Xav | ebf49e3e911 | rename aggregateOperator* to eventAnchor* | | |
Xav | 32f6193cca4 | rename fromStartOrEnd to boundary | | |
Xav | 56cbad26366 | rename fromStartOrEnd to boundary | | |
Xav | fdf4dfeff95 | Merge branch 'feature/SHRINE2020-1262' into feature/SHRINE2020-1263 | | |
Xav | f4bf7b453c4 | Merge branch 'develop' into feature/SHRINE2020-1262 | | |
David Walend | 0ff0b5fe071 | Pull request #1365: Feature/SHRINE2020 1350
Merge in SHRINE/shrine from feature/SHRINE2020-1350 to develop
* commit... | | |
Xav | 3aed61581dd | minor clean-up | | |
Xav | 39cd0121fd0 | merge 1262 (and hence recent changes to 1350) with conflicts | | |
Xav | 2d99cb6073f | resolve merge conflicts (merging 1350 into 1262) | | |
dwalend | e54c7382c57 | Cleanup for SHRINE2020-1360 | | |
Xav | 8e3260be725 | add "Last" option to Event Anchor drop-down and b/e | | |
dwalend | e0c5db99597 | Rename and new json encoder for query and result states for SHRINE2020-1360 | | |
dwalend | 57264a77574 | Big move before redefining the json for SHRINE2020-1360 | | |
dwalend | 0d601a9b334 | Last easy case object update I see for SHRINE2020-1360 | | |
dwalend | 5be0593fff8 | Merged | | |
dwalend | 104424d5c9a | Anupama's words for SHRINE2020-1352 | | |
dwalend | d305798ca74 | Merging | | |
dwalend | cc0b6507004 | Renamed BookEnd to EventBoundary for SHRINE2020-1350 | | |
dwalend | b997b720589 | A first pass of SHRINE2020-1360 - better json for case objects | | |
Xav | 7d59336260e | Merge branch 'feature/SHRINE2020-1350' into feature/SHRINE2020-1262 | | |
dwalend | febbb977a30 | Merge branch 'feature/SHRINE2020-1350' into feature/SHRINE2020-1352 | | |
dwalend | 8fcfe3666cf | Merge remote-tracking branch 'origin/develop' into feature/SHRINE2020-1350 | | |
dwalend | 82e7a48edfd | Mix of library dependencies was not playing nice with case objects for SHRINE2020-1350 | | |
David Walend | fa832150ed1 | Pull request #1369: Updated the help link and wiki page for SHRINE 4.2 for SHRINE2020-1346
Merge in SHRINE/shrine fr... | | |
Xav | e55a7ce652b | add unit test for time link with book ends | | |
Xav | d8525cf31a7 | Merge 1350 into this branch; correct query sent to b/e, but b/e times out | | |
Xav | 1cb3946e022 | Modify the query data structure sent by the f/e to the b/e, which fixes the communication bug between the two | | |
Xav | 30cecd9fa95 | take a step back to make the f/e work, without fromStartOrEnd object. Breaks the b/e because of that change. | | |
Xav | 3ed9bcb61d7 | add BookEnd instance as a member of EventConstraint; make bookends non-Optional; update unit tests to handle book-ends, | | |
dwalend | 22008147fe8 | Nicer json for the new field for SHRINE2020-1352 | | |
dwalend | d81e9a0e8a3 | merging | | |
dwalend | 9ddc9932607 | Found a very clean way to have case objects in the protocol for BookEnds for SHRINE2020-1350 | | |
dwalend | d77f9473319 | Updated the help link and wiki page for SHRINE 4.2 for SHRINE2020-1346 | | |
Xav | 0bd2251caad | clean up js code | | |
dwalend | 8949afc3669 | Getting things lined up just right with the bookend branch for SHRINE2020-1352 | | |
dwalend | 447554ddb1b | merging | | |
Xav | 10344188c1e | Merge branch 'feature/SHRINE2020-1350' into feature/SHRINE2020-1262 | | |
dwalend | 71ebddfaf80 | Needs an example for the javascript end SHRINE2020-1350 | | |
 Ansible Deploy | bdbb15a0e4f | Merge release branch release/4.1.0 into master. | | |
Ansible Deploy | e21ee7bb314 | Update POMs with release version 4.1.0. | | |
dwalend | 5bc049cd170 | I think I've got a full pass for SHRINE2020-1352 caveat a good name for this feature | | |
Xav | e00f92e36b3 | made new drop-downs stateful | | |
dwalend | 590c2882ad4 | Missed an import for SHRINE2020-1352 | | |
dwalend | 393f9ca3efb | Planned work for SHRINE2020-1352 | | |
dwalend | 8bd692323a6 | Merge remote-tracking branch 'origin/develop' into feature/SHRINE2020-1350 | | |
dwalend | ff461cbc6bb | Merge remote-tracking branch 'origin/develop' into feature/SHRINE2020-1352 | | |
David Walend | d0fa05f5ed2 | Pull request #1366: Feature/SHRINE2020 1353
Merge in SHRINE/shrine from feature/SHRINE2020-1353 to develop
* commit... | | |
Xav | a4e84fd5e06 | very first cut at the UI | | |
Xav | b96025fee46 | add instructions for pushing front-end and back-end code to a local docker instance | | |
dwalend | 78b85a5b9db | One last easy upgrade and a sad note about circe for SHRINE2020-1353 | | |
dwalend | 7d1f187564a | More easy library upgrades for SHRINE2020-1353 | | |
dwalend | b766f8427b7 | Updated maven parts for SHRINE2020-1353 | | |
Xav | da07521426f | Merge remote-tracking branch 'origin/develop' into develop | | |
Xav | 9af24577f08 | modifications/fixes to README.md for docker | | |
dwalend | 3f9291523cc | Cleaned out some yellow flags for SHRINE2020-1350 | | |
dwalend | 59e77c9ebee | Marking future work in SHRINE2020-1350 | | |
dwalend | d8f98863ec3 | Fixed some tests for SHRINE2020-1350 | | |
dwalend | 20d15994485 | Intermediate check of SHRINE2020-1350 | | |
David Walend | 0d8f7464e9f | Pull request #1364: More updates to jmeter tests for SHRINE2020-1148
Merge in SHRINE/shrine from SHRINE2020-1148-mor... | | |
dwalend | 383d06bd6df | Notes for how to fix SHRINE2020-1305 | | |
dwalend | 324258e179e | Merging | | |
dwalend | 763a6365e5f | Merging | | |
dwalend | 229385a263a | More updates to jmeter tests for SHRINE2020-1148 | | |
dwalend | c3f797c4892 | Roll back the RC business in the pom.xml | | |
dwalend | c4b67f1c581 | Move develop to shrine 4.2.0 | | |
dwalend | df03d729a9a | Start the 4.1.0 release branch with RC1 | | |
dwalend | 5621992c85e | Cleanup of found files for SHRINE2020-1334 | | |
dwalend | 7bdfa51d374 | Initial state of shrine-dev config files for SHRINE2020-1334 | | |
David Walend | b5d17ec3b5d | Pull request #1363: For Kafka - queueusIO should only return the queues used by this shrine networks, not all the que... | | |
David Walend | a975cc1f780 | Pull request #1362: Feature/SHRINE2020 988
Merge in SHRINE/shrine from feature/SHRINE2020-988 to develop
* commit '... | | |
dwalend | b7020ddfa84 | For Kafka - queueusIO should only return the queues used by this shrine networks, not all the queues in Kafka SHRINE2... | | |
dwalend | aec11385c7e | Better logging for picking a MOM system for SHRINE2020-988 | | |
Xav | 3c976f36a6a | set revision back to 4.1.0 in top-level POM file | | |
Xav | 7d6461db235 | Merge branch 'develop' into sso-phase2 | | |
dwalend | f4ba50c5b25 | Adding the jmeter files used for SHRINE2020-988 | | |
dwalend | 33f17e6284f | Clearing an out-dated error in the log found during SHRINE2020-988 | | |
| Next → |
