 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... | | |
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" | | |
| Next → |
