SHRINE
  1. SHRINE

shrine

Public
  1. SHRINE
  2. shrine

All Branches Graph  

        
AuthorCommitMessageCommit dateBuilds
Marc-Danie NazaireMarc-Danie Nazaire
d6e21805738SHRINE2020-1392-Create TOU Acknowledgement Page Post login
XavXav
9b8e58c1d96SHRINE2020-1465 : move "Powered by the NCATS CTSA Program" to the footer, based on SHRINE2020-1412
XavXav
039cf3a90a4SHRINE2020-1465 : remove "the" from static text around network name; move "Powered by the NCATS CTSA Program" to the ...
XavXav
c27ff6cf32bSHRINE2020-1465 : create new config setting for banner text distinct from network name
XavXav
cd009c709b7SHRINE2020-1467 back-end: improvements as per PR: do not set termsOfUseText where it already has a defaukt value
XavXav
41bc4b5c36eSHRINE2020-1467 back-end: pass TOU from config file to the front end
Marc-Danie NazaireMarc-Danie Nazaire
fe15fbf23fdSHRINE2020-1268 - Add validation to date fields for event relationships
XavXav
55904930c9dSHRINE2020-1265 : rename shrine.conf setting to specify the content of the "please accept this verbiage" text
XavXav
fdb60a1cd61SHRINE2020-1265 : add shrine.conf setting to specify the content of the "please accept this verbiage" text
David WalendDavid Walend
8ebdeba03b7Pull request #1418: Changed the front-end javascript build to a pom to get rid of the empty jar warning for SHRINE202...
David WalendDavid Walend
5c8f810ecdfPull request #1417: Handled the ugly part of parsing a strange message for SHRINE2020-1424 Merge in SHRINE/shrine fr...
dwalenddwalend
1cf3dc87fd3Merge branch 'feature/SHRINE2020-1443' into feature/SHRINE2020-1446
dwalenddwalend
4191760a623Changed the front-end javascript build to a pom to get rid of the empty jar warning for SHRINE2020-1428
dwalenddwalend
82cb4797378Can do a little better to make sure the xml is in the exception message for SHRINE2020-1424
dwalenddwalend
60fca9d63a8Handled the ugly part of parsing a strange message for SHRINE2020-1424
Marc-Danie NazaireMarc-Danie Nazaire
2ae9331f521SHRINE2020-1267 - Expand/collapse layout to event relationships (Material UI) - Fix wrapping of readable section
Marc-Danie NazaireMarc-Danie Nazaire
1a339f53aa3SHRINE2020-1267 - Expand/collapse layout to event relationships (Material UI) - Fix wrapping of editable section and ...
dwalenddwalend
a4b83921ddfFound some old stand-in code while testing SHRINE2020-1266
Marc-Danie NazaireMarc-Danie Nazaire
5f669eeb11dSHRINE2020-1267 - Expand/collapse layout to event relationships (Material UI)
dwalenddwalend
b2d4c8d3307todo sweep for SHRINE2020-1266
dwalenddwalend
13f029c6ffeMore html text for SHRINE2020-1266
dwalenddwalend
3a80d32674dMerge remote-tracking branch 'origin/develop' into feature/SHRINE2020-1266
dwalenddwalend
c28cac6a2e6Added html text for relationships and event time spans for SHRINE2020-1266
Xavier HaurieXavier Haurie
436451935dePull request #1407: Feature/SHRINE2020 1265c Merge in SHRINE/shrine from feature/SHRINE2020-1265c to develop * comm...
dwalenddwalend
30e3167860bTest of getNetwork I made while working with Nic
dwalenddwalend
0f02a72ff46Figured out help and version for SHRINE2020-1443
dwalenddwalend
9b370410294got real messages for help and version for SHRINE2020-1466
dwalenddwalend
8ecb20f2eedMerge branch 'feature/SHRINE2020-1443' into feature/SHRINE2020-1446
dwalenddwalend
aed6aee312bPrereview cleanup for SHRINE2020-1443
dwalenddwalend
8a3c853fdb5Result CSV from the qep's database for SHRINE2020-1443
dwalenddwalend
80676a1b9eaResearchers now sourced from the QEP data for SHRINE2020-1443
dwalenddwalend
3c408f465c6Using the QEP's tables for queries for SHRINE2020-1443
dwalenddwalend
93c818d78a7Fixing counts for SHRINE2020-1443
dwalenddwalend
6f75a1d064bFixing counts for SHRINE2020-1446
dwalenddwalend
9ec57878b12Lots of renaming for SHRINE2020-1446
dwalenddwalend
443a5c3bbf3More renaming for SHRINE2020-1446
dwalenddwalend
09d71676dbfCopied the tool for SHRINE2020-1446
dwalenddwalend
3284038b5eeRemoved the hub audit tool for SHRINE2020-1446
dwalenddwalend
4bc67ae9757Result column rename for SHRINE2020-1443
dwalenddwalend
b3501ad8f52Reordered query columns for SHRINE2020-1443
dwalenddwalend
066ba004336Renamed query columns per Anupama for SHRINE2020-1443
dwalenddwalend
cf3aaf32d64Anupama's decisions for the researcher CSV for SHRINE2020-1443
David WalendDavid Walend
03b7daa6d5cPull request #1415: Feature/SHRINE2020 1442 Merge in SHRINE/shrine from feature/SHRINE2020-1442 to develop * commit...
Marc-Danie NazaireMarc-Danie Nazaire
e5e6e4dbd74SHRINE2020-1265 - Augment time gap to event relationship - renamed timeConstraint1 and timeConstraint2 to primaryTime...
Marc-Danie NazaireMarc-Danie Nazaire
11373b01f7fSHRINE2020-1265 - Augment time gap to event relationship - renamed timeSpan1 and timeSpan2 to primaryTimeSpan and sec...
Marc-Danie NazaireMarc-Danie Nazaire
04f67973f95SHRINE2020-1265 - Added unit tests for two time spans
Marc-Danie NazaireMarc-Danie Nazaire
36af6179a78SHRINE2020-1265 - Code review changes from Dave
Marc-Danie NazaireMarc-Danie Nazaire
2902ca1793bSHRINE2020-1265 - Reduced font size of timeline link area in UI to reduce text wrapping
Marc-Danie NazaireMarc-Danie Nazaire
3001c6c3e16SHRINE2020-1265 - Disable days if time span 1 is not enabled
Marc-Danie NazaireMarc-Danie Nazaire
0fa13a88505SHRINE2020-1265 - Fix reload of time span operator
Marc-Danie NazaireMarc-Danie Nazaire
6b49bfab640SHRINE2020-1265 - Removed magic strings and disable time span 2 if time span 1 is not selected
dwalenddwalend
d0731678a22Merge remote-tracking branch 'origin/develop' into feature/SHRINE2020-1442
David WalendDavid Walend
4a344e06a28Pull request #1413: Feature/SHRINE2020 1441 Merge in SHRINE/shrine from feature/SHRINE2020-1441 to develop * commit...
dwalenddwalend
8e121707437Marc-Danie spotted a problem with newer versions of mysql and distinct SHRINE2020-1442
dwalenddwalend
6c1b6a7746fMerge branch 'feature/SHRINE2020-1441' into feature/SHRINE2020-1442
dwalenddwalend
c0c919f7a8dMarc-Danie found a problem with distinct in contemporary mariadb versions SHRINE2020-1441
dwalenddwalend
82464af9436Added a column for the query json for SHRINE2020-1442
dwalenddwalend
c7f72fc2bccMerge remote-tracking branch 'origin/develop' into feature/SHRINE2020-1442
David WalendDavid Walend
23be1c058e4Pull request #1414: Removing the last bits of the DSA from the codebase for SHRINE2020-1384 Merge in SHRINE/shrine f...
dwalenddwalend
250d07170caHacked in the full text of the query for SHRINE2020-1442
dwalenddwalend
ec48015349bFiltering the researcher csv by researcher for SHRINE2020-1442
dwalenddwalend
63013073a07Changed from datestamps to time in state for result and query states for SHRINE2020-1442
Marc-Danie NazaireMarc-Danie Nazaire
b10a2c22b49Merge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-1265c
Marc-Danie NazaireMarc-Danie Nazaire
a645ca91462SHRINE2020-1265 - Fixed extraction of second timespan data
dwalenddwalend
e83bdbe2873Merge remote-tracking branch 'origin/develop' into feature/SHRINE2020-1442
Marc-Danie NazaireMarc-Danie Nazaire
08a67186e17SHRINE2020-1265c - Refactored setting of time span
Marc-Danie NazaireMarc-Danie Nazaire
396c79d4c2cSHRINE2020-1265c-Fixed layout of new time span fields
dwalenddwalend
987547a0d49Removing the last bits of the DSA from the codebase for SHRINE2020-1384
dwalenddwalend
635b32c960bNow able to select a single researcher for queries or results csvs for SHRINE2020-1442
dwalenddwalend
f12504ec39dGot a results table for SHRINE2020-1442
dwalenddwalend
9c983f05ba3Some refinements, more on results for SHRINE2020-1442
dwalenddwalend
b681b6e61d5Got what I like for queries compiling, broke results, for SHRINE2020-1442
dwalenddwalend
2542d9b23c5Added a csv of researchers for SHRINE2020-1442
dwalenddwalend
f4d2d08d594Added a table of researchers for SHRINE2020-1442
dwalenddwalend
a042524741bMerge remote-tracking branch 'origin/develop' into feature/SHRINE2020-1441
dwalenddwalend
4c9b23e3d21Added skeliton of a command to make a CSV of researchers for SHRINE2020-1441
dwalenddwalend
3ebe3b0049dAdded a default output file name for SHRINE2020-1441
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
Next →