SHRINE
  1. SHRINE

shrine

Public
  1. SHRINE
  2. shrine

All Branches Graph  

        
AuthorCommitMessageCommit dateBuilds
dwalenddwalend
a1ec8356734Handled start and end dates via the scopt API for SHRINE2020-1441
dwalenddwalend
cc57012dbb7Tests running in the build for SHRINE2020-1441
dwalenddwalend
ef0daba8e06Now using scopt for SHRINE2020-1441
dwalenddwalend
06d0c359e8fAdded ability to run from any directory for SHRINE2020-1441
dwalenddwalend
d0997a92e0fNow reading the database password from the command line - without dispalyig it - for SHRINE2020-1441
Marc-Danie NazaireMarc-Danie Nazaire
02a87c02ae9Pull request #1412: SHRINE2020-1445 - Fixed issue with missing shrine-api.war when building docker images Merge in S...
Marc-Danie NazaireMarc-Danie Nazaire
a1c85674f1cSHRINE2020-1445 - Fixed issue with missing shrine-api.war when building docker images
dwalenddwalend
4db8c0cea82Renamed testDataSource to dataSourceConfig for SHRINE2020-1441
dwalenddwalend
4a96da18be6Copied and renamed the hub metrics tool to make a query metrics tool for SHRINE2020-1441 - currently only works at th...
dwalenddwalend
9c1bf5a7822Copied the hub's metric tool into the QEP's for SHRINE2020-1441
dwalenddwalend
bbb9fb88f35Made the QEP schema taller SHRINE2020-1441
XavXav
6546d783c66SHRINE2020-1265 : rename timeSpan to timeSpan1 for compatibility with b/e. Not bug free however.
Marc-Danie NazaireMarc-Danie Nazaire
907f833d6a1Pull request #1411: SHRINE2020-1407 - Fix spacing in the summary panel at the top of the results view Merge in SHRIN...
XavXav
f74613cb8bcSHRINE2020-1265 : add tests with a single event and 0 or 1 time spans
XavXav
680f6946a4aSHRINE2020-1265 : add a test with a single event and two time spans, rename variable and JSON file names for clarity
Marc-Danie NazaireMarc-Danie Nazaire
004a83bc954SHRINE2020-1407 - Fix spacing in the summary panel at the top of the results view
XavXav
558b54c2b50SHRINE2020-1265 : add to tests for the QEP service layer
Marc-Danie NazaireMarc-Danie Nazaire
11b31da5a9aPull request #1410: SHRINE2020-1406 - Settle on layout in the Run Query bar now that topics are gone Merge in SHRINE...
XavXav
54c92c4d6daSHRINE2020-1265 : tweak test code and Timeline.scala as needed after adding second timespan
dwalenddwalend
203ea07210eAdded support for 0, 1, or 2 span tags in i2b2 xml for SHRINE2020-1265
XavXav
eaa7844dd33Merge branch 'feature/SHRINE2020-1265c' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHR...
XavXav
b6a1959d260SHRINE2020-1265 : commit WIP so Dave can work on it
Marc-Danie NazaireMarc-Danie Nazaire
8e815bae555SHRINE2020-1406 - Settle on layout in the Run Query bar now that topics are gone
David WalendDavid Walend
f8df70d7d60Pull request #1408: Feature/SHRINE2020 1404 Merge in SHRINE/shrine from feature/SHRINE2020-1404 to develop * commit...
dwalenddwalend
670914de613Cleared a bunch of printlns from tests while sitting in a parking lot trying not to look too seedy for SHRINE2020-1404
dwalenddwalend
e5878115e60Cleared up the version conflicts for SHRINE2020-1404
dwalenddwalend
ff719b8ba08Use the parameter for the javax servlet api for SHRINE2020-1404
dwalenddwalend
34bc569fabfmerging
dwalenddwalend
8db89dd62f1Checkmarx server URL - getting closer to running checkmarx from maven for SHRINE2020-1415
dwalenddwalend
826000fafcfSorted the properties in the pom.xml for SHRINE2020-1404
XavXav
3cbffeb51c5SHRINE2020-1265 : fix operator drop-down menu
XavXav
c3b6b8d2abbSHRINE2020-1265 : added operator menu
David WalendDavid Walend
c1dc6571493Pull 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 WalendDavid Walend
80e01add8afPull request #1403: Feature/SHRINE2020 1431 Merge in SHRINE/shrine from feature/SHRINE2020-1431 to develop * commit...
XavXav
378ed73f684SHRINE2020-1265 : set default timestamp unit to "DAY", not "Day"
Marc-Danie NazaireMarc-Danie Nazaire
812f76785c4Pull request #1406: SHRINE2020-1405 - Fix setting of kafka version used in docker Merge in SHRINE/shrine from bugfix...
dwalenddwalend
85f1cc1845fmerging
David WalendDavid Walend
b6e1da58352Pull request #1404: Feature/SHRINE2020 1421 Merge in SHRINE/shrine from feature/SHRINE2020-1421 to develop * commit...
Marc-Danie NazaireMarc-Danie Nazaire
58ea3053261SHRINE2020-1405 - Fix setting of kafka version used in docker
XavXav
4d4d2efd436SHRINE2020-1265 : make timespan units menu work and submitted to the b/e, although it is still needs to be pre-populated
XavXav
2e63090c7a1SHRINE2020-1265 : fix regression on relationship menu; try to make timespan untis menu work
XavXav
134c5029eb9Merge branch 'feature/SHRINE2020-1265c' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHR...
XavXav
25983ac5eb2SHRINE2020-1265 : Many of the UI elements behave as expected, i.e. have state and do not break the f/e-to-b/e interfa...
dwalenddwalend
a008ca7ee2bMergig from develop
dwalenddwalend
5b6ff99e480Marc-Danie review comments for SHRINE2020-1431
dwalenddwalend
5320415c79eMove to Scala 2.13.11, and a fix in some Authz code that went from warn to error for SHRINE2020-1347
dwalenddwalend
7acd90ad683Merge remote-tracking branch 'origin/develop' into SHRINE2020-1378-remove-dsa
dwalenddwalend
a60eb592448Merge remote-tracking branch 'origin/develop' into feature/SHRINE2020-1421
dwalenddwalend
6881e88905aSome sad todos to reenable unit tests after we or slick takes care of some other bugs for SHRINE2020-1421
dwalenddwalend
99f06267745Cleaned up some tests around Loggable for SHRINE2020-1421
Marc-Danie NazaireMarc-Danie Nazaire
5a314911a91SHRINE2020-1265c - Fixed setting of dropdown values
David WalendDavid Walend
3f8b7da21c2Pull request #1401: Switched unit test log level to warn for SHRINE2020-1417 Merge in SHRINE/shrine from feature/SHR...
David WalendDavid Walend
edafa33e82dPull request #1399: Warning goes away when I put both execution sections in the same plugin declaration for SHRINE202...
David WalendDavid Walend
19b8166184cPull request #1400: Switched to a less complicated timestamp format for SHRINE2020-1419 Merge in SHRINE/shrine from ...
dwalenddwalend
d96650d2f29Some cleanup while doing SHRINE2020-1431
dwalenddwalend
26db582b292Removed another warning for SHRINE2020-1431
XavXav
2368780911fSHRINE2020-1265 : Fix two failing tests after changes
dwalenddwalend
856cc42d404A couple of tweaks to fix the compile for SHRINE2020-1265
XavXav
da7df14ff76SHRINE2020-1265c : Try to make it all work for 1 timespan UI widget
XavXav
892715c52b4SHRINE2020-1265c : cherry pick from 1265 (case object examples (that don't compile) for SHRINE2020-1265 11df7f86a dwa...
XavXav
45d7623ff63SHRINE2020-1265c : fix test
XavXav
2122d9c50d7SHRINE2020-1265c : fix tests
XavXav
d33c213b97aSHRINE2020-1265 : fix constant names, perhaps temporarily
dwalenddwalend
11df7f86a44case object examples (that don't compile) for SHRINE2020-1265
dwalenddwalend
c0abba20bccFixing an indent for SHRINE2020-1431
XavXav
34d19ec161aSHRINE2020-1265 : minimal renaming which highlights the need for more renameing/code changes ; rename two failing te...
XavXav
df0e23642a9SHRINE2020-1265 : implement 1 timespan widget (operator/value/unit) which make it to the API payload, 2 broken f/e te...
dwalenddwalend
5aaf528410fAdding maven-resources-plugin cleared one of the problems in SHRINE2020-1431
dwalenddwalend
011b136ab51Cherry-picked the fix for the build jitter problem from SHRINE2020-1393 to SHRINE2020-1265
dwalenddwalend
cc0c95ffd5eSwitched to a less complicated timestamp format for SHRINE2020-1419
dwalenddwalend
c156d2b3d2aWarning goes away when I put both execution sections in the same plugin declaration for SHRINE2020-1418
dwalenddwalend
022a45a35aeSwitched unit test log level to warn for SHRINE2020-1417
dwalenddwalend
eefd07a39a9Merge branch 'feature/SHRINE2020-1379-remove-topics' into SHRINE2020-1378-remove-dsa
dwalenddwalend
3b0f5ad08a4Merge remote-tracking branch 'origin/develop' into feature/SHRINE2020-1379-remove-topics
dwalenddwalend
53c45b7b430Merge remote-tracking branch 'origin/develop' into feature/SHRINE2020-1432
dwalenddwalend
27e56672c50Log setting to remove all the INFO lines from maven's output for SHRINE2020-1432
XavXav
3ae365b827dMerge branch 'develop' into feature/SHRINE2020-1264
dwalenddwalend
1ae99d91332Parking work on SHRINE2020-1415 while I wait to hear from HMS IT Security about SHRINE using their server
XavXav
d5345fc70cfSHRINE2020-1264: remove some todos
XavXav
461508d3479Merge branch 'feature/SHRINE2020-1264' into feature/SHRINE2020-1265
XavXav
3725f458ac5Revert "created two stateful checkboxes, for SHRINE2020-1265" This reverts commit 02a9f5c3aaaa44a0b90dc73c38317dccca...
XavXav
9f472dca278SHRINE2020-1264: reset to what it was before started work on 1264
Marc-Danie NazaireMarc-Danie Nazaire
1e5a34df067Pull request #1397: SHRINE2020-1412 - Remove hard coded tag of "powered by ..." from header and place in footer in 3....
Marc-Danie NazaireMarc-Danie Nazaire
19dfcdf07c8SHRINE2020-1412 - Remove hard coded tag of "powered by ..." from header and place in footer in 3.3 line - fixed bad m...
Marc-Danie NazaireMarc-Danie Nazaire
512d172631dMerge branch 'feature/Custom_Breakdowns_3_3_0' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feat...
Marc-Danie NazaireMarc-Danie Nazaire
718c8d53d97Pull request #1396: SHRINE2020-1411 - Create new header variable in shrine.conf; remove reference to network name var...
Marc-Danie NazaireMarc-Danie Nazaire
3b9f4033301SHRINE2020-1412 - Remove hard coded tag of "powered by ..." from header and place in footer in 3.3 line
Marc-Danie NazaireMarc-Danie Nazaire
fb1341fc0eeSHRINE2020-1411 - Create new header variable in shrine.conf; remove reference to network name variable
dwalenddwalend
37f0a269af6Merge remote-tracking branch 'origin/feature/SHRINE2020-1379-remove-topics' into SHRINE2020-1378-remove-dsa
David WalendDavid Walend
5baa2554955Pull request #1384: Bugfix/SHRINE2020 1393 something strange is going on in the json stored at the qep Merge in SHRI...
David WalendDavid Walend
d8c3f996b22Pull request #1395: Feature/SHRINE2020 1403 Merge in SHRINE/shrine from feature/SHRINE2020-1403 to SHRINE2020-1378-r...
XavXav
451a391e7b3SHRINE2020-1264: works with refactored / more object-oriented code
Marc-Danie NazaireMarc-Danie Nazaire
e64c0b2b453Pull request #1394: SHRINE2020-826 - Bar graphs: Different width size is appearing for 'Demographic distribution by S...
dwalenddwalend
9aa81c15309Merge branch 'feature/SHRINE2020-1379-remove-topics' into bugfix/SHRINE2020-1393-something-strange-is-going-on-in-the...
dwalenddwalend
fcd8aa1359dMerge branch 'SHRINE2020-1378-remove-dsa' into feature/SHRINE2020-1403
dwalenddwalend
61d7039576cMerging SHRINE2020-1401 from develop
dwalenddwalend
6edc08d034cMerge remote-tracking branch 'origin/develop' into feature/SHRINE2020-1379-remove-topics
David WalendDavid Walend
c6341a87e95Pull request #1390: Bugfix/SHRINE2020 1401 Merge in SHRINE/shrine from bugfix/SHRINE2020-1401 to develop * commit '...
dwalenddwalend
1af6c3d0ccaMerge remote-tracking branch 'origin/feature/SHRINE2020-1379-remove-topics' into bugfix/SHRINE2020-1393-something-str...
dwalenddwalend
ec3576b24dbUpdating this SHRINE 1.20-era sql for SHRINE2020-1403
dwalenddwalend
cd3e2b2e7f8Some more topics to remove from json tests for SHRINE2020-1403
XavXav
02a9f5c3aaacreated two stateful checkboxes, for SHRINE2020-1265
David WalendDavid Walend
1d1c321de7cPull request #1387: Feature/SHRINE2020 1390 Merge in SHRINE/shrine from feature/SHRINE2020-1390 to feature/SHRINE202...
Marc-Danie NazaireMarc-Danie Nazaire
1be20ca4f32SHRINE2020-826 - Bar graphs: Different width size is appearing for 'Demographic distribution by Sex' bar graph as com...
dwalenddwalend
28d320d20ceRemoved more topics for SHRINE2020-1403
dwalenddwalend
bcafb7cce21Removed almost all things topic, and the v1 protocol for SHRINE2020-1403
Marc-Danie NazaireMarc-Danie Nazaire
9b96c4d55c7Pull request #1393: SHRINE2020-1397 - New breakdowns are displayed under heading Demographic distribution. Merge in ...
Marc-Danie NazaireMarc-Danie Nazaire
fb6f9a0bf4dPull request #1392: SHRINE2020-1398 - Whole screen goes white on clicking outside new breakdown pop-up Merge in SHRI...
XavXav
9096c441bbcmade relationship values in the front end match the back-end, for SHRINE2020-1264
Marc-Danie NazaireMarc-Danie Nazaire
f118b15251dSHRINE2020-1397 - New breakdowns are displayed under heading Demographic distribution. Also tooltip for download icon...
XavXav
77745c20b10made relationship not optional, for SHRINE2020-1264
Marc-Danie NazaireMarc-Danie Nazaire
1e4fd367bc5SHRINE2020-1398 - Whole screen goes white on clicking outside new breakdown pop-up
dwalenddwalend
3525e1c31deMore and more merging
dwalenddwalend
5fbe0986767Merging
dwalenddwalend
51601d1f756Merging remove topics into remove dsa
dwalenddwalend
600325ed05emerging from develop
dwalenddwalend
814f116f0c8Merge remote-tracking branch 'origin/develop' into bugfix/SHRINE2020-1401
XavXav
1cd407ac2e3made relationship not optional, for SHRINE2020-1264
dwalenddwalend
762b780d4e2Dropping unused reporting plugins from the QEP pom.xml for SHRINE2020-1401
XavXav
1f7554ece48changed "occurrenceValue" to "relationship" in the code, fixed unit f/e tests accordingly, for SHRINE2020-1264
dwalenddwalend
7102b9c603aSome more cleanup for SHRINE2020-1401
dwalenddwalend
f55f89ed962Moved all the plugin version numbers to the big list of versions for SHRINE2020-1401
dwalenddwalend
bce97b78e51Docker plugin is now building without downloanding log4j for SHRINE2020-1401
Marc-Danie NazaireMarc-Danie Nazaire
a3d9feedc6aSHRINE2020-1390 - Remove topic selection and create, widgets, and topic id fields from the front-end code - Adjusted ...
XavXav
0d2b3d6f3afMerge branch 'develop' into feature/SHRINE2020-1264
XavXav
dd3cdbdc4b3Merge branch 'feature/SHRINE2020-1263' into develop
David WalendDavid Walend
8c3784e2a1ePull request #1386: Feature/SHRINE2020 1389 Merge in SHRINE/shrine from feature/SHRINE2020-1389 to feature/SHRINE202...
dwalenddwalend
fd0b69d4574Marc-Danie found another topic to remove for SHRINE2020-1389
XavXav
a76059429daWorks nicely in the f/e, but may not line up with the b/e, for SHRINE2020-1264
XavXav
8ede1c7b9a6Merge branch 'feature/SHRINE2020-1263' into feature/SHRINE2020-1264
XavXav
7ec5c376423fine-tune exception message for SHRINE2020-1264
XavXav
0c17b8a0b5cMinor clean-up for SHRINE2020-1263
XavXav
fe8d9988fc0Refactor TimelineLink to take EventConstraint parameters for SHRINE2020-1263
David WalendDavid Walend
3060e24f8fbPull request #1383: Feature/SHRINE2020 1388 Merge in SHRINE/shrine from feature/SHRINE2020-1388 to feature/SHRINE202...
David WalendDavid Walend
dc269aae02fPull request #1388: Feature/SHRINE2020 1383 Merge in SHRINE/shrine from feature/SHRINE2020-1383 to SHRINE2020-1378-r...
David WalendDavid Walend
a184b90de27Pull request #1389: Fixed a few unlikely vulnerabilities for SHRINE2020-1395 Merge in SHRINE/shrine from bugfix/SHRI...
dwalenddwalend
cf996af3aa7Fixed a few unlikely vulnerabilities for SHRINE2020-1395
dwalenddwalend
3db9c84cfdcSome dead properties in some tests while reviewing SHRINE2020-1383
dwalenddwalend
91eeaf58e21Use the modern driver name instead of the backwards-compatible alias in the example context.xml file - SHRINE2020-575
David WalendDavid Walend
05a4d571e61Pull request #1385: Feature/SHRINE2020 1381 Merge in SHRINE/shrine from feature/SHRINE2020-1381 to SHRINE2020-1378-r...
David WalendDavid Walend
e1e42354f7ePull request #1381: Feature/SHRINE2020 1387 Merge in SHRINE/shrine from feature/SHRINE2020-1387 to feature/SHRINE202...
dwalenddwalend
ab240af8d88Now with empty database schema files for SHRINE2020-1383
dwalenddwalend
f022df740f1Adding the DSA database schema back for SHRINE2020-1383
Marc-Danie NazaireMarc-Danie Nazaire
b35a3acac02Pull request #1382: Feature/SHRINE2020 1357 - Allow user to select "advanced options" for breakdowns Merge in SHRINE...
dwalenddwalend
15508e6f0dfRemoved all things 'steward' for SHRINE2020-1383
dwalenddwalend
787957b1056Removed all the DSA back-end code for SHRINE2020-1383
dwalenddwalend
94e49bd8c1cRemoved dependencies on DSA code from the https services for SHRINE2020-1383
dwalenddwalend
352b1c4a9a5Merge branch 'bugfix/SHRINE2020-1393-something-strange-is-going-on-in-the-json-stored-at-the-qep' into feature/SHRINE...
dwalenddwalend
dd2d324973dFixed some time stamp jitter in a test for SHRINE2020-1393
dwalenddwalend
30e01fbc3f9Adding test back to do in a separate ticket
XavXav
97088009510fine-tune exception message for SHRINE2020-1263
dwalenddwalend
e7b75e75a50Removed DSA front-end code for SHRINE2020-1381
XavXav
ecdf7b9e421more clean up for SHRINE2020-1263
dwalenddwalend
96db62d62f3Removed DSA UI code from the build for SHRINE2020-1381
dwalenddwalend
355b38e6ebaMerge branch 'feature/SHRINE2020-1389' into feature/SHRINE2020-1390
dwalenddwalend
631341a92bbA character is 24px tall - for SHRINE2020-1389
dwalenddwalend
20b8dc2e9c4Removed projectId - a topic in sheep's clothing - for SHRINE2020-1390
David WalendDavid Walend
7ef75563419Pull request #1380: Feature/SHRINE2020 1386 Merge in SHRINE/shrine from feature/SHRINE2020-1386 to feature/SHRINE202...
dwalenddwalend
870de027478Cleaned out topics from the javascript code for SHRINE2020-1390
XavXav
d7917ddaa06further make "ANY" the default value for the event-anchor/aggregateOperator, along with some cleanup, for SHRINE2020-...
dwalenddwalend
605138f29d6Shrinking the result panel now that we're not showing the topic anymore for SHRINE2020-1389
XavXav
6a2d7488b73reinstate response.json needed for f/e testing, for SHRINE2020-1263
XavXav
d52f827eb36Continue making "ANY" the default value of the aggregateOperator in a query timeline link for SHRINE2020-1263
XavXav
e192d8194acContinue making "ANY" the default value of the aggregateOperator in a query timeline link for SHRINE2020-1263
dwalenddwalend
1796bbe1cceFixed javascript unit test for SHRINE2020-1389
dwalenddwalend
d1bcc13f96eCheck to see if I broke javascript building when I updated brew last night - SHRINE2020-1389
Marc-Danie NazaireMarc-Danie Nazaire
be1297f9ea3SHRINE2020-1357-Allow user to select "advanced options" for breakdowns - Added new category property to example shrin...
Marc-Danie NazaireMarc-Danie Nazaire
7546b86b1ccSHRINE2020-1357-Allow user to select "advanced options" for breakdowns - Fixed breakdown group header css
dwalenddwalend
89f91136233Removed DSA dependencies from the QEP for SHRINE2020-1388
dwalenddwalend
ba0faef24cdPushing topics into default values of the structures shared with the javascript for SHRINE2020-1388
dwalenddwalend
0a15045f4b0Deleting more dead code for SHRINE2020-1388
dwalenddwalend
78fa1609c9dThe Qep no longer uses a QueryAuthorizationService for SHRINE2020-1388
dwalenddwalend
30eb72136e2Removed DSA references from the QepService and QueryRunner for SHRINE2020-1388
dwalenddwalend
61184e6681fRemoved topics from the audit database for SHRINE2020-1388
Marc-Danie NazaireMarc-Danie Nazaire
f709af3e69eSHRINE2020-1357-Allow user to select "advanced options" for breakdowns - Addd more custom breakdowns to docker network
Marc-Danie NazaireMarc-Danie Nazaire
c38b7f170b4SHRINE2020-1357-Allow user to select "advanced options" for breakdowns - Fixed mssql statement to allow null in data_...
Marc-Danie NazaireMarc-Danie Nazaire
0f98d80704aSHRINE2020-1357-Allow user to select "advanced options" for breakdowns - Fixed mssql statement to allow null in data_...
Marc-Danie NazaireMarc-Danie Nazaire
2952625bcbaSHRINE2020-1357-Allow user to select "advanced options" for breakdowns - Fixed sql to allow null in data_key column o...
Marc-Danie NazaireMarc-Danie Nazaire
3deaa0c92c6SHRINE2020-1357-Allow user to select "advanced options" for breakdowns - Allow null in data_key column of the breakdo...
Marc-Danie NazaireMarc-Danie Nazaire
d8c28ed1758SHRINE2020-1357-Allow user to select "advanced options" for breakdowns - Minor front-end code cleanup
Marc-Danie NazaireMarc-Danie Nazaire
3ede3e0a468Merge branch 'feature/Custom_Breakdowns_3_3_0' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feat...
Marc-Danie NazaireMarc-Danie Nazaire
248c244dbafSHRINE2020-1357-Allow user to select "advanced options" for breakdowns - Clean up docker README.md
Marc-Danie NazaireMarc-Danie Nazaire
f0e6e681743SHRINE2020-1357-Allow user to select "advanced options" for breakdowns - Added checkmark for when advance options is ...
dwalenddwalend
b224a2454d4Deleted topics from v2 for SHRINE2020-1387
dwalenddwalend
5ef4d459a02Cleaning out more topic-related stuff from the hub for SHRINE2020-1387
dwalenddwalend
6f12d52d657Remove the hub's topic table for SHRINE2020-1387
dwalenddwalend
ec6dca987a3Removed topics from the hub for SHRINE2020-1387
dwalenddwalend
4f0719a6267Removed topic from RunQueryAtHub and propagated the change for SHRINE2020-1387
Next →