SHRINE
  1. SHRINE

shrine

Public
  1. SHRINE
  2. shrine

All Branches Graph  

        
AuthorCommitMessageCommit dateBuilds
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
dwalenddwalend
dfccdf2e44eMerge remote-tracking branch 'origin/release/3.0.0' into feature/SHRINE2020-458-fix-oracle-and-ms-sql-upgrade
dwalenddwalend
0b7150195e1Moved ontology service to its own thing for SHRINE2020-462
dwalenddwalend
cdd4d66893dMoved network health for SHRINE2020-462
dwalenddwalend
d178d547985Moved hub service for SHRINE2020-462
David WalendDavid Walend
79de98adf70Merge pull request #990 in SHRINE/shrine from bugfix/SHRINE2020-427 to release/3.0.0 * commit 'e70dd04e5d2d2e5293326...
bcarmenbcarmen
31cb989360aquick edit
bcarmenbcarmen
e197cc32fcamade comment
dwalenddwalend
c30dfefb890Moved dashboard service into its own thing for SHRINE2020-462
marc-daniemarc-danie
dbfe2cd4f49"SHRINE2020-443 - Previous Results (queries) run on 2.0 does not repopulate the concepts into Find Patients when view...
marc-daniemarc-danie
c6d5e17ae88"SHRINE2020-443 - Previous Results (queries) run on 2.0 does not repopulate the concepts into Find Patients when view...
bcarmenbcarmen
e8348c87154saving work for converting networkId and queryNetworkId to queryId
dwalenddwalend
7200fc4748dDeleted and reshuffled some odd bits for SHRINE2020-462
dwalenddwalend
918eddd757dDeleting some unused things for SHRINE2020-462
dwalenddwalend
8dba3173339Moved adapter for SHRINE-462
dwalenddwalend
cb89fc3237dMoved aim3 to the new structure for SHRINE2020-462
dwalenddwalend
6ae6c1271aaMerge branch 'release/3.0.0' into feature/SHRINE2020-461-first-merge-of-release-3.0.0
dwalenddwalend
f2a5e538dd7No need for an index on a primary key - and oracle throws down an error message for SHRINE2020-458
dwalenddwalend
a84f1cd24f2Updated database scripts for SHRINE2020-458 . Will wait for some time on the various dbs to confirm.
bcarmenbcarmen
48fc13c43aaMoved User model to be a member of Session model
marc-daniemarc-danie
f6c988202d1SHRINE2020-454 - Oracle issue at UPitt - Potential fix for sorting by flag in Oracle
elizahelizah
5b94b863874style placeholder
marc-daniemarc-danie
552987df473SHRINE2020-454 - Oracle issue at UPitt - Code review improvements
elizahelizah
1a7c44df37eadd placeholder
marc-daniemarc-danie
fbd5a7564a5SHRINE2020-454 - Oracle issue at UPitt - Added type to variable - Removed commented out code
marc-daniemarc-danie
4bb76cce3a2SHRINE2020-454 - Oracle issue at UPitt - Added type to variable
marc-daniemarc-danie
1f5518f625dSHRINE2020-454 - Oracle issue at UPitt - Fix for getting distinct queries and distinct counts against Oracle database
marc-daniemarc-danie
83bcd7cb9f4SHRINE2020-454 - Oracle issue at UPitt - temp removal of distinct in selectRelevantQueries
marc-daniemarc-danie
08325315cd2SHRINE2020-454 - Oracle issue at UPitt
dwalenddwalend
e70dd04e5d2Merge remote-tracking branch 'origin/release/3.0.0' into bugfix/SHRINE2020-427
dwalenddwalend
799fd671d1cPossible fix for SHRINE2020-427
elizahelizah
ad650f84af1rename props to otherProps
elizahelizah
771e7de3b91style diabled warning
elizahelizah
34c70c1f675add containsDemographic prop
marc-daniemarc-danie
76829da63e8Merge branch 'bugfix/SHRINE2020-416' into develop # Conflicts: # services/qep/src/main/scala/net/shrine/api/qep/QepS...
Ben CarmenBen Carmen
b9236092e8cMerge pull request #988 in SHRINE/shrine from bugfix/SHRINE2020-432 to release/3.0.0 * commit 'f7038e6c7dbe8d1864e1b...
Marc-Danie NazaireMarc-Danie Nazaire
f6dd604ebbcMerge pull request #984 in SHRINE/shrine from bugfix/SHRINE2020-416 to release/3.0.0 * commit 'a36165bf2414c76463939...
Marc-Danie NazaireMarc-Danie Nazaire
0ecdc3817d3Merge pull request #980 in SHRINE/shrine from bugfix/SHRINE2020-415 to release/3.0.0 * commit 'bdf8d53d52394d5b90163...
marc-daniemarc-danie
a36165bf241SHRINE2020-416 - Previous ontology issues are reproducible with the Covid ontology - see description - Renamed variable
David WalendDavid Walend
f9a491499fcMerge pull request #986 in SHRINE/shrine from bugfix/SHRINE2020-427 to release/3.0.0 * commit '173daa7e207ad4c788b8f...
marc-daniemarc-danie
2877cce7434SHRINE2020-383 - SHRINE 2020: Legacy queries with 500 error are showing blank Topic Name & Criteria in 2020 webclient...
bcarmenbcarmen
f7038e6c7dbquick refactor
bcarmenbcarmen
cf8c133aac2make sure numbers are read as integers when comparing them
Bill SimonsBill Simons
b361df3abadMerge pull request #983 in SHRINE/shrine from feature/SHRINE2020-360 to develop * commit 'c9e3c175790435b4b9e32b571b...
elizahelizah
dc8ff7f4242rm width and height
bcarmenbcarmen
e130e9ac43fsaving ability to reload a query definition
bcarmenbcarmen
ed286f2aabbPotential fix of date range issue
elizahelizah
090770ef7f1increase clickable size
marc-daniemarc-danie
3f47129f831SHRINE2020-416 - Previous ontology issues are reproducible with the Covid ontology - see description - Renamed variab...
marc-daniemarc-danie
72bec92d2f4SHRINE2020-416 - Previous ontology issues are reproducible with the Covid ontology - see description - Added code cat...
Marc-Danie NazaireMarc-Danie Nazaire
6d7b98f7ab4Merge pull request #985 in SHRINE/shrine from bugfix/SHRINE2020-383 to release/3.0.0 * commit 'cf0bded47649c599b79b5...
dwalenddwalend
173daa7e207Updated default lucene conf values to the most common, removed references to maxSearchResults, and updated the canoni...
dwalenddwalend
7a3240babf9Lazy vals for LuceneSearcher move exceptions out of initialization into existig code paths with expected exception ha...
Ben CarmenBen Carmen
49a0431ff43Merge pull request #981 in SHRINE/shrine from feature/SHRINE2020-257 to develop * commit '0e2d9d2947b88cdfbf5bf8f3f9...
marc-daniemarc-danie
cf0bded4764SHRINE2020-383 - SHRINE 2020: Legacy queries with 500 error are showing blank Topic Name & Criteria in 2020 webclient...
marc-daniemarc-danie
247cb64b8beSHRINE2020-416 - Previous ontology issues are reproducible with the Covid ontology - see description - removed unuse...
marc-daniemarc-danie
4323c92e80fSHRINE2020-416 - Previous ontology issues are reproducible with the Covid ontology - see description - fixed all brok...
marc-daniemarc-danie
2ee440e5acbSHRINE2020-416 - Previous ontology issues are reproducible with the Covid ontology - see description - fixed search r...
Bill SimonsBill Simons
c9e3c175790Update docker README for clearer instructions and to encourage use of the .env file instead of command-line propertie...
Bill SimonsBill Simons
3d213721483Merge branch 'develop' into feature/SHRINE2020-360
marc-daniemarc-danie
499e2de35a4SHRINE2020-416 - Previous ontology issues are reproducible with the Covid ontology - see description - fix json expec...
Bill SimonsBill Simons
111102c09d0Merge pull request #982 in SHRINE/shrine from bugfix/SHRINE2020-423 to release/3.0.0 * commit 'ff72cacf0affd895fc9c2...
Bill SimonsBill Simons
ff72cacf0afuse version number properties in docker pom file
marc-daniemarc-danie
19f173019beSHRINE2020-416 - Previous ontology issues are reproducible with the Covid ontology - see description - updated basec ...
bcarmenbcarmen
0e2d9d2947bremoved a comment
marc-daniemarc-danie
b1cc528411eSHRINE2020-416 - Previous ontology issues are reproducible with the Covid ontology - see description - unit tests upd...
marc-daniemarc-danie
886d526d03aSHRINE2020-416 - Previous ontology issues are reproducible with the Covid ontology - see description - Fixed path to ...
marc-daniemarc-danie
db94c5a5bddSHRINE2020-416 - Previous ontology issues are reproducible with the Covid ontology - see description - updated code s...
marc-daniemarc-danie
f7f56236359SHRINE2020-416 - Previous ontology issues are reproducible with the Covid ontology - see description - updated unit t...
marc-daniemarc-danie
6e1b08dfdcaSHRINE2020-416 - Previous ontology issues are reproducible with the Covid ontology - see description - reverting changes
marc-daniemarc-danie
adbe53956e4SHRINE2020-416 - Previous ontology issues are reproducible with the Covid ontology - see description - Fixed path of ...
bcarmenbcarmen
9edc642ae45Merge branch 'develop' into feature/SHRINE2020-257
marc-daniemarc-danie
0c6f4586b00SHRINE2020-416 - Previous ontology issues are reproducible with the Covid ontology - see description - Fixed path of ...
marc-daniemarc-danie
bcaf48a543dMerge branch 'bugfix/SHRINE2020-415' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into bugfix/SHRINE2...
marc-daniemarc-danie
1d260cbefd2SHRINE2020-416 - Previous ontology issues are reproducible with the Covid ontology - see description - Fixed junk cha...
David WalendDavid Walend
bc502f423e0Merge pull request #979 in SHRINE/shrine from bugfix/SHRINE2020-418-hub-ddl-is-missing-from-shrine-setup.zip to relea...
marc-daniemarc-danie
bdf8d53d523SHRINE2020-415 - Trim trailing whitespaces from the C_FULLNAME - undoing changes for SHRINE2020-416
marc-daniemarc-danie
dbf632834c3SHRINE2020-415 - Trim trailing whitespaces from the C_FULLNAME - disabled broken tests
marc-daniemarc-danie
15019f5de2dSHRINE2020-415 - Trim trailing whitespaces from the C_FULLNAME - removed changes to suggestion indexer
marc-daniemarc-danie
7a514dc0f7bSHRINE2020-415 - Trim trailing whitespaces from the C_FULLNAME
dwalenddwalend
6642cdec5ecAdded hub schema to shrine-setup.zip
bcarmenbcarmen
7147532b8f4Merge branch 'bugfix/SHRINE2020-413' into release/3.0.0
David WalendDavid Walend
7f3b8c9081dMerge pull request #977 in SHRINE/shrine from feature/SHRINE2020-411-add-shrine-s-start-stop-and to release/3.0.0 * ...
David WalendDavid Walend
53b855c0b8fMerge pull request #978 in SHRINE/shrine from feature/SHRINE2020-414-add-and-fix-database-update to release/3.0.0 * ...
David WalendDavid Walend
0425fed2ccdMerge pull request #976 in SHRINE/shrine from feature/SHRINE2020-410-add-the-i2b2-hash-generator to release/3.0.0 * ...
dwalenddwalend
c0a6e2044a0Renamed the file to give it more context for SHRINE2020-410
marc-daniemarc-danie
ddb588688fdSHRINE2020-392 - Run indexing tool to create file for the Covid-19 Ontology; support got iTeam to update ontology on ...
dwalenddwalend
fe897ce6d96Database file updates for SHRINE2020-414
dwalenddwalend
5fe58cb5cafinit.d/shrine for SHRINE2020-411
dwalenddwalend
7f1c9dcc490extra fix to some sql snuck in
dwalenddwalend
a9467672d88Added the i2b2 hash generator for SHRINE2020-410
marc-daniemarc-danie
50963b31aecSHRINE2020-392 - Run indexing tool to create file for the Covid-19 Ontology; support got iTeam to update ontology on ...
bcarmenbcarmen
cacc29d10ccmade footer have a z-index.
bcarmenbcarmen
ecf3c7c8721saving fix of safari issue
bcarmenbcarmen
fdb3ad6a0ddsaving work
bcarmenbcarmen
7d43b11b571Merge branch 'feature/SHRINE2020-408' into release/3.0.0
bcarmenbcarmen
9bdace5be99saving work
marc-daniemarc-danie
19f1442e16aSHRINE2020-383 - SHRINE 2020: Legacy queries with 500 error are showing blank Topic Name & Criteria in 2020 webclient...
marc-daniemarc-danie
42b31a1b501SHRINE2020-259 - Investigate strengths/weaknesses to fetching the children of a concept when the parent is expanded r...
Marc-Danie NazaireMarc-Danie Nazaire
77b9485269bMerge pull request #974 in SHRINE/shrine from bugfix/SHRINE2020-383 to release/3.0.0 * commit 'f516dd7a19e7553ff66e5...
marc-daniemarc-danie
f516dd7a19eSHRINE2020-383 - SHRINE 2020: Legacy queries with 500 error are showing blank Topic Name & Criteria in 2020 webclient...
marc-daniemarc-danie
4bc114015caSHRINE2020-383 - SHRINE 2020: Legacy queries with 500 error are showing blank Topic Name & Criteria in 2020 webclient...
bcarmenbcarmen
b91e949451achange of help file
bcarmenbcarmen
248f6c092cdsaving work
bcarmenbcarmen
4e4e9056dc9Merge branch 'develop' into cleanup-prop-types
bcarmenbcarmen
845ba97706bMerge branch 'release/3.0.0' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into release/3.0.0
David WalendDavid Walend
d4b1a862426Merge pull request #973 in SHRINE/shrine from bugfix/SHRINE2020-394 to release/3.0.0 * commit 'dc2b87d15ad5acf7e3df5...
Marc-Danie NazaireMarc-Danie Nazaire
c6423af69b7Merge pull request #975 in SHRINE/shrine from feature/SHRINE2020-259 to release/3.0.0 * commit 'b3888f65ae8863915a4d...
bcarmenbcarmen
934b51f6d1aaddition of text to unexpected error pop up
marc-daniemarc-danie
9e8b20a5ad7Merge branch 'release/3.0.0' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into bugfix/SHRINE2020-383
marc-daniemarc-danie
46a4e1e3c1eSHRINE2020-383 - SHRINE 2020: Legacy queries with 500 error are showing blank Topic Name & Criteria in 2020 webclient...
bcarmenbcarmen
6522e4c9836fix of revision
bcarmenbcarmen
2531d4dce20Merge branch 'bugfix/SHRINE2020-400' into release/3.0.0
bcarmenbcarmen
6df12ce20b5merged SHRINE2020-397
Ben CarmenBen Carmen
d178e514fc1Merge pull request #969 in SHRINE/shrine from bugfix/SHRINE2020-397 to develop * commit '89006793d01bb2ee1ce166c9076...
Ben CarmenBen Carmen
5b3060f291bMerge pull request #972 in SHRINE/shrine from bugfix/SHRINE2020-396 to release/3.0.0 * commit '7dc638778278b4f3e5a7f...
bcarmenbcarmen
df6cbe3ad47saving work
David WalendDavid Walend
7e72c14ccd8Merge pull request #968 in SHRINE/shrine from bugfix/SHRINE2020-395 to release/3.0.0 * commit '1389087e371481889b192...
dwalenddwalend
dc2b87d15adMerge commit '099f53125' into bugfix/SHRINE2020-394
dwalenddwalend
099f53125d8Made sure not to write identical rows to results for SHRINE2020-394
marc-daniemarc-danie
525512657b9SHRINE2020-377 - SHRINE 2020: Pending and Rejected Topics are appearing in Topic dropdown
Marc-Danie NazaireMarc-Danie Nazaire
a963764c572Merge pull request #971 in SHRINE/shrine from bugfix/SHRINE2020-377 to release/3.0.0 * commit 'b6b742ceba6cc3bc68bb6...
marc-daniemarc-danie
b1052a27f01Merge branch 'bugfix/SHRINE2020-389' into develop # Conflicts: # pom.xml
Marc-Danie NazaireMarc-Danie Nazaire
7076d44007dMerge pull request #970 in SHRINE/shrine from bugfix/SHRINE2020-389 to release/3.0.0 * commit 'f27584c363302d8eb80fa...
bcarmenbcarmen
7dc63877827fix of error when not finding ontology children
dwalenddwalend
79e0e4ad719Added a check to be sure duplicate data is already written for SHRINE2020-395
dwalenddwalend
5c7408757d9Now distinct queries for SHRINE2020-394
dwalenddwalend
9bbff000d21Added a .distinct and some unit tests to be sure each result is only displayed once for SHRINE2020-394
bcarmenbcarmen
e6b668312edsaving progress
marc-daniemarc-danie
f27584c3633SHRINE2020-389 - SHRINE 2020: Date Range and Occurrence values are not loading back to query builder by clicking the ...
bcarmenbcarmen
89006793d01fix of start query getting buried
marc-daniemarc-danie
b3888f65ae8SHRINE2020-259 - Investigate strengths/weaknesses to fetching the children of a concept when the parent is expanded r...
dwalenddwalend
1389087e371File that worked for testing SHRINE-3711 in the shrine2020 qa systems for SHRINE2020-395
Bill SimonsBill Simons
8f8befee287Prepare develop for next release version
Bill SimonsBill Simons
5743cfbb5f2Use three digit version number for release
Marc-Danie NazaireMarc-Danie Nazaire
1092754c02aMerge pull request #967 in SHRINE/shrine from bugfix/SHRINE2020-379 to develop * commit '1a80e13bbb68e35c34e0f901faa...
marc-daniemarc-danie
1a80e13bbb6Merge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into bugfix/SHRINE2020-379 # Con...
Marc-Danie NazaireMarc-Danie Nazaire
8eab6c2e23eMerge pull request #931 in SHRINE/shrine from feature/SHRINE2020-309 to develop * commit '79147a08ed11fe8abe5a69dbc5...
marc-daniemarc-danie
79147a08ed1SHRINE2020-309 - Display an alert message to the user if reloading a query from legacy with unsupported 2020 features...
marc-daniemarc-danie
a2bb86fd181SHRINE2020-309 - Display an alert message to the user if reloading a query from legacy with unsupported 2020 features...
marc-daniemarc-danie
216dbea70f1SHRINE2020-309 - Display an alert message to the user if reloading a query from legacy with unsupported 2020 features...
marc-daniemarc-danie
c6a81634187SHRINE2020-309 - Display an alert message to the user if reloading a query from legacy with unsupported 2020 features...
marc-daniemarc-danie
cb51e5cf2e1SHRINE2020-309 - Display an alert message to the user if reloading a query from legacy with unsupported 2020 features...
marc-daniemarc-danie
cdb42a4ed2bSHRINE2020-309 - Display an alert message to the user if reloading a query from legacy with unsupported 2020 features...