SHRINE
  1. SHRINE

shrine

Public
  1. SHRINE
  2. shrine

All Branches Graph  

        
AuthorCommitMessageCommit dateBuilds
David WalendDavid Walend
08b76577297Merge pull request #1071 in SHRINE/shrine from feature/SHRINE2020-513 to develop * commit '3ace84865bb119869bdbad93b...
dwalenddwalend
eba20ec3dc7Test that we get a good error message for a bad URI from config for SHRINE2020-538
Eliza HuangEliza Huang
36f9593ccd8Merge pull request #1040 in SHRINE/shrine from feature/SHRINE2020-516 to develop * commit '458299db2fd6845024d837b5c...
elizahelizah
a778dbffd2drm outdated break down
elizahelizah
0926c1f074emove to index
elizahelizah
18f36beb1e5fix merge conflict
elizahelizah
8a4aa117888Merge branch 'devet push origin HEAD 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feat...
David WalendDavid Walend
4b9f50bcdcfMerge pull request #1069 in SHRINE/shrine from feature/SHRINE2020-515 to develop * commit 'e3d2863835e012226c42a3429...
elizahelizah
5fdcf8b8529merge dev
elizahelizah
458299db2fdMerge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-516
elizahelizah
77c3386b03fMerge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-508
Eliza HuangEliza Huang
9338bd86941Merge pull request #1050 in SHRINE/shrine from feature/SHRINE2020-510 to develop * commit '6717cc8f72b8329f44e04542f...
Marc-Danie NazaireMarc-Danie Nazaire
9824da17fe2SHRINE2020-590 - Edit criteria functionality is not working
Marc-Danie NazaireMarc-Danie Nazaire
bdd9307b9d5Merge pull request #1064 in SHRINE/shrine from bugfix/SHRINE2020-599 to develop * commit 'b120b2118f0e1d86bb5b610a88...
dwalenddwalend
e3d2863835eMarc-Danie found some squeryl code that crept back into SHRINE2020-515
dwalenddwalend
c3105a6ebf9Merging
David WalendDavid Walend
1dad1d8d1dcMerge pull request #1067 in SHRINE/shrine from feature/SHRINE2020-570 to develop * commit '53e22bda9a44b697cc21c9f38...
elizahelizah
cf64d5de015cleanup
elizahelizah
1895f989587force expand on demographic
elizahelizah
b7378399e0aMerge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-580
dwalenddwalend
53e22bda9a4Rename from code review of SHRINE2020-570
dwalenddwalend
fb036610fa4Merge branch 'develop' into feature/SHRINE2020-570
dwalenddwalend
45c88451bb5merging develop
Bill SimonsBill Simons
50028057bf9Merge pull request #1066 in SHRINE/shrine from bugfix/SHRINE2020-614 to develop * commit '7f93b358b7f5ee2dbe382d659b...
dwalenddwalend
bbc0a07ba82Marc-Danie review comments for SHRINE2020-515
dwalenddwalend
3ace84865bbAdded ability to test that 500 errors produce logs when they come from inside our servlet for SHRINE2020-513
Bill SimonsBill Simons
7f93b358b7frename index to keep consistent suffix
Marc-Danie NazaireMarc-Danie Nazaire
44dc30d2eebMerge pull request #1065 in SHRINE/shrine from feature/SHRINE2020-506 to develop * commit '9b6f568869e38d7b3559c6d47...
Marc-Danie NazaireMarc-Danie Nazaire
9b6f568869eMerge from develop
Marc-Danie NazaireMarc-Danie Nazaire
3993a0d9852Merge pull request #1068 in SHRINE/shrine from feature/SHRINE2020-504 to develop * commit 'ad0052101fdf3ffacfc3043b4...
Marc-Danie NazaireMarc-Danie Nazaire
b120b2118f0Merge from develop
Marc-Danie NazaireMarc-Danie Nazaire
09f7370511eMerge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into bugfix/SHRINE2020-599
Marc-Danie NazaireMarc-Danie Nazaire
bda30b2940bMerge pull request #1059 in SHRINE/shrine from feature/SHRINE2020-501 to develop * commit '5fda4e3c5ef83146ad05c8b12...
Marc-Danie NazaireMarc-Danie Nazaire
5fda4e3c5efSHRINE2020-501 - Replace calls to functions in SquerylAdapterDao to corresponding function in QueryHistoryDb - rename...
Marc-Danie NazaireMarc-Danie Nazaire
cee0458fcc5SHRINE2020-501 - Replace calls to functions in SquerylAdapterDao to corresponding function in QueryHistoryDb - update...
Marc-Danie NazaireMarc-Danie Nazaire
1f4232b124aSHRINE2020-501 - Replace calls to functions in SquerylAdapterDao to corresponding function in QueryHistoryDb - update...
Marc-Danie NazaireMarc-Danie Nazaire
e3e529767b2Merge branch 'feature/SHRINE2020-501' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into bugfix/SHRINE...
Marc-Danie NazaireMarc-Danie Nazaire
848e5c39000SHRINE2020-501 - Replace calls to functions in SquerylAdapterDao to corresponding function in QueryHistoryDb - Added ...
dwalenddwalend
b0b47733253Assigned log levels to all raw problems for SHRINE2020-515, and fixed SHRINE2020-544 in the process
dwalenddwalend
f033c3d7fe0Addded ability to log problems at a problem-defined level for SHRINE2020-515
Marc-Danie NazaireMarc-Danie Nazaire
29e64849cc4SHRINE2020-501 - Replace calls to functions in SquerylAdapterDao to corresponding function in QueryHistoryDb - Remove...
Marc-Danie NazaireMarc-Danie Nazaire
c6cd7bdb338SHRINE2020-501 - Replace calls to functions in SquerylAdapterDao to corresponding function in QueryHistoryDb - Fixed ...
Marc-Danie NazaireMarc-Danie Nazaire
4a63033c8f1SHRINE2020-501 - Replace calls to functions in SquerylAdapterDao to corresponding function in QueryHistoryDb - Fixed ...
dwalenddwalend
1088b6ad530Cleanup for SHRINE2020-570
dwalenddwalend
377cf4dba23Got the network, local node, and message queue cached for SHRINE2020-570
elizahelizah
179db203537use reset text
bcarmenbcarmen
ad0052101fdsaving work
bcarmenbcarmen
37a2e150ef0saving updated snapshot test
bcarmenbcarmen
110ad6f3302added s onto demographic distributions
bcarmenbcarmen
cf86ad10198Merge branch 'develop' into feature/SHRINE2020-518
elizahelizah
d10fcca6fc0Merge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-580
elizahelizah
ba3c60277edinline alert
bcarmenbcarmen
df9368f3fa6saving work
bcarmenbcarmen
acf86bddab3saving work
bcarmenbcarmen
336202b8b1aremoved unused file
bcarmenbcarmen
e1c40a0b5abmade recommended changes from BA review
bcarmenbcarmen
9b6baf480c9Merge branch 'develop' into feature/SHRINE2020-506
elizahelizah
bd38a2d41afrename alert box
Eliza HuangEliza Huang
88ebd244451Merge pull request #1057 in SHRINE/shrine from feature/SHRINE2020-526 to develop * commit '1fee77a251bc46f9cc0cb5bd8...
elizahelizah
1fee77a251bMerge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-526
Ben CarmenBen Carmen
58f75efb262Merge pull request #1055 in SHRINE/shrine from bugfix/SHRINE2020-578 to develop * commit '065dc683e20f6a5aef5ee469b0...
Bill SimonsBill Simons
d926d2413a6Remove unnecessary drops and data migrations... not needed for a fresh install
Marc-Danie NazaireMarc-Danie Nazaire
368e5993a6aSHRINE2020-507 - Display a link to download the site specific csv file - Removed content disposition header in response
Bill SimonsBill Simons
f47737a50aeRemove create database statements from mssql scripts
Marc-Danie NazaireMarc-Danie Nazaire
006b0e4c3a6Added rename of I2B2ResultEnvelope
Marc-Danie NazaireMarc-Danie Nazaire
875f71e0d0bMerge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-501 # Co...
bcarmenbcarmen
065dc683e20saving work
bcarmenbcarmen
0fd6af5d6e3saving work
elizahelizah
5e1f105ad51offset y
elizahelizah
43fa4684d7bfix text
bcarmenbcarmen
30822e8bc15Merge branch 'develop' into bugfix/SHRINE2020-578
elizahelizah
8eb37c3a5b6merge from develop
Marc-Danie NazaireMarc-Danie Nazaire
08bf4e1a0dbMerge pull request #1051 in SHRINE/shrine from feature/SHRINE2020-499 to develop * commit '6db33c373c03e5a59b945dc10...
Marc-Danie NazaireMarc-Danie Nazaire
6db33c373c0SHRINE2020-499 - Migrate the BREAKDOWN_RESULT table to Slick - Renamed I2b2ResultEnvelope to I2b2Result
Marc-Danie NazaireMarc-Danie Nazaire
1f6640ba839SHRINE2020-599 - Modify Aim3Service to use QueryHistoryDB - More code cleanup
Marc-Danie NazaireMarc-Danie Nazaire
fd84495301aSHRINE2020-599 - Modify Aim3Service to use QueryHistoryDB - More code cleanup
bcarmenbcarmen
560740ff122saving work
Marc-Danie NazaireMarc-Danie Nazaire
782981318a8SHRINE2020-599 - Modify Aim3Service to use QueryHistoryDB - Code cleanup
Marc-Danie NazaireMarc-Danie Nazaire
3d72e8834a9SHRINE2020-599 - Modify Aim3Service to use QueryHistoryDB - Code cleanup
Marc-Danie NazaireMarc-Danie Nazaire
071c8ae94b4SHRINE2020-599 - Modify Aim3Service to use QueryHistoryDB - Fixed testReadI2b2AdminQueryingUsers test
dwalenddwalend
d6223fccbecCode cleanup, planning for SHRINE2020-570, and renamed webClientTimeOut to receiveWaitTime
Marc-Danie NazaireMarc-Danie Nazaire
6692d77fc5bSHRINE2020-599 - Modify Aim3Service to use QueryHistoryDB - modified to use distinctOn
David WalendDavid Walend
ab6fef7d2fcMerge pull request #1058 in SHRINE/shrine from feature/SHRINE2020-569 to develop * commit '73c4a9089c46ed264f88169c6...
bcarmenbcarmen
5ae816bf939saving work
bcarmenbcarmen
a8bea489959Merge branch 'feature/SHRINE2020-591' into feature/SHRINE2020-506
Marc-Danie NazaireMarc-Danie Nazaire
0d86ea5aba4SHRINE2020-599 - Modify Aim3Service to use QueryHistoryDB
David WalendDavid Walend
480b3914f56Merge pull request #1062 in SHRINE/shrine from feature/SHRINE2020-612 to feature/SHRINE2020-506 * commit '26cd3f147a...
dwalenddwalend
26cd3f147aaSorting for SHRINE2020-612
elizahelizah
0e371d9ad59fix test
elizahelizah
47092071cdfrm config
elizahelizah
027ec543f07fix tests
elizahelizah
af63961bf71remove logger config
elizahelizah
2ddaa9091a7consolidate to api log
elizahelizah
494557ad396Merge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-516
elizahelizah
7dce257ea7cMerge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-508
elizahelizah
aab563c47b9config in xml
dwalenddwalend
73c4a9089c4Merge from develop
Bill SimonsBill Simons
ea78213dd8bUse an index name less than 30 chars to get the script to work on Oracle versions < 12.2
Bill SimonsBill Simons
50bb0c8a200Change comment to `/*` style because `--` style was failing in sqlplus; remove incorrect `/` buffer execution charact...
Bill SimonsBill Simons
dac3ee3f13eget oracle base scripts in working order for auto-deployment; remove hub scripts for oracle and mssql as we will curr...
dwalenddwalend
390572b6230-1 signals 10 or fewer, and must be filtered out for SHRINE2020-612
dwalenddwalend
4de2cef20f3Stray todo in SHRINE2020-612
dwalenddwalend
acb0070ad24Removed the bits that keep breakdowns from showing in the new UI for SHRINE2020-612
dwalenddwalend
a33340e8519Now supplying the breakdowns for SHRINE2020-612
dwalenddwalend
4890394c5b2Some code cleanup for SHRINE2020-612
elizahelizah
9cc10f357bdcleanup
elizahelizah
33672232db0fix condition
elizahelizah
fa955d7625aMerge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-580
elizahelizah
facaada1bd1Merge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-526
elizahelizah
7f151d7252ehandle tooltip close
dwalenddwalend
f3df970d000Merge remote-tracking branch 'origin/develop' into feature/SHRINE2020-612
dwalenddwalend
3a164342f7fPass one of breakdowns - getting the request in for SHRINE2020-612
David WalendDavid Walend
85261259257Merge pull request #1061 in SHRINE/shrine from bugfix/SHRINE2020-597-revive-act-audit-metrics-prototype to develop *...
dwalenddwalend
c8793f754b8Stray println for SHRINE2020-597
Marc-Danie NazaireMarc-Danie Nazaire
e8eb78dcdb6SHRINE2020-507 - Added stub api call for creating the demographic - fixed imports
Marc-Danie NazaireMarc-Danie Nazaire
3725bc7a714Merge branch 'feature/SHRINE2020-507' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRIN...
Marc-Danie NazaireMarc-Danie Nazaire
33fb6f81569SHRINE2020-507 - Added stub api call for creating the demographic
dwalenddwalend
64cd6174cc3Merging
Marc-Danie NazaireMarc-Danie Nazaire
ca99a50afc3SHRINE2020-501 - Replace calls to functions in SquerylAdapterDao to corresponding function in QueryHistoryDb - Remove...
Marc-Danie NazaireMarc-Danie Nazaire
5ed8a861adfSHRINE2020-501 - Replace calls to functions in SquerylAdapterDao to corresponding function in QueryHistoryDb - Remove...
dwalenddwalend
ab8cd1055e7Merge remote-tracking branch 'origin/develop' into feature/SHRINE2020-569
dwalenddwalend
bf382198598Fixed logging, but theres mroe to do for SHRINE2020-597
David WalendDavid Walend
b3c2e3ec88cMerge pull request #1056 in SHRINE/shrine from bugfix/SHRINE2020-594 to develop * commit '640d85270d7b0c8bc4c785da8c...
Marc-Danie NazaireMarc-Danie Nazaire
cd658feb5e3SHRINE2020-501 - Replace calls to functions in SquerylAdapterDao to corresponding function in QueryHistoryDb - Fixed ...
elizahelizah
1c25137ac5edisplay alert
Marc-Danie NazaireMarc-Danie Nazaire
8a67ece03f9Merge branches 'develop' and 'feature/SHRINE2020-499' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine in...
Marc-Danie NazaireMarc-Danie Nazaire
923729bd22bSHRINE2020-501 - Replace calls to functions in SquerylAdapterDao to corresponding function in QueryHistoryDb - remove...
Marc-Danie NazaireMarc-Danie Nazaire
0b86fc81c96Merge branch 'feature/SHRINE2020-499' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRIN...
Marc-Danie NazaireMarc-Danie Nazaire
392d1178072SHRINE2020-501 - Replace calls to functions in SquerylAdapterDao to corresponding function in QueryHistoryDb
dwalenddwalend
8019c1106c3cleared a todo for SHRINE2020-569
dwalenddwalend
f568408e259Ran a test and things look better - tests are pretty uneven - for SHRINE2020-369
bcarmenbcarmen
e73d3a14e2esaving work
bcarmenbcarmen
8562b4fe783fixed package-lock.json
elizahelizah
647d8f7af9ashow tooltip
elizahelizah
aa480393d7aadd copied tooltip
dwalenddwalend
cbfc3b2e4ffNow running vs scale-up for SHRINE2020-569
bcarmenbcarmen
ba8d3371f19fixed failing unit test
bcarmenbcarmen
d645da9a530saving work
dwalenddwalend
e51c5e86cbaNow getting some good performance numbers for SHRINE2020-569
dwalenddwalend
40e015cdaf4timer delay. three of four stats calculated correctly. Will fix time per query next.
dwalenddwalend
8deb8d8e169Closer to driving a real load for SHRINE2020-569
bcarmenbcarmen
5892c91d67bsaving work
dwalenddwalend
4c2f3364a98Measuring the time for SHRINE2020-569
dwalenddwalend
606c55ece64Merging fix from SHRINE2020-594
dwalenddwalend
640d85270d7Switched the logic for setting up queues for a netowrk to work with Queues instead of MomQueueNames to fix SHRINE2020...
dwalenddwalend
33f8b816051Got a query working in a script for SHRINE2020-569
bcarmenbcarmen
61ad3ad04c8saving work
bcarmenbcarmen
f6ca7c988aaMerge branch 'develop' into feature/SHRINE2020-518
elizahelizah
0142882bdc4fix snap
bcarmenbcarmen
b7dc44aca11saving work
David WalendDavid Walend
fbbfcd310cfMerge pull request #1053 in SHRINE/shrine from feature/SHRINE2020-539 to develop * commit '0799516b9337498435f5bda58...
David WalendDavid Walend
5e69f3294ecMerge pull request #1054 in SHRINE/shrine from bugfix/SHRINE2020-293 to develop * commit '51be31e48c7b65bdf78647922f...
dwalenddwalend
0b6d93121dbRevived the hub client command line test befor digging into a load driver for SHRINE2020-569
dwalenddwalend
0799516b933Marc-Danie spotted a typo in SHRINE2020-539
bcarmenbcarmen
4289c762666added snapshot change
bcarmenbcarmen
453aa19e4bcMerge branch 'develop' into feature/SHRINE2020-518
elizahelizah
ad71233c5d5using div not card
dwalenddwalend
d3146057132Moved all dispatchers (hub and downstream) to use parallel dispatch after opening the envelope for SHRINE2020-569
bcarmenbcarmen
ff104c728f5possible fix of drag and drop highlight issues
elizahelizah
3a1c8677f36Merge branch 'feature/SHRINE2020-508' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRIN...
elizahelizah
d0dea43aa23config logLevel in xml
dwalenddwalend
51be31e48c7Fixed cut-paste error for SHRINE2020-293
bcarmenbcarmen
01405d63b07Merge branch 'develop' into bugfix/SHRINE2020-578
elizahelizah
fc46dd10ec9default log lvl to info
elizahelizah
e09fd9cb177using dev node
elizahelizah
9fd6d23b3beMerge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-519
bcarmenbcarmen
831b1ae78b2Merge branch 'develop' into bugfix/SHRINE2020-369
bcarmenbcarmen
970c936341dfix of error when start query fails
dwalenddwalend
cfe172eeb30Review feedback from Bill for SHRINE2020-539
elizahelizah
0ef606da1cfMerge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-507
Marc-Danie NazaireMarc-Danie Nazaire
fe2c720fdb9Added back missing implicit to val resultOutputType
elizahelizah
d6910275864fix snap test
elizahelizah
9e24d09ec43merge db changes
Marc-Danie NazaireMarc-Danie Nazaire
a335e8a32e8SHRINE2020-499 - Migrate the BREAKDOWN_RESULT table to Slick - Fixed merge issue
Marc-Danie NazaireMarc-Danie Nazaire
07c5485d026Merge branch 'feature/SHRINE2020-495' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRIN...
Marc-Danie NazaireMarc-Danie Nazaire
c79fc43949bMerge pull request #1021 in SHRINE/shrine from feature/SHRINE2020-495 to develop * commit '8007ccb1afa59c6c77bc421d6...
Marc-Danie NazaireMarc-Danie Nazaire
8007ccb1afaSHRINE2020-495 - Migrate the COUNT_RESULT and ERROR_RESULT table to Slick - code cleanup
David WalendDavid Walend
4a7efefccb1Merge pull request #1045 in SHRINE/shrine from feature/SHRINE2020-539 to develop * commit '2538fe40d5d9a779987010914...
Ben CarmenBen Carmen
ee98a625385Merge pull request #1047 in SHRINE/shrine from bugfix/SHRINE2020-421 to develop * commit '2d8ba2ebc0042310e89b180089...
bcarmenbcarmen
2d8ba2ebc00saving work
elizahelizah
baeb2fa66b9remove .
Ben CarmenBen Carmen
b85db89a48dMerge pull request #1042 in SHRINE/shrine from bugfix/SHRINE2020-572 to develop * commit '74242226b4bba209e065e87f7a...
bcarmenbcarmen
74242226b4bMerge branch 'develop' into bugfix/SHRINE2020-572
bcarmenbcarmen
122196257f7Merge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into develop
bcarmenbcarmen
3de5786dff5Merge branch 'develop' into feature/SHRINE2020-573
Ben CarmenBen Carmen
e3dcc7d6610Merge pull request #1048 in SHRINE/shrine from bugfix/SHRINE2020-576 to develop * commit '043d1d6d4548f3a7b9b6b65774...
elizahelizah
c164a4164cbupdate snap
elizahelizah
f9ce178a2a6change icon and phrase
Next →