 dwalend | dfccdf2e44e | Merge remote-tracking branch 'origin/release/3.0.0' into feature/SHRINE2020-458-fix-oracle-and-ms-sql-upgrade | | |
dwalend | 0b7150195e1 | Moved ontology service to its own thing for SHRINE2020-462 | | |
dwalend | cdd4d66893d | Moved network health for SHRINE2020-462 | | |
dwalend | d178d547985 | Moved hub service for SHRINE2020-462 | | |
 David Walend | 79de98adf70 | Merge pull request #990 in SHRINE/shrine from bugfix/SHRINE2020-427 to release/3.0.0
* commit 'e70dd04e5d2d2e5293326... | | |
 bcarmen | 31cb989360a | quick edit | | |
bcarmen | e197cc32fca | made comment | | |
dwalend | c30dfefb890 | Moved dashboard service into its own thing for SHRINE2020-462 | | |
 marc-danie | dbfe2cd4f49 | "SHRINE2020-443 - Previous Results (queries) run on 2.0 does not repopulate the concepts into Find Patients when view... | | |
marc-danie | c6d5e17ae88 | "SHRINE2020-443 - Previous Results (queries) run on 2.0 does not repopulate the concepts into Find Patients when view... | | |
bcarmen | e8348c87154 | saving work for converting networkId and queryNetworkId to queryId | | |
dwalend | 7200fc4748d | Deleted and reshuffled some odd bits for SHRINE2020-462 | | |
dwalend | 918eddd757d | Deleting some unused things for SHRINE2020-462 | | |
dwalend | 8dba3173339 | Moved adapter for SHRINE-462 | | |
dwalend | cb89fc3237d | Moved aim3 to the new structure for SHRINE2020-462 | | |
dwalend | 6ae6c1271aa | Merge branch 'release/3.0.0' into feature/SHRINE2020-461-first-merge-of-release-3.0.0 | | |
dwalend | f2a5e538dd7 | No need for an index on a primary key - and oracle throws down an error message for SHRINE2020-458 | | |
dwalend | a84f1cd24f2 | Updated database scripts for SHRINE2020-458 . Will wait for some time on the various dbs to confirm. | | |
bcarmen | 48fc13c43aa | Moved User model to be a member of Session model | | |
marc-danie | f6c988202d1 | SHRINE2020-454 - Oracle issue at UPitt - Potential fix for sorting by flag in Oracle | | |
 elizah | 5b94b863874 | style placeholder | | |
marc-danie | 552987df473 | SHRINE2020-454 - Oracle issue at UPitt - Code review improvements | | |
elizah | 1a7c44df37e | add placeholder | | |
marc-danie | fbd5a7564a5 | SHRINE2020-454 - Oracle issue at UPitt - Added type to variable - Removed commented out code | | |
marc-danie | 4bb76cce3a2 | SHRINE2020-454 - Oracle issue at UPitt - Added type to variable | | |
marc-danie | 1f5518f625d | SHRINE2020-454 - Oracle issue at UPitt - Fix for getting distinct queries and distinct counts against Oracle database | | |
marc-danie | 83bcd7cb9f4 | SHRINE2020-454 - Oracle issue at UPitt - temp removal of distinct in selectRelevantQueries | | |
marc-danie | 08325315cd2 | SHRINE2020-454 - Oracle issue at UPitt | | |
dwalend | e70dd04e5d2 | Merge remote-tracking branch 'origin/release/3.0.0' into bugfix/SHRINE2020-427 | | |
dwalend | 799fd671d1c | Possible fix for SHRINE2020-427 | | |
elizah | ad650f84af1 | rename props to otherProps | | |
elizah | 771e7de3b91 | style diabled warning | | |
elizah | 34c70c1f675 | add
containsDemographic prop | | |
marc-danie | 76829da63e8 | Merge branch 'bugfix/SHRINE2020-416' into develop
# Conflicts:
# services/qep/src/main/scala/net/shrine/api/qep/QepS... | | |
 Ben Carmen | b9236092e8c | Merge pull request #988 in SHRINE/shrine from bugfix/SHRINE2020-432 to release/3.0.0
* commit 'f7038e6c7dbe8d1864e1b... | | |
 Marc-Danie Nazaire | f6dd604ebbc | Merge pull request #984 in SHRINE/shrine from bugfix/SHRINE2020-416 to release/3.0.0
* commit 'a36165bf2414c76463939... | | |
Marc-Danie Nazaire | 0ecdc3817d3 | Merge pull request #980 in SHRINE/shrine from bugfix/SHRINE2020-415 to release/3.0.0
* commit 'bdf8d53d52394d5b90163... | | |
marc-danie | a36165bf241 | SHRINE2020-416 - Previous ontology issues are reproducible with the Covid ontology - see description - Renamed variable | | |
David Walend | f9a491499fc | Merge pull request #986 in SHRINE/shrine from bugfix/SHRINE2020-427 to release/3.0.0
* commit '173daa7e207ad4c788b8f... | | |
marc-danie | 2877cce7434 | SHRINE2020-383 - SHRINE 2020: Legacy queries with 500 error are showing blank Topic Name & Criteria in 2020 webclient... | | |
bcarmen | f7038e6c7db | quick refactor | | |
bcarmen | cf8c133aac2 | make sure numbers are read as integers when comparing them | | |
 Bill Simons | b361df3abad | Merge pull request #983 in SHRINE/shrine from feature/SHRINE2020-360 to develop
* commit 'c9e3c175790435b4b9e32b571b... | | |
elizah | dc8ff7f4242 | rm width and height | | |
bcarmen | e130e9ac43f | saving ability to reload a query definition | | |
bcarmen | ed286f2aabb | Potential fix of date range issue | | |
elizah | 090770ef7f1 | increase clickable size | | |
marc-danie | 3f47129f831 | SHRINE2020-416 - Previous ontology issues are reproducible with the Covid ontology - see description - Renamed variab... | | |
marc-danie | 72bec92d2f4 | SHRINE2020-416 - Previous ontology issues are reproducible with the Covid ontology - see description - Added code cat... | | |
Marc-Danie Nazaire | 6d7b98f7ab4 | Merge pull request #985 in SHRINE/shrine from bugfix/SHRINE2020-383 to release/3.0.0
* commit 'cf0bded47649c599b79b5... | | |
dwalend | 173daa7e207 | Updated default lucene conf values to the most common, removed references to maxSearchResults, and updated the canoni... | | |
dwalend | 7a3240babf9 | Lazy vals for LuceneSearcher move exceptions out of initialization into existig code paths with expected exception ha... | | |
Ben Carmen | 49a0431ff43 | Merge pull request #981 in SHRINE/shrine from feature/SHRINE2020-257 to develop
* commit '0e2d9d2947b88cdfbf5bf8f3f9... | | |
marc-danie | cf0bded4764 | SHRINE2020-383 - SHRINE 2020: Legacy queries with 500 error are showing blank Topic Name & Criteria in 2020 webclient... | | |
marc-danie | 247cb64b8be | SHRINE2020-416 - Previous ontology issues are reproducible with the Covid ontology - see description - removed unuse... | | |
marc-danie | 4323c92e80f | SHRINE2020-416 - Previous ontology issues are reproducible with the Covid ontology - see description - fixed all brok... | | |
marc-danie | 2ee440e5acb | SHRINE2020-416 - Previous ontology issues are reproducible with the Covid ontology - see description - fixed search r... | | |
Bill Simons | c9e3c175790 | Update docker README for clearer instructions and to encourage use of the .env file instead of command-line propertie... | | |
Bill Simons | 3d213721483 | Merge branch 'develop' into feature/SHRINE2020-360 | | |
marc-danie | 499e2de35a4 | SHRINE2020-416 - Previous ontology issues are reproducible with the Covid ontology - see description - fix json expec... | | |
Bill Simons | 111102c09d0 | Merge pull request #982 in SHRINE/shrine from bugfix/SHRINE2020-423 to release/3.0.0
* commit 'ff72cacf0affd895fc9c2... | | |
Bill Simons | ff72cacf0af | use version number properties in docker pom file | | |
marc-danie | 19f173019be | SHRINE2020-416 - Previous ontology issues are reproducible with the Covid ontology - see description - updated basec ... | | |
bcarmen | 0e2d9d2947b | removed a comment | | |
marc-danie | b1cc528411e | SHRINE2020-416 - Previous ontology issues are reproducible with the Covid ontology - see description - unit tests upd... | | |
marc-danie | 886d526d03a | SHRINE2020-416 - Previous ontology issues are reproducible with the Covid ontology - see description - Fixed path to ... | | |
marc-danie | db94c5a5bdd | SHRINE2020-416 - Previous ontology issues are reproducible with the Covid ontology - see description - updated code s... | | |
marc-danie | f7f56236359 | SHRINE2020-416 - Previous ontology issues are reproducible with the Covid ontology - see description - updated unit t... | | |
marc-danie | 6e1b08dfdca | SHRINE2020-416 - Previous ontology issues are reproducible with the Covid ontology - see description - reverting changes | | |
marc-danie | adbe53956e4 | SHRINE2020-416 - Previous ontology issues are reproducible with the Covid ontology - see description - Fixed path of ... | | |
bcarmen | 9edc642ae45 | Merge branch 'develop' into feature/SHRINE2020-257 | | |
marc-danie | 0c6f4586b00 | SHRINE2020-416 - Previous ontology issues are reproducible with the Covid ontology - see description - Fixed path of ... | | |
marc-danie | bcaf48a543d | Merge branch 'bugfix/SHRINE2020-415' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into bugfix/SHRINE2... | | |
marc-danie | 1d260cbefd2 | SHRINE2020-416 - Previous ontology issues are reproducible with the Covid ontology - see description - Fixed junk cha... | | |
David Walend | bc502f423e0 | Merge pull request #979 in SHRINE/shrine from bugfix/SHRINE2020-418-hub-ddl-is-missing-from-shrine-setup.zip to relea... | | |
marc-danie | bdf8d53d523 | SHRINE2020-415 - Trim trailing whitespaces from the C_FULLNAME - undoing changes for SHRINE2020-416 | | |
marc-danie | dbf632834c3 | SHRINE2020-415 - Trim trailing whitespaces from the C_FULLNAME - disabled broken tests | | |
marc-danie | 15019f5de2d | SHRINE2020-415 - Trim trailing whitespaces from the C_FULLNAME - removed changes to suggestion indexer | | |
marc-danie | 7a514dc0f7b | SHRINE2020-415 - Trim trailing whitespaces from the C_FULLNAME | | |
dwalend | 6642cdec5ec | Added hub schema to shrine-setup.zip | | |
bcarmen | 7147532b8f4 | Merge branch 'bugfix/SHRINE2020-413' into release/3.0.0 | | |
David Walend | 7f3b8c9081d | Merge pull request #977 in SHRINE/shrine from feature/SHRINE2020-411-add-shrine-s-start-stop-and to release/3.0.0
* ... | | |
David Walend | 53b855c0b8f | Merge pull request #978 in SHRINE/shrine from feature/SHRINE2020-414-add-and-fix-database-update to release/3.0.0
* ... | | |
David Walend | 0425fed2ccd | Merge pull request #976 in SHRINE/shrine from feature/SHRINE2020-410-add-the-i2b2-hash-generator to release/3.0.0
* ... | | |
dwalend | c0a6e2044a0 | Renamed the file to give it more context for SHRINE2020-410 | | |
marc-danie | ddb588688fd | SHRINE2020-392 - Run indexing tool to create file for the Covid-19 Ontology; support got iTeam to update ontology on ... | | |
dwalend | fe897ce6d96 | Database file updates for SHRINE2020-414 | | |
dwalend | 5fe58cb5caf | init.d/shrine for SHRINE2020-411 | | |
dwalend | 7f1c9dcc490 | extra fix to some sql snuck in | | |
dwalend | a9467672d88 | Added the i2b2 hash generator for SHRINE2020-410 | | |
marc-danie | 50963b31aec | SHRINE2020-392 - Run indexing tool to create file for the Covid-19 Ontology; support got iTeam to update ontology on ... | | |
bcarmen | cacc29d10cc | made footer have a z-index. | | |
bcarmen | ecf3c7c8721 | saving fix of safari issue | | |
bcarmen | fdb3ad6a0dd | saving work | | |
bcarmen | 7d43b11b571 | Merge branch 'feature/SHRINE2020-408' into release/3.0.0 | | |
bcarmen | 9bdace5be99 | saving work | | |
marc-danie | 19f1442e16a | SHRINE2020-383 - SHRINE 2020: Legacy queries with 500 error are showing blank Topic Name & Criteria in 2020 webclient... | | |
marc-danie | 42b31a1b501 | SHRINE2020-259 - Investigate strengths/weaknesses to fetching the children of a concept when the parent is expanded r... | | |
Marc-Danie Nazaire | 77b9485269b | Merge pull request #974 in SHRINE/shrine from bugfix/SHRINE2020-383 to release/3.0.0
* commit 'f516dd7a19e7553ff66e5... | | |
marc-danie | f516dd7a19e | SHRINE2020-383 - SHRINE 2020: Legacy queries with 500 error are showing blank Topic Name & Criteria in 2020 webclient... | | |
marc-danie | 4bc114015ca | SHRINE2020-383 - SHRINE 2020: Legacy queries with 500 error are showing blank Topic Name & Criteria in 2020 webclient... | | |
bcarmen | b91e949451a | change of help file | | |
bcarmen | 248f6c092cd | saving work | | |
bcarmen | 4e4e9056dc9 | Merge branch 'develop' into cleanup-prop-types | | |
bcarmen | 845ba97706b | Merge branch 'release/3.0.0' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into release/3.0.0 | | |
David Walend | d4b1a862426 | Merge pull request #973 in SHRINE/shrine from bugfix/SHRINE2020-394 to release/3.0.0
* commit 'dc2b87d15ad5acf7e3df5... | | |
Marc-Danie Nazaire | c6423af69b7 | Merge pull request #975 in SHRINE/shrine from feature/SHRINE2020-259 to release/3.0.0
* commit 'b3888f65ae8863915a4d... | | |
bcarmen | 934b51f6d1a | addition of text to unexpected error pop up | | |
marc-danie | 9e8b20a5ad7 | Merge branch 'release/3.0.0' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into bugfix/SHRINE2020-383 | | |
marc-danie | 46a4e1e3c1e | SHRINE2020-383 - SHRINE 2020: Legacy queries with 500 error are showing blank Topic Name & Criteria in 2020 webclient... | | |
bcarmen | 6522e4c9836 | fix of revision | | |
bcarmen | 2531d4dce20 | Merge branch 'bugfix/SHRINE2020-400' into release/3.0.0 | | |
bcarmen | 6df12ce20b5 | merged SHRINE2020-397 | | |
Ben Carmen | d178e514fc1 | Merge pull request #969 in SHRINE/shrine from bugfix/SHRINE2020-397 to develop
* commit '89006793d01bb2ee1ce166c9076... | | |
Ben Carmen | 5b3060f291b | Merge pull request #972 in SHRINE/shrine from bugfix/SHRINE2020-396 to release/3.0.0
* commit '7dc638778278b4f3e5a7f... | | |
bcarmen | df6cbe3ad47 | saving work | | |
David Walend | 7e72c14ccd8 | Merge pull request #968 in SHRINE/shrine from bugfix/SHRINE2020-395 to release/3.0.0
* commit '1389087e371481889b192... | | |
dwalend | dc2b87d15ad | Merge commit '099f53125' into bugfix/SHRINE2020-394 | | |
dwalend | 099f53125d8 | Made sure not to write identical rows to results for SHRINE2020-394 | | |
marc-danie | 525512657b9 | SHRINE2020-377 - SHRINE 2020: Pending and Rejected Topics are appearing in Topic dropdown | | |
Marc-Danie Nazaire | a963764c572 | Merge pull request #971 in SHRINE/shrine from bugfix/SHRINE2020-377 to release/3.0.0
* commit 'b6b742ceba6cc3bc68bb6... | | |
marc-danie | b1052a27f01 | Merge branch 'bugfix/SHRINE2020-389' into develop
# Conflicts:
# pom.xml | | |
Marc-Danie Nazaire | 7076d44007d | Merge pull request #970 in SHRINE/shrine from bugfix/SHRINE2020-389 to release/3.0.0
* commit 'f27584c363302d8eb80fa... | | |
bcarmen | 7dc63877827 | fix of error when not finding ontology children | | |
dwalend | 79e0e4ad719 | Added a check to be sure duplicate data is already written for SHRINE2020-395 | | |
dwalend | 5c7408757d9 | Now distinct queries for SHRINE2020-394 | | |
dwalend | 9bbff000d21 | Added a .distinct and some unit tests to be sure each result is only displayed once for SHRINE2020-394 | | |
bcarmen | e6b668312ed | saving progress | | |
marc-danie | f27584c3633 | SHRINE2020-389 - SHRINE 2020: Date Range and Occurrence values are not loading back to query builder by clicking the ... | | |
bcarmen | 89006793d01 | fix of start query getting buried | | |
marc-danie | b3888f65ae8 | SHRINE2020-259 - Investigate strengths/weaknesses to fetching the children of a concept when the parent is expanded r... | | |
dwalend | 1389087e371 | File that worked for testing SHRINE-3711 in the shrine2020 qa systems for SHRINE2020-395 | | |
Bill Simons | 8f8befee287 | Prepare develop for next release version | | |
Bill Simons | 5743cfbb5f2 | Use three digit version number for release | | |
Marc-Danie Nazaire | 1092754c02a | Merge pull request #967 in SHRINE/shrine from bugfix/SHRINE2020-379 to develop
* commit '1a80e13bbb68e35c34e0f901faa... | | |
marc-danie | 1a80e13bbb6 | Merge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into bugfix/SHRINE2020-379
# Con... | | |
Marc-Danie Nazaire | 8eab6c2e23e | Merge pull request #931 in SHRINE/shrine from feature/SHRINE2020-309 to develop
* commit '79147a08ed11fe8abe5a69dbc5... | | |
marc-danie | 79147a08ed1 | SHRINE2020-309 - Display an alert message to the user if reloading a query from legacy with unsupported 2020 features... | | |
marc-danie | a2bb86fd181 | SHRINE2020-309 - Display an alert message to the user if reloading a query from legacy with unsupported 2020 features... | | |
marc-danie | 216dbea70f1 | SHRINE2020-309 - Display an alert message to the user if reloading a query from legacy with unsupported 2020 features... | | |
marc-danie | c6a81634187 | SHRINE2020-309 - Display an alert message to the user if reloading a query from legacy with unsupported 2020 features... | | |
marc-danie | cb51e5cf2e1 | SHRINE2020-309 - Display an alert message to the user if reloading a query from legacy with unsupported 2020 features... | | |
marc-danie | cdb42a4ed2b | SHRINE2020-309 - Display an alert message to the user if reloading a query from legacy with unsupported 2020 features... | | |
marc-danie | 993e8ea208a | Merge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-309
# Co... | | |
marc-danie | c1c07a7af34 | SHRINE2020-379 - "Abnormal Flag: Normal" option missing from Lab Constraint drop down - changed the default directory... | | |
David Walend | 31040b438d2 | Merge pull request #966 in SHRINE/shrine from feature/SHRINE2020-357 to develop
* commit '0703570cbffa0ce00752d7af50... | | |
marc-danie | fae49fd7d90 | SHRINE2020-309 - Display an alert message to the user if reloading a query from legacy with unsupported 2020 features... | | |
marc-danie | d3d865dd265 | Merge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-309
# Co... | | |
marc-danie | 88754130c69 | SHRINE2020-379 - "Abnormal Flag: Normal" option missing from Lab Constraint drop down - converted List to Seq | | |
marc-danie | a4ca680f689 | SHRINE2020-309 - Display an alert message to the user if reloading a query from legacy with unsupported 2020 features... | | |
marc-danie | f795012359d | SHRINE2020-379 - "Abnormal Flag: Normal" option missing from Lab Constraint drop down | | |
dwalend | 0703570cbff | Merge remote-tracking branch 'origin/develop' into feature/SHRINE2020-357 | | |
dwalend | b85c30334c1 | Marc-Danie spotted some duplicate code while reviewing SHRINE2020-357 | | |
marc-danie | 2287bf5e878 | SHRINE2020-379 - "Abnormal Flag: Normal" option missing from Lab Constraint drop down | | |
 Xav | b6b742ceba6 | Merge branch 'develop' into bugfix/SHRINE2020-377 | | |
bcarmen | acc4f492e3a | saving padding change on right | | |
dwalend | 724f1640d7a | Figured out how to fix the unit tests I turned off for SHRINE2020-357 | | |
bcarmen | 950ffccc70a | fix of left and right margins for view results | | |
dwalend | d69a5a93255 | Merge remote-tracking branch 'origin/develop' into feature/SHRINE2020-357 | | |
Ben Carmen | 2f2b93d5dc9 | Merge pull request #962 in SHRINE/shrine from feature/SHRINE2020-373 to develop
* commit 'e0e022fb0779eaa13e66b2732a... | | |
bcarmen | e0e022fb077 | Merge branch 'feature/SHRINE2020-372' into feature/SHRINE2020-373 | | |
dwalend | ce4f5ffc5a3 | Scooped out a lot of logging from work in SHRINE2020-357 SHRINE2020-367 and SHRINE2020-368 | | |
dwalend | 9a98581d137 | Finally a submit error for SHRINE2020-357 | | |
dwalend | 42ca0d8e4f4 | Merged in changes from SHRINE2020-367, tidied up, now getting the submit error after timeout. | | |
Xav | 463f767ff4e | SHRINE2020-377 : only display approved topics in the topic drop-down when creating a query | | |
dwalend | 38d483a9fc8 | Merge remote-tracking branch 'origin/develop' into feature/SHRINE2020-357 | | |
dwalend | 17576a39c3c | Code clean up for SHRINE2020-367 | | |
dwalend | b11e2ac0c6b | Now the QEP makes unlimited attempts as a fix for SHRINE2020-367 | | |
dwalend | f3581c53c61 | Merge remote-tracking branch 'origin/develop' into bugfix/SHRINE2020-367 | | |
dwalend | 567b1bfede2 | Logging definitely working again for SHRINE-368 | | |
bcarmen | 041ddf02f74 | Merge branch 'feature/SHRINE2020-361' into develop | | |
bcarmen | 0b05df02894 | Merge branch 'feature/SHRINE2020-326' into develop | | |
bcarmen | ca524aab077 | made recommended code review change | | |
bcarmen | c5ac50f4928 | fix of style | | |
bcarmen | 333a787e288 | added BA review changes | | |
bcarmen | 942259e0d69 | fix of styles | | |
bcarmen | 8c6cace458b | fix of dropdown arrow | | |
dwalend | cb3fb10baeb | Verified that logging is working for SHRINE2020-368 | | |
bcarmen | 026e6c6f882 | saving work | | |
marc-danie | 867e242447c | SHRINE2020-372 - Verify that 401 and 403 errors are covered with the existing invalid credentials on login | | |
bcarmen | 0065167d147 | Merge branch 'develop' into feature/SHRINE2020-329 | | |
dwalend | 863e7dbda7a | Changing to non-static structures are enough to get logging working again for SHRINE-368 | | |
dwalend | b55029d9041 | Now logging mostly as expected for SHRINE2020-368 | | |
Ben Carmen | 66338c02eb6 | Merge pull request #948 in SHRINE/shrine from feature/SHRINE2020-330 to develop
* commit 'dd9a0a0e0193d78f9dc3bda1ce... | | |
bcarmen | dc2481cd776 | Merge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into develop | | |
bcarmen | 77c1c32acda | Merge branch 'develop' into bugfix/SHRINE2020-359 | | |
bcarmen | dd9a0a0e019 | Merge branch 'develop' into feature/SHRINE2020-330 | | |
bcarmen | 8edf7ec5fe6 | updated config.js for webserver | | |
| Next → |
