SHRINE
  1. SHRINE

shrine

Public
  1. SHRINE
  2. shrine

All Branches Graph  

        
AuthorCommitMessageCommit dateBuilds
dwalenddwalend
c316fb711f9Merging
Marc-Danie NazaireMarc-Danie Nazaire
eeac96fd884SHRINE2020-501 - Replace calls to functions in SquerylAdapterDao to corresponding function in QueryHistoryDb - Remove...
Marc-Danie NazaireMarc-Danie Nazaire
fa0f4ad4c2dSHRINE2020-501 - Replace calls to functions in SquerylAdapterDao to corresponding function in QueryHistoryDb - Remove...
dwalenddwalend
514ce01d7f6Merge remote-tracking branch 'origin/develop' into feature/SHRINE2020-569
dwalenddwalend
44fbb0d50cbFixed logging, but theres mroe to do for SHRINE2020-597
David WalendDavid Walend
eb012854321Merge pull request #1056 in SHRINE/shrine from bugfix/SHRINE2020-594 to develop * commit '72e7624a334d9a5c457422ffa8...
Marc-Danie NazaireMarc-Danie Nazaire
906bfca51beSHRINE2020-501 - Replace calls to functions in SquerylAdapterDao to corresponding function in QueryHistoryDb - Fixed ...
elizahelizah
1e5fb584ca9display alert
Marc-Danie NazaireMarc-Danie Nazaire
6287f4fe492Merge branches 'develop' and 'feature/SHRINE2020-499' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine in...
Marc-Danie NazaireMarc-Danie Nazaire
b004a565fb3SHRINE2020-501 - Replace calls to functions in SquerylAdapterDao to corresponding function in QueryHistoryDb - remove...
Marc-Danie NazaireMarc-Danie Nazaire
ff7740e8a7fMerge branch 'feature/SHRINE2020-499' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRIN...
Marc-Danie NazaireMarc-Danie Nazaire
d16f8937a9aSHRINE2020-501 - Replace calls to functions in SquerylAdapterDao to corresponding function in QueryHistoryDb
dwalenddwalend
c2f87ef60e6cleared a todo for SHRINE2020-569
dwalenddwalend
b2189a20bbeRan a test and things look better - tests are pretty uneven - for SHRINE2020-369
bcarmenbcarmen
41ffaca788dsaving work
bcarmenbcarmen
f7be663d616fixed package-lock.json
elizahelizah
95d289fb461show tooltip
elizahelizah
e8c22565cd5add copied tooltip
dwalenddwalend
fd5adec0ce0Now running vs scale-up for SHRINE2020-569
bcarmenbcarmen
c58e94258b8fixed failing unit test
bcarmenbcarmen
12359cc9723saving work
dwalenddwalend
9ea1f10b374Now getting some good performance numbers for SHRINE2020-569
dwalenddwalend
d79623a0693timer delay. three of four stats calculated correctly. Will fix time per query next.
dwalenddwalend
142d8554241Closer to driving a real load for SHRINE2020-569
bcarmenbcarmen
e32162af6b8saving work
dwalenddwalend
d0ad4ffba03Measuring the time for SHRINE2020-569
dwalenddwalend
9aa8f5144caMerging fix from SHRINE2020-594
dwalenddwalend
72e7624a334Switched the logic for setting up queues for a netowrk to work with Queues instead of MomQueueNames to fix SHRINE2020...
dwalenddwalend
4ed686239a6Got a query working in a script for SHRINE2020-569
bcarmenbcarmen
677a94f637csaving work
bcarmenbcarmen
d3cfe0536cfMerge branch 'develop' into feature/SHRINE2020-518
elizahelizah
bf0b55c4243fix snap
bcarmenbcarmen
2fd5b49c099saving work
David WalendDavid Walend
19c6762d3a2Merge pull request #1053 in SHRINE/shrine from feature/SHRINE2020-539 to develop * commit 'da88120d50877d302637a3a67...
David WalendDavid Walend
ca0ca5e6eadMerge pull request #1054 in SHRINE/shrine from bugfix/SHRINE2020-293 to develop * commit '7dad25a795e5db365241acd75e...
dwalenddwalend
52a28a037ddRevived the hub client command line test befor digging into a load driver for SHRINE2020-569
dwalenddwalend
da88120d508Marc-Danie spotted a typo in SHRINE2020-539
bcarmenbcarmen
4860158198cadded snapshot change
bcarmenbcarmen
470f37f115aMerge branch 'develop' into feature/SHRINE2020-518
elizahelizah
acc68208a15using div not card
dwalenddwalend
772ecf58465Moved all dispatchers (hub and downstream) to use parallel dispatch after opening the envelope for SHRINE2020-569
bcarmenbcarmen
fe4fff48361possible fix of drag and drop highlight issues
elizahelizah
45b867f1d6eMerge branch 'feature/SHRINE2020-508' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRIN...
elizahelizah
94dd60bb535config logLevel in xml
dwalenddwalend
7dad25a795eFixed cut-paste error for SHRINE2020-293
bcarmenbcarmen
a6cdc25878eMerge branch 'develop' into bugfix/SHRINE2020-578
elizahelizah
c4cf332a0b2default log lvl to info
elizahelizah
be691d2cf86using dev node
elizahelizah
b46a94e3648Merge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-519
bcarmenbcarmen
bb8763f7349Merge branch 'develop' into bugfix/SHRINE2020-369
bcarmenbcarmen
ba0333efe55fix of error when start query fails
dwalenddwalend
74c192b22acReview feedback from Bill for SHRINE2020-539
elizahelizah
c448fea9f40Merge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-507
Marc-Danie NazaireMarc-Danie Nazaire
742f07f46b2Added back missing implicit to val resultOutputType
elizahelizah
5f64f570513fix snap test
elizahelizah
b6d8e5a1cf1merge db changes
Marc-Danie NazaireMarc-Danie Nazaire
f6f948f5f22SHRINE2020-499 - Migrate the BREAKDOWN_RESULT table to Slick - Fixed merge issue
Marc-Danie NazaireMarc-Danie Nazaire
fb17c3b7a02Merge branch 'feature/SHRINE2020-495' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRIN...
Marc-Danie NazaireMarc-Danie Nazaire
a8fe8d8336cMerge pull request #1021 in SHRINE/shrine from feature/SHRINE2020-495 to develop * commit 'c2d1afef3f343b6f453f82a9f...
Marc-Danie NazaireMarc-Danie Nazaire
c2d1afef3f3SHRINE2020-495 - Migrate the COUNT_RESULT and ERROR_RESULT table to Slick - code cleanup
David WalendDavid Walend
784f030761cMerge pull request #1045 in SHRINE/shrine from feature/SHRINE2020-539 to develop * commit '561be3e9249122bbae939799e...
Ben CarmenBen Carmen
ecb8a5da79bMerge pull request #1047 in SHRINE/shrine from bugfix/SHRINE2020-421 to develop * commit 'f1ce2f7867d7d2057571398b9f...
bcarmenbcarmen
f1ce2f7867dsaving work
elizahelizah
da6eff2a9e8remove .
Ben CarmenBen Carmen
b1d35e25e5aMerge pull request #1042 in SHRINE/shrine from bugfix/SHRINE2020-572 to develop * commit '4ae3b3e793e0b04b9d6c270cb3...
bcarmenbcarmen
4ae3b3e793eMerge branch 'develop' into bugfix/SHRINE2020-572
bcarmenbcarmen
b4aef71f132Merge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into develop
bcarmenbcarmen
f6c6bd1fb8cMerge branch 'develop' into feature/SHRINE2020-573
Ben CarmenBen Carmen
3825b7413d4Merge pull request #1048 in SHRINE/shrine from bugfix/SHRINE2020-576 to develop * commit 'e697e5f9461ae777350f4efec0...
elizahelizah
225e3ee5327update snap
elizahelizah
7e3554379e8change icon and phrase
bcarmenbcarmen
2aedb383507saving work
elizahelizah
dd1dd8cd28echange hyper link location
elizahelizah
d23bc705417add download icon
elizahelizah
05731b45d2amerge develop into branch
elizahelizah
8bc52aa2121fix select queued query
Marc-Danie NazaireMarc-Danie Nazaire
101d45ee1b6SHRINE2020-500 - Migrate remaining functions in SquerylAdapterDao to Slick - added storeBreakdownFailures
Eliza HuangEliza Huang
031ea859a65Merge pull request #987 in SHRINE/shrine from bugfix/SHRINE2020-399 to develop * commit '6a2d3b57d1b73d0ec418dc82d98...
elizahelizah
6a2d3b57d1bMerge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into bugfix/SHRINE2020-399
David WalendDavid Walend
c55f703d347Merge pull request #1049 in SHRINE/shrine from feature/SHRINE2020-514 to develop * commit 'ce595d80b26da0fefe1c5b807...
Marc-Danie NazaireMarc-Danie Nazaire
6bc5e4c9963SHRINE2020-500 - Migrate remaining functions in SquerylAdapterDao to Slick - fixed typo in imports
Marc-Danie NazaireMarc-Danie Nazaire
60b07d8d001Merge branch 'feature/SHRINE2020-499' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRIN...
Marc-Danie NazaireMarc-Danie Nazaire
6941a42ea52SHRINE2020-499 - Migrate the BREAKDOWN_RESULT table to Slick - Fixed unit test
Marc-Danie NazaireMarc-Danie Nazaire
1fe3478f1daMerge branch 'feature/SHRINE2020-495' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRIN...
elizahelizah
2847ccc28d5shutdown
elizahelizah
31a36f9f6bclog startup on info
elizahelizah
b517523d8e6using QueryId in ShrineQuery
elizahelizah
968b23c20d3use QueryId not long
dwalenddwalend
ce595d80b26Changed the existing debug log statement to error for SHRINE2020-514
bcarmenbcarmen
e697e5f9461fix for moving lab terms between groups
Bamboo UserBamboo User
fd07f5b19b2Merge release branch release/3.0.1 into master.
Bamboo UserBamboo User
248c8d99104Update POMs with release version 3.0.1.
Marc-Danie NazaireMarc-Danie Nazaire
1e18857ca5eSHRINE2020-495 - Migrate the COUNT_RESULT and ERROR_RESULT table to Slick - added storeErrorResults function
Marc-Danie NazaireMarc-Danie Nazaire
c7d1fde2f43SHRINE2020-495 - Migrate the COUNT_RESULT and ERROR_RESULT table to Slick - added storeCountResults function
dwalenddwalend
9ef0741efa5Thread pool didn't make a difference because we hit the AWS throughput limit
elizahelizah
62d87eb324cfix query header
elizahelizah
4f92f93c3e0Merge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-516
elizahelizah
54ebf0c8186Merge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-519
Marc-Danie NazaireMarc-Danie Nazaire
44919c156c2SHRINE2020-500 - Migrate remaining functions in SquerylAdapterDao to Slick - added botCheck
Marc-Danie NazaireMarc-Danie Nazaire
7f3c05c9b6dSHRINE2020-495 - Migrate the COUNT_RESULT and ERROR_RESULT table to Slick - fixed merge duplicate
Marc-Danie NazaireMarc-Danie Nazaire
ac52626fa33Fixed merge
bcarmenbcarmen
5694e8e9502quick change to model
bcarmenbcarmen
0d35ea9cd71Fix of being unable to run other previous queries if one fails
Marc-Danie NazaireMarc-Danie Nazaire
f9bc69d8ab6Merge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-495 # Co...
dwalenddwalend
a66600709d6Logic fix to let results flow
bcarmenbcarmen
ec0e1923c58saving work
dwalenddwalend
6a1438517f8Now using the underlying value - Java is not type safe
dwalenddwalend
4307bcade5bFirst attempt at an integrated run
Marc-Danie NazaireMarc-Danie Nazaire
dbb6cdfeb0bMore updates to reflect changes in develop
Marc-Danie NazaireMarc-Danie Nazaire
702beea7797Updated to reflect changes in develop
dwalenddwalend
916f8843719Refined the round trip a lot
dwalenddwalend
ab6bfa57033rickety prototype of this working in dynamodb with queries
bcarmenbcarmen
b65e847003bsaving work
elizahelizah
4d0af50448erename
elizahelizah
84b8387cbc3fix name conflict
elizahelizah
fd6ee235fa1merge develop into branch
elizahelizah
ff18538847ein adapter
elizahelizah
7d20dd2c17ftest fix
David WalendDavid Walend
ad6cfe2db71Merge pull request #1044 in SHRINE/shrine from feature/SHRINE2020-571 to develop * commit '0253cbf79595302696ec2d853...
elizahelizah
fb9e5226c42Merge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-519
David WalendDavid Walend
b8029ee484aMerge pull request #1043 in SHRINE/shrine from feature/SHRINE2020-567 to develop * commit 'c5e38a676cb06c178b67083c6...
Marc-Danie NazaireMarc-Danie Nazaire
c5a5547487aMerge pull request #1019 in SHRINE/shrine from feature/SHRINE2020-494 to develop * commit 'e881cd0f0d95537a16ffc732a...
Marc-Danie NazaireMarc-Danie Nazaire
e881cd0f0d9SHRINE2020-494 - Migrate the SHRINE_QUERY and QUERY_RESULT tables to Slick - added types to the variables
Marc-Danie NazaireMarc-Danie Nazaire
196709c1ee1SHRINE2020-494 - Migrate the SHRINE_QUERY and QUERY_RESULT tables to Slick - removed unused run function
Marc-Danie NazaireMarc-Danie Nazaire
f5097b5985eSHRINE2020-500 - Migrate remaining functions in SquerylAdapterDao to Slick - Added withUpdatedFlag and withUpdatedName
Marc-Danie NazaireMarc-Danie Nazaire
b77465d1c52SHRINE2020-500 - Migrate remaining functions in SquerylAdapterDao to Slick - Added renaming query
Marc-Danie NazaireMarc-Danie Nazaire
7d5adfa08d4SHRINE2020-500 - Migrate remaining functions in SquerylAdapterDao to Slick - Added flag and unflagging
dwalenddwalend
561be3e9249Revert "Renamed some .ddl files to .sql while doing SHRINE2020-539" This reverts commit cbe0e248a69f2b2c94852aa4e2a8...
dwalenddwalend
cbe0e248a69Renamed some .ddl files to .sql while doing SHRINE2020-539
dwalenddwalend
605da58f353Changes to .sql to add indexes for better QEP performance for SHRINE2020-539
elizahelizah
c64e231f93ein qep
Marc-Danie NazaireMarc-Danie Nazaire
a8a5dc323fdRemoved commented out code
Marc-Danie NazaireMarc-Danie Nazaire
8e8f43690f5Merge with develop branch
Marc-Danie NazaireMarc-Danie Nazaire
dfbae9ec616Merge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-500
Marc-Danie NazaireMarc-Danie Nazaire
cc8719f2474Merge with develop branch
elizahelizah
cfbee540c5ein commons
elizahelizah
cc5c77a5a42in adapter
dwalenddwalend
0253cbf7959Added an unbounded threadpool for all database work for SHRINE2020-571
elizahelizah
5b5c73ecec8change in adapter dao
bcarmenbcarmen
e20f9b089eafixed failing unit test
bcarmenbcarmen
30880add933saving work
Marc-Danie NazaireMarc-Danie Nazaire
24657a69314Merge branches 'develop' and 'feature/SHRINE2020-494' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine in...
David WalendDavid Walend
d5254c0020dMerge pull request #1041 in SHRINE/shrine from bugfix/SHRINE2020-550 to release/3.0.1 * commit '4034593dd6f86018a671...
dwalenddwalend
c5e38a676cbRemoved a few more stray bits for SHRINE2020-567
dwalenddwalend
2f48b65ce9eMore directory cleanup for SHRINE2020-567
bcarmenbcarmen
e520e7ac95eupdated snapshot test
bcarmenbcarmen
49f412bded7updated snapshot test and package.json
bcarmenbcarmen
b4b6ac401f7saving work
bcarmenbcarmen
e31f1a0c14afixed unit test
bcarmenbcarmen
1094fe30b23saving work
dwalenddwalend
4034593dd6fFixing the versino magic in the pom.xml for SHRINE2020-550
dwalenddwalend
4c0d353aed2Updated version number in the pom.xml
dwalenddwalend
91627d2c29eSome database indexes and an unbounded threadpool for the hub database for SHRINE2020-550
David WalendDavid Walend
9ca1bfbcaf1Merge pull request #1034 in SHRINE/shrine from feature/SHRINE2020-464 to develop * commit 'b32e071de46517e5e4153a749...
elizahelizah
0d84b607e8frm default test
elizahelizah
cb63c65839fset refernce conf log level to info
elizahelizah
5e4563a1bf0get level from config
elizahelizah
05ed6840c55add log levels
dwalenddwalend
b32e071de46Another try at the PM cell url
dwalenddwalend
b870505541eRight path for i2b2 services
dwalenddwalend
a681e810768Built the merge
elizahelizah
44f3213918eMerge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-516
elizahelizah
4f88fa1d7c5remove api-root log
elizahelizah
016939258e3default to info level
Eliza HuangEliza Huang
518bcc10ef2Merge pull request #989 in SHRINE/shrine from feature/SHRINE2020-435 to develop * commit 'a7be60555a8d87aaf6c118f6db...
elizahelizah
a7be60555a8Merge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-435
elizahelizah
8811d168ebfmerge develop into this branch
Eliza HuangEliza Huang
8b2c27868b4Merge pull request #1022 in SHRINE/shrine from feature/SHRINE2020-170 to develop * commit '134d79ee086ab93c0bb24e18c...
elizahelizah
134d79ee086merge develop into this branch
bcarmenbcarmen
31f8bd7fdfdfixed failing snapshot test
elizahelizah
f5c4bc13915Merge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-508
elizahelizah
1ea6bc624fdMerge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-516
Bill SimonsBill Simons
ffafdef874bminor name cleanup on dsa front end. Move test output to target for gitignore and easy mvn clean
Marc-Danie NazaireMarc-Danie Nazaire
c887a80555aMerge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-494
Marc-Danie NazaireMarc-Danie Nazaire
857e5961b2bMerge pull request #1026 in SHRINE/shrine from feature/SHRINE2020-456 to develop * commit 'faafbf0fcff83463a75500c33...
elizahelizah
a6eb1c37cfdMerge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into bugfix/SHRINE2020-399
Ben CarmenBen Carmen
ba64730dbfdMerge pull request #1028 in SHRINE/shrine from feature/SHRINE2020-505 to develop * commit '5aa0abbdce14a320fa6173605...
Marc-Danie NazaireMarc-Danie Nazaire
faafbf0fcffSHRINE2020-456 - Simplify shrine.conf with default values - modified to use buildURI in EndpointConfig
Marc-Danie NazaireMarc-Danie Nazaire
34b76329813SHRINE2020-456 - Simplify shrine.conf with default values - replace .map.getOrElse with orElse
bcarmenbcarmen
5aa0abbdce1fixed snapshot test
Ben CarmenBen Carmen
c36c70325ffMerge pull request #1038 in SHRINE/shrine from bugfix/SHRINE2020-363 to develop * commit '64d1edbf1251cafaef38700e74...
bcarmenbcarmen
a8565d4c21dchanged styles based on BA review feedback
dwalenddwalend
c16d879107fRename from review comments from Marc-Danie for SHRINE2020-464
Marc-Danie NazaireMarc-Danie Nazaire
fb3665d4fb9SHRINE2020-456 - Simplify shrine.conf with default values - modified to use buildURI in ConfigExtensions
Marc-Danie NazaireMarc-Danie Nazaire
e3a2933f644SHRINE2020-456 - Simplify shrine.conf with default values - removed trailing slash
dwalenddwalend
f575cb2bde4Missed an important dependency for SHRINE2020-464
Marc-Danie NazaireMarc-Danie Nazaire
07d3358fa33SHRINE2020-494 - Migrate the SHRINE_QUERY and QUERY_RESULT tables to Slick - modified i2b2BaseUrl to look like a fake...
dwalenddwalend
e52396f9ff2Deleted some stray test output files for SHRINE2020-464
Next →