SHRINE
  1. SHRINE

shrine

Public
  1. SHRINE
  2. shrine

All Branches Graph  

        
AuthorCommitMessageCommit dateBuilds
elizahelizah
1adaa493314update snapshots
bcarmenbcarmen
512310efe7asaving work
bcarmenbcarmen
6f503ade5baadded demo distribution view
elizahelizah
13932ff24edMerge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into bugfix/SHRINE2020-384
elizahelizah
e5cb5a96e68fix merge conflicts
marc-daniemarc-danie
fac2d09f914SHRINE2020-456 - Simplify shrine.conf with default values - shrine.conf cleanup
marc-daniemarc-danie
cc6471cc1d6SHRINE2020-456 - Simplify shrine.conf with default values - Fix retrieval of crcEndpointUrl in DashboardService
marc-daniemarc-danie
c7d13b57babSHRINE2020-456 - Simplify shrine.conf with default values - moved the messagequeue element to be a child of the hub e...
marc-daniemarc-danie
c9512d38ed1SHRINE2020-456 - Simplify shrine.conf with default values - set default value for hiveCredentials.domain and hiveCred...
marc-daniemarc-danie
f5bfbc50e2bSHRINE2020-456 - Simplify shrine.conf with default values - set default value for webclient.domain and webclient.name
marc-daniemarc-danie
5d6609d9cd5SHRINE2020-456 - Simplify shrine.conf with default values - set default value for webclient.domain and webclient.name
dwalenddwalend
699166b0ee3Got rid of CertCollectionAdapter for SHRINE2020-469 and SHRINE-3425
dwalenddwalend
554b5434131Removed trustModel shrine.conf value for SHRINE2020-469
dwalenddwalend
7f0bf0734c4Moved a lot of crypto stuff into the crypto package for SHRINE2020-469 , SHRINE-3425
marc-daniemarc-danie
9a5f1978bc5SHRINE2020-456 - Simplify shrine.conf with default values - set default value for hub.client.serverUrl
dwalenddwalend
b3cc5b9cdcfMerge branch 'feature/SHRINE2020-469' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRIN...
dwalenddwalend
14c8f170c5bPart-way through removing the Peer cert business for SHRINE2020-469 and SHRINE-3425
marc-daniemarc-danie
8a6344044e6SHRINE2020-456 - Simplify shrine.conf with default values - set default value for keystore.file and keystore.keyStore...
marc-daniemarc-danie
8429f797af3SHRINE2020-456 - Simplify shrine.conf with default values - set default value for keystore.file and keystore.keyStore...
bcarmenbcarmen
11513e05f81Updated Unit test.
marc-daniemarc-danie
0cccd158454SHRINE2020-456 - Simplify shrine.conf with default values - set default value for adapterMappingsFileName
bcarmenbcarmen
c16bc723f2bminor change
bcarmenbcarmen
2da0a175c58saving work
dwalenddwalend
1d78d67d4d2Moved config things into the config package for SHRINE2020-469
marc-daniemarc-danie
0ea63164b0eSHRINE2020-456 - Simplify shrine.conf with default values - replaced url with urlPath and set a default value for pmE...
dwalenddwalend
4bd311c406eMoved a lot of XML stuff from util to xml. Does not build. Getting some help from Ben. SHRINE2020-469
marc-daniemarc-danie
b7f602271fdSHRINE2020-456 - Simplify shrine.conf with default values - replaced serverUrl with serverUrlPath and set a default v...
dwalenddwalend
c7d8a6225deMoved out the OntClient so that http4s-utils does not depend on protocol fo rSHRINE2020-469
elizahelizah
26afbfebd51add unit tests for exceptions
bcarmenbcarmen
53819c535c0updated unit test.
dwalenddwalend
adf9e2e6c95Big rearangement of code to split out the http4s subproject better for SHRINE-469
bcarmenbcarmen
26991cccbc1potential solution for selecting the demographic distribution.
marc-daniemarc-danie
4debe7ae54dSHRINE2020-456 - Simplify shrine.conf with default values - Set default value for steward.createTopicsMode to Approved
marc-daniemarc-danie
f752bcebd3dSHRINE2020-456 - Simplify shrine.conf with default values - Moved definition of SHRINE properties external to the shr...
marc-daniemarc-danie
0217b90a910Cleared out the *-update.sql scripts for SHRINE 3.1, added update scripts for the hub, and renamed the qep update scr...
marc-daniemarc-danie
dfe42a2fc8bSHRINE2020-494 - Migrate the SHRINE_QUERY and QUERY_RESULT tables to Slick - Added TODO to get the QueryHistory schem...
marc-daniemarc-danie
971e2aba7e5SHRINE2020-494 - Migrate the SHRINE_QUERY and QUERY_RESULT tables to Slick - Removed unnecessary run function
dwalenddwalend
625228c8ea0Missed moving the dsa setup scripts in shrine-setup.zip
dwalenddwalend
879440341d7Moved authorization code to the QEP for SHRINE2020-469
marc-daniemarc-danie
03691e90088SHRINE2020-494 - Migrate the SHRINE_QUERY and QUERY_RESULT tables to Slick - Added comment about the locale used in X...
marc-daniemarc-danie
52d2d39e1b1SHRINE2020-494 - Migrate the SHRINE_QUERY and QUERY_RESULT tables to Slick - removed unused daysFromNow function from...
marc-daniemarc-danie
b5bc7ac675aMerge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-494
elizahelizah
2648136fd5eMerge branch 'feature/SHRINE2020-456' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRIN...
elizahelizah
87531712208cleanup
elizahelizah
d098fcab74cmove all config names into a list
elizahelizah
c5ba3f68efbt push origin HEADMerge branch 'feature/SHRINE2020-456' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine ...
elizahelizah
4e09c1cf12bget set of keys first
marc-daniemarc-danie
1a395751b9dSHRINE2020-499 - Migrate the BREAKDOWN_RESULT table to Slick
elizahelizah
d5ae74949eeseperate isPassword
David WalendDavid Walend
69602f2e179Merge pull request #1023 in SHRINE/shrine from feature/SHRINE2020-471 to develop * commit 'c3c13984ae3c8e02bb3d58ef0...
marc-daniemarc-danie
6ef49f0fa46SHRINE2020-494 - Migrate the SHRINE_QUERY and QUERY_RESULT tables to Slick - fixed broken unit test
marc-daniemarc-danie
df041201f68SHRINE2020-494 - Migrate the SHRINE_QUERY and QUERY_RESULT tables to Slick - modified to return ids of inserted query...
elizahelizah
6d17be05623remove passwords in other conf
elizahelizah
805a67f393ecleanup
dwalenddwalend
c3c13984ae3Moved the DSA for SHRINE2020-471
dwalenddwalend
73af22b835aMoved the static data service for SHRINE2020-471
elizahelizah
a27b8bc83e2use count
elizahelizah
3c6ad9b8149fix initial containsDem state
elizahelizah
ab2b18e2204consistent position
elizahelizah
5a6049bb44brestyled error msg
elizahelizah
fe3d8ba31d4fix merge conflict
elizahelizah
34d4d13e1f7copy to clipboard on clicking static text
elizahelizah
3aed9c55ccbfix delete test
elizahelizah
a3767f38923Merge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into bugfix/SHRINE2020-399
dwalenddwalend
f34aef36db2Merge remote-tracking branch 'origin/develop' into feature/SHRINE2020-471
elizahelizah
767a1be4302save react-beautiful-dnd
dwalenddwalend
08ff8e94b10Merge branch 'feature/SHRINE2020-471' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRIN...
elizahelizah
63ba6424b6fMerge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-170
Ben CarmenBen Carmen
ef8d16900f6Merge pull request #1020 in SHRINE/shrine from feature/SHRINE2020-492 to develop * commit '1fcf7a161065d950a2fbcab79...
marc-daniemarc-danie
6b48b170adcSHRINE2020-495 - Migrate the COUNT_RESULT and ERROR_RESULT table to Slick - added ERROR_RESULT table
marc-daniemarc-danie
50b6897cab2Merge branch 'feature/SHRINE2020-494' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRIN...
marc-daniemarc-danie
ce9bb647897Merge branch 'feature/SHRINE2020-494' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRIN...
marc-daniemarc-danie
8e94f3e9883SHRINE2020-494 - Migrate the SHRINE_QUERY and QUERY_RESULT tables to Slick - replaced testInsertQueryResult test with...
Bamboo UserBamboo User
d622c9a01b4Merge release branch release/3.0.0 into master.
Bamboo UserBamboo User
b1dce7361ebUpdate POMs with release version 3.0.0.
marc-daniemarc-danie
86109511011SHRINE2020-495 - Migrate the COUNT_RESULT and ERROR_RESULT table to Slick
Ben CarmenBen Carmen
311783bc93dMerge pull request #1017 in SHRINE/shrine from feature/SHRINE2020-471 to develop * commit '38a1f9ccb4e173946c9999190...
bcarmenbcarmen
1fcf7a16106saving work
marc-daniemarc-danie
9648bf86840SHRINE2020-494 - Migrate the SHRINE_QUERY and QUERY_RESULT tables to Slick - more code cleanup
marc-daniemarc-danie
2ba82b88a62SHRINE2020-494 - Migrate the SHRINE_QUERY and QUERY_RESULT tables to Slick - uncommented out tests
marc-daniemarc-danie
9f40c7e2293SHRINE2020-494 - Migrate the SHRINE_QUERY and QUERY_RESULT tables to Slick - code cleanup
marc-daniemarc-danie
2ecf77c6b83SHRINE2020-494 - Migrate the SHRINE_QUERY and QUERY_RESULT tables to Slick - modified to return first row when select...
marc-daniemarc-danie
5e6519852ebSHRINE2020-494 - Migrate the SHRINE_QUERY and QUERY_RESULT tables to Slick
elizahelizah
a09d2534876cleanup
elizahelizah
16963ed7286ensure password.conf only contains passwords
elizahelizah
edcf3af4adetest shrine.conf w/t passwords
bcarmenbcarmen
a561524ee31saving work
Ben CarmenBen Carmen
a758f3946f7Merge pull request #1016 in SHRINE/shrine from feature/SHRINE2020-491 to develop * commit '4115b04f95daadcec6c2984af...
bcarmenbcarmen
4115b04f95dremoved session.js
bcarmenbcarmen
b1732e17ab6Merge branch 'develop' into feature/SHRINE2020-491
elizahelizah
423cc9cbf57remove unused import
bcarmenbcarmen
38a1f9ccb4eMerge branch 'develop' into feature/SHRINE2020-471
elizahelizah
b02da47420ftest password
bcarmenbcarmen
3a56c1c98bfadded test component
bcarmenbcarmen
50be1d4e943updated work to compile typescript and javascript
dwalenddwalend
50705eb5623Moved the i2b2 service to legacy for SHRINE2020-471
dwalenddwalend
b8e03a30de0pom.xml changes now that the qep is consolidated for SHRINE2020-471
Ben CarmenBen Carmen
9e7f7eeacd8Merge pull request #1003 in SHRINE/shrine from feature/SHRINE2020-463 to develop * commit '3cd4a32536be93e4ad8ea9744...
dwalenddwalend
ca136855f88Consolidated the QEP directory for SHRINE2020-471
bcarmenbcarmen
3cd4a32536bMerge branch 'develop' into feature/SHRINE2020-463
bcarmenbcarmen
7ef9515e9eafixed failing tests
dwalenddwalend
b7521f1900cMost of the way through the merge, but I need to pass to Ben to fix the npm parts for SHRINE2020-491
elizahelizah
70049ad5d86cleanup
elizahelizah
db748e89945use dot notation for conf
elizahelizah
a5306ebb9bflimit to only password
elizahelizah
72ad6a4ba62add password conf
elizahelizah
42551fd13bftest password config
elizahelizah
77231a23eecpassword config
David WalendDavid Walend
31f83bcd1b6Merge pull request #1014 in SHRINE/shrine from bugfix/SHRINE2020-487-umichigan-reports-an-xml-injection to release/3....
dwalenddwalend
6ef939a6a10sax parser is not thread safe. Create a new sax parser every time for SHRINE2020-487.
David WalendDavid Walend
e1571176073Merge pull request #1013 in SHRINE/shrine from bugfix/SHRINE2020-487-umichigan-reports-an-xml-injection to release/3....
dwalenddwalend
b977f0e7f01Merge remote-tracking branch 'origin/release/3.0.0' into bugfix/SHRINE2020-487-umichigan-reports-an-xml-injection
David WalendDavid Walend
f85b06b488fMerge pull request #1012 in SHRINE/shrine from bugfix/SHRINE2020-486 to release/3.0.0 * commit '419187f4cb32aab1d405...
dwalenddwalend
3474c725709Three xml injection attack files to support SHRINE2020-487
dwalenddwalend
17e1a2031d7Switched to using XmlUtil.safeParser everywhere for SHRINE2020-487
dwalenddwalend
d68e88b7fdeFix to prevent the XML injection attack for SHRINE2020-487
dwalenddwalend
419187f4cb3Better logging than 0 seconds for .25 seconds for SHRINE2020-486
marc-daniemarc-danie
a3e57fff6e3Reverted temporary changes to trigger java.lang.IllegalArgumentException: Duplicate handler name: request-body-stream...
marc-daniemarc-danie
94f603eb11dTemporary changes to trigger java.lang.IllegalArgumentException: Duplicate handler name: request-body-streamer error
dwalenddwalend
80a9d8ee2e8Added 250 ms retry for calls to the PM cell for SHRINE2020-486
dwalenddwalend
0ab8bc4fdf5Merge branch 'release/3.0.0' into investigate500
Marc-Danie NazaireMarc-Danie Nazaire
8d03a2ca9e2Merge pull request #1004 in SHRINE/shrine from feature/SHRINE2020-316 to develop * commit '22dd6c8e9eef7fe470de517dc...
Marc-Danie NazaireMarc-Danie Nazaire
36e697062faMerge pull request #1009 in SHRINE/shrine from feature/SHRINE2020-180 to develop * commit 'b8c89d77e80473a27a41deba6...
Ben CarmenBen Carmen
ea5b6d58941Merge pull request #1011 in SHRINE/shrine from bugfix/SHRINE2020-484 to release/3.0.0 * commit '2c248364ea3bd60464d0...
dwalenddwalend
3ab43cad2baPlans for fixing the netty/asynchttpclient with retries if we need it
bcarmenbcarmen
2c248364ea3guard against extra topics requests.
bcarmenbcarmen
a82245bdf73xit failing snapshot tests
bcarmenbcarmen
49f94da3a8fsaving snapshot changes
bcarmenbcarmen
2831974afb2new snapshot
bcarmenbcarmen
7219cb2cc6aremoved extra call to query topics
bcarmenbcarmen
bbc7b7f8c12stop extra call to getTopics
bcarmenbcarmen
b95552416d6added suggestion from code review
bcarmenbcarmen
0e1e5e5572dsaving work
bcarmenbcarmen
8a286247b76saving work
elizahelizah
add9c1663d8only clear warning when has error
elizahelizah
0fc4da4a671uppercase comparison
elizahelizah
6fa13f3ca04add missing semicolon
David WalendDavid Walend
77701c3c177Merge pull request #1010 in SHRINE/shrine from bugfix/SHRINE2020-474 to release/3.0.0 * commit '9ff99a34e73a9944ac3d...
bcarmenbcarmen
4948e639664saving work for merge to 3.0.0
dwalenddwalend
9ff99a34e73Missed setting the dataVersion for SHRINE2020-474
Marc-Danie NazaireMarc-Danie Nazaire
5af68d296e3Merge pull request #1002 in SHRINE/shrine from feature/SHRINE2020-193 to develop * commit '635e8573568aa67f1bc4a04f4...
dwalenddwalend
689ace08178Changes from that mistargetted SHRINE2020-474 branch from develop, now from release/3.0.0
elizahelizah
ee804200d1fexit early if cannot find moved term
elizahelizah
a368a680402case insensitive comparison
dwalenddwalend
f8c13843427Fixed the internal name of a state to match the databas default for SHRINE2020-475
elizahelizah
a2bb62158aafix merge conflict
elizahelizah
fc27a2ce06dMerge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into SHRINE2020-381
elizahelizah
1d7f5bdf1d3default to query def view
marc-daniemarc-danie
22dd6c8e9eeSHRINE2020-316 - QepService file has become too large - moved ConceptGroupWithOntologyFields into ConceptGroup.scala
marc-daniemarc-danie
6343efa6240SHRINE2020-316 - QepService file has become too large
bcarmenbcarmen
a56faedd1ddfix of failing tests
bcarmenbcarmen
adecc0a3383possible fix for breaking build
bcarmenbcarmen
8c4518b8ee7package.json update
bcarmenbcarmen
cde9c010e15saving work
bcarmenbcarmen
c072e2c1406fixed unit tests
bcarmenbcarmen
9ca13192b8dsaving package-lock
David WalendDavid Walend
d48f3076cb3Merge pull request #998 in SHRINE/shrine from feature/SHRINE2020-462-easy-back-end-directory-rearrangements to develo...
bcarmenbcarmen
1a25f2c151aRevert "added package-lock" This reverts commit 72a3a2d61525b91646d064d2d7e38a94f79c5691.
bcarmenbcarmen
7bcac72856bsaving work
bcarmenbcarmen
72a3a2d6152added package-lock
marc-daniemarc-danie
b8c89d77e80SHRINE2020-180 - Automate the generation of the Lucene index used for testing the suggester
elizahelizah
54dbf4a6c02dismiss warning on clear all
bcarmenbcarmen
51e692b0e5csaving final package.
bcarmenbcarmen
802eed545b3saving work
elizahelizah
2ac5caa5d74remove warning on chaning username/password
marc-daniemarc-danie
635e8573568SHRINE2020-193 - Standardize the test indexes that are used by the lucene indexer and the ontology service - Moved Lu...
marc-daniemarc-danie
15e51861983SHRINE2020-193 - Standardize the test indexes that are used by the lucene indexer and the ontology service - Fixed cy...
marc-daniemarc-danie
f7dcac05116SHRINE2020-193 - Standardize the test indexes that are used by the lucene indexer and the ontology service - removed ...
marc-daniemarc-danie
044bdd5aabaSHRINE2020-193 - Standardize the test indexes that are used by the lucene indexer and the ontology service
marc-daniemarc-danie
47fbf1d8ce6Merge branch 'feature/SHRINE2020-462-easy-back-end-directory-rearrangements' of https://open.catalyst.harvard.edu/sta...
elizahelizah
f88fe11c827Merge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into SHRINE2020-170
elizahelizah
048616419b4change drop id
elizahelizah
7fe1f2133fcdraggable
Ben CarmenBen Carmen
5fcefacec50Merge pull request #996 in SHRINE/shrine from feature/SHRINE2020-465 to develop * commit 'cd071a4c04cabe612fb699210a...
David WalendDavid Walend
0ca9ecdc795Merge pull request #994 in SHRINE/shrine from feature/SHRINE2020-461-first-merge-of-release-3.0.0 to develop * commi...
dwalenddwalend
e52de743527Combined all the message queue parts into messagequeue/service for SHRINE2020-462
dwalenddwalend
a7350731e2cMoved services/receiver to receiver/service for SHRINE2020-462
Ben CarmenBen Carmen
b4503c9215fMerge pull request #993 in SHRINE/shrine from feature/SHRINE2020-287 to develop * commit '11a5c62c58cf756a09aff100d9...
dwalenddwalend
85262a10c02Folded email into commons/util for SHRINE2020-462
dwalenddwalend
0e003442376Deleting extra parts of crypto for SHRINE2020-462
dwalenddwalend
d7fb9790e92Almost independent of crypto for SHRINE-462
David WalendDavid Walend
9993bbdcb58Merge pull request #997 in SHRINE/shrine from feature/SHRINE2020-458-fix-oracle-and-ms-sql-upgrade to release/3.0.0 ...
Marc-Danie NazaireMarc-Danie Nazaire
2a8a307f504Merge pull request #995 in SHRINE/shrine from bugfix/SHRINE2020-443 to release/3.0.0 * commit 'dbfe2cd4f49d639c9d229...
Marc-Danie NazaireMarc-Danie Nazaire
f6289e96129Merge pull request #991 in SHRINE/shrine from bugfix/SHRINE2020-454 to release/3.0.0 * commit 'f6c988202d19175cd38ca...
bcarmenbcarmen
11a5c62c58cupdate to unit test
dwalenddwalend
b01077780e1Moved shrine-data-commons into util for SHRINE-462
dwalenddwalend
6d74769e003Folded test utils into utils for SHRINE2020-462
bcarmenbcarmen
cd071a4c04cFix of failing unit test
Next →