 elizah | d098fcab74c | move all config names into a list | | |
elizah | c5ba3f68efb | t push origin HEADMerge branch 'feature/SHRINE2020-456' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine ... | | |
elizah | 4e09c1cf12b | get set of keys first | | |
 marc-danie | 1a395751b9d | SHRINE2020-499 - Migrate the BREAKDOWN_RESULT table to Slick | | |
elizah | d5ae74949ee | seperate isPassword | | |
 David Walend | 69602f2e179 | Merge pull request #1023 in SHRINE/shrine from feature/SHRINE2020-471 to develop
* commit 'c3c13984ae3c8e02bb3d58ef0... | | |
marc-danie | 6ef49f0fa46 | SHRINE2020-494 - Migrate the SHRINE_QUERY and QUERY_RESULT tables to Slick - fixed broken unit test | | |
marc-danie | df041201f68 | SHRINE2020-494 - Migrate the SHRINE_QUERY and QUERY_RESULT tables to Slick - modified to return ids of inserted query... | | |
elizah | 6d17be05623 | remove passwords in other conf | | |
elizah | 805a67f393e | cleanup | | |
 dwalend | c3c13984ae3 | Moved the DSA for SHRINE2020-471 | | |
dwalend | 73af22b835a | Moved the static data service for SHRINE2020-471 | | |
elizah | a27b8bc83e2 | use count | | |
elizah | 3c6ad9b8149 | fix initial containsDem state | | |
elizah | ab2b18e2204 | consistent position | | |
elizah | 5a6049bb44b | restyled error msg | | |
elizah | fe3d8ba31d4 | fix merge conflict | | |
elizah | 34d4d13e1f7 | copy to clipboard on clicking static text | | |
elizah | 3aed9c55ccb | fix delete test | | |
elizah | a3767f38923 | Merge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into bugfix/SHRINE2020-399 | | |
dwalend | f34aef36db2 | Merge remote-tracking branch 'origin/develop' into feature/SHRINE2020-471 | | |
elizah | 767a1be4302 | save react-beautiful-dnd | | |
dwalend | 08ff8e94b10 | Merge branch 'feature/SHRINE2020-471' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRIN... | | |
elizah | 63ba6424b6f | Merge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-170 | | |
 Ben Carmen | ef8d16900f6 | Merge pull request #1020 in SHRINE/shrine from feature/SHRINE2020-492 to develop
* commit '1fcf7a161065d950a2fbcab79... | | |
marc-danie | 6b48b170adc | SHRINE2020-495 - Migrate the COUNT_RESULT and ERROR_RESULT table to Slick - added ERROR_RESULT table | | |
marc-danie | 50b6897cab2 | Merge branch 'feature/SHRINE2020-494' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRIN... | | |
marc-danie | ce9bb647897 | Merge branch 'feature/SHRINE2020-494' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRIN... | | |
marc-danie | 8e94f3e9883 | SHRINE2020-494 - Migrate the SHRINE_QUERY and QUERY_RESULT tables to Slick - replaced testInsertQueryResult test with... | | |
 Bamboo User | d622c9a01b4 | Merge release branch release/3.0.0 into master. | | |
Bamboo User | b1dce7361eb | Update POMs with release version 3.0.0. | | |
marc-danie | 86109511011 | SHRINE2020-495 - Migrate the COUNT_RESULT and ERROR_RESULT table to Slick | | |
Ben Carmen | 311783bc93d | Merge pull request #1017 in SHRINE/shrine from feature/SHRINE2020-471 to develop
* commit '38a1f9ccb4e173946c9999190... | | |
 bcarmen | 1fcf7a16106 | saving work | | |
marc-danie | 9648bf86840 | SHRINE2020-494 - Migrate the SHRINE_QUERY and QUERY_RESULT tables to Slick - more code cleanup | | |
marc-danie | 2ba82b88a62 | SHRINE2020-494 - Migrate the SHRINE_QUERY and QUERY_RESULT tables to Slick - uncommented out tests | | |
marc-danie | 9f40c7e2293 | SHRINE2020-494 - Migrate the SHRINE_QUERY and QUERY_RESULT tables to Slick - code cleanup | | |
marc-danie | 2ecf77c6b83 | SHRINE2020-494 - Migrate the SHRINE_QUERY and QUERY_RESULT tables to Slick - modified to return first row when select... | | |
marc-danie | 5e6519852eb | SHRINE2020-494 - Migrate the SHRINE_QUERY and QUERY_RESULT tables to Slick | | |
elizah | a09d2534876 | cleanup | | |
elizah | 16963ed7286 | ensure password.conf only contains passwords | | |
elizah | edcf3af4ade | test shrine.conf w/t passwords | | |
bcarmen | a561524ee31 | saving work | | |
Ben Carmen | a758f3946f7 | Merge pull request #1016 in SHRINE/shrine from feature/SHRINE2020-491 to develop
* commit '4115b04f95daadcec6c2984af... | | |
bcarmen | 4115b04f95d | removed session.js | | |
bcarmen | b1732e17ab6 | Merge branch 'develop' into feature/SHRINE2020-491 | | |
elizah | 423cc9cbf57 | remove unused import | | |
bcarmen | 38a1f9ccb4e | Merge branch 'develop' into feature/SHRINE2020-471 | | |
elizah | b02da47420f | test password | | |
bcarmen | 3a56c1c98bf | added test component | | |
bcarmen | 50be1d4e943 | updated work to compile typescript and javascript | | |
dwalend | 50705eb5623 | Moved the i2b2 service to legacy for SHRINE2020-471 | | |
dwalend | b8e03a30de0 | pom.xml changes now that the qep is consolidated for SHRINE2020-471 | | |
Ben Carmen | 9e7f7eeacd8 | Merge pull request #1003 in SHRINE/shrine from feature/SHRINE2020-463 to develop
* commit '3cd4a32536be93e4ad8ea9744... | | |
dwalend | ca136855f88 | Consolidated the QEP directory for SHRINE2020-471 | | |
bcarmen | 3cd4a32536b | Merge branch 'develop' into feature/SHRINE2020-463 | | |
bcarmen | 7ef9515e9ea | fixed failing tests | | |
dwalend | b7521f1900c | Most of the way through the merge, but I need to pass to Ben to fix the npm parts for SHRINE2020-491 | | |
elizah | 70049ad5d86 | cleanup | | |
elizah | db748e89945 | use dot notation for conf | | |
elizah | a5306ebb9bf | limit to only password | | |
elizah | 72ad6a4ba62 | add password conf | | |
elizah | 42551fd13bf | test password config | | |
elizah | 77231a23eec | password config | | |
David Walend | 31f83bcd1b6 | Merge pull request #1014 in SHRINE/shrine from bugfix/SHRINE2020-487-umichigan-reports-an-xml-injection to release/3.... | | |
dwalend | 6ef939a6a10 | sax parser is not thread safe. Create a new sax parser every time for SHRINE2020-487. | | |
David Walend | e1571176073 | Merge pull request #1013 in SHRINE/shrine from bugfix/SHRINE2020-487-umichigan-reports-an-xml-injection to release/3.... | | |
dwalend | b977f0e7f01 | Merge remote-tracking branch 'origin/release/3.0.0' into bugfix/SHRINE2020-487-umichigan-reports-an-xml-injection | | |
David Walend | f85b06b488f | Merge pull request #1012 in SHRINE/shrine from bugfix/SHRINE2020-486 to release/3.0.0
* commit '419187f4cb32aab1d405... | | |
dwalend | 3474c725709 | Three xml injection attack files to support SHRINE2020-487 | | |
dwalend | 17e1a2031d7 | Switched to using XmlUtil.safeParser everywhere for SHRINE2020-487 | | |
dwalend | d68e88b7fde | Fix to prevent the XML injection attack for SHRINE2020-487 | | |
dwalend | 419187f4cb3 | Better logging than 0 seconds for .25 seconds for SHRINE2020-486 | | |
marc-danie | a3e57fff6e3 | Reverted temporary changes to trigger java.lang.IllegalArgumentException: Duplicate handler name: request-body-stream... | | |
marc-danie | 94f603eb11d | Temporary changes to trigger java.lang.IllegalArgumentException: Duplicate handler name: request-body-streamer error | | |
dwalend | 80a9d8ee2e8 | Added 250 ms retry for calls to the PM cell for SHRINE2020-486 | | |
dwalend | 0ab8bc4fdf5 | Merge branch 'release/3.0.0' into investigate500 | | |
 Marc-Danie Nazaire | 8d03a2ca9e2 | Merge pull request #1004 in SHRINE/shrine from feature/SHRINE2020-316 to develop
* commit '22dd6c8e9eef7fe470de517dc... | | |
Marc-Danie Nazaire | 36e697062fa | Merge pull request #1009 in SHRINE/shrine from feature/SHRINE2020-180 to develop
* commit 'b8c89d77e80473a27a41deba6... | | |
Ben Carmen | ea5b6d58941 | Merge pull request #1011 in SHRINE/shrine from bugfix/SHRINE2020-484 to release/3.0.0
* commit '2c248364ea3bd60464d0... | | |
dwalend | 3ab43cad2ba | Plans for fixing the netty/asynchttpclient with retries if we need it | | |
bcarmen | 2c248364ea3 | guard against extra topics requests. | | |
bcarmen | a82245bdf73 | xit failing snapshot tests | | |
bcarmen | 49f94da3a8f | saving snapshot changes | | |
bcarmen | 2831974afb2 | new snapshot | | |
bcarmen | 7219cb2cc6a | removed extra call to query topics | | |
bcarmen | bbc7b7f8c12 | stop extra call to getTopics | | |
bcarmen | b95552416d6 | added suggestion from code review | | |
bcarmen | 0e1e5e5572d | saving work | | |
bcarmen | 8a286247b76 | saving work | | |
elizah | add9c1663d8 | only clear warning when has error | | |
elizah | 0fc4da4a671 | uppercase comparison | | |
elizah | 6fa13f3ca04 | add missing semicolon | | |
David Walend | 77701c3c177 | Merge pull request #1010 in SHRINE/shrine from bugfix/SHRINE2020-474 to release/3.0.0
* commit '9ff99a34e73a9944ac3d... | | |
bcarmen | 4948e639664 | saving work for merge to 3.0.0 | | |
dwalend | 9ff99a34e73 | Missed setting the dataVersion for SHRINE2020-474 | | |
Marc-Danie Nazaire | 5af68d296e3 | Merge pull request #1002 in SHRINE/shrine from feature/SHRINE2020-193 to develop
* commit '635e8573568aa67f1bc4a04f4... | | |
dwalend | 689ace08178 | Changes from that mistargetted SHRINE2020-474 branch from develop, now from release/3.0.0 | | |
elizah | ee804200d1f | exit early if cannot find moved term | | |
elizah | a368a680402 | case insensitive comparison | | |
dwalend | f8c13843427 | Fixed the internal name of a state to match the databas default for SHRINE2020-475 | | |
elizah | a2bb62158aa | fix merge conflict | | |
elizah | fc27a2ce06d | Merge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into SHRINE2020-381 | | |
elizah | 1d7f5bdf1d3 | default to query def view | | |
marc-danie | 22dd6c8e9ee | SHRINE2020-316 - QepService file has become too large - moved ConceptGroupWithOntologyFields into ConceptGroup.scala | | |
marc-danie | 6343efa6240 | SHRINE2020-316 - QepService file has become too large | | |
bcarmen | a56faedd1dd | fix of failing tests | | |
bcarmen | adecc0a3383 | possible fix for breaking build | | |
bcarmen | 8c4518b8ee7 | package.json update | | |
bcarmen | cde9c010e15 | saving work | | |
bcarmen | c072e2c1406 | fixed unit tests | | |
bcarmen | 9ca13192b8d | saving package-lock | | |
David Walend | d48f3076cb3 | Merge pull request #998 in SHRINE/shrine from feature/SHRINE2020-462-easy-back-end-directory-rearrangements to develo... | | |
bcarmen | 1a25f2c151a | Revert "added package-lock"
This reverts commit 72a3a2d61525b91646d064d2d7e38a94f79c5691. | | |
bcarmen | 7bcac72856b | saving work | | |
bcarmen | 72a3a2d6152 | added package-lock | | |
marc-danie | b8c89d77e80 | SHRINE2020-180 - Automate the generation of the Lucene index used for testing the suggester | | |
elizah | 54dbf4a6c02 | dismiss warning on clear all | | |
bcarmen | 51e692b0e5c | saving final package. | | |
bcarmen | 802eed545b3 | saving work | | |
elizah | 2ac5caa5d74 | remove warning on chaning username/password | | |
marc-danie | 635e8573568 | SHRINE2020-193 - Standardize the test indexes that are used by the lucene indexer and the ontology service - Moved Lu... | | |
marc-danie | 15e51861983 | SHRINE2020-193 - Standardize the test indexes that are used by the lucene indexer and the ontology service - Fixed cy... | | |
marc-danie | f7dcac05116 | SHRINE2020-193 - Standardize the test indexes that are used by the lucene indexer and the ontology service - removed ... | | |
marc-danie | 044bdd5aaba | SHRINE2020-193 - Standardize the test indexes that are used by the lucene indexer and the ontology service | | |
marc-danie | 47fbf1d8ce6 | Merge branch 'feature/SHRINE2020-462-easy-back-end-directory-rearrangements' of https://open.catalyst.harvard.edu/sta... | | |
elizah | f88fe11c827 | Merge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into SHRINE2020-170 | | |
elizah | 048616419b4 | change drop id | | |
elizah | 7fe1f2133fc | draggable | | |
Ben Carmen | 5fcefacec50 | Merge pull request #996 in SHRINE/shrine from feature/SHRINE2020-465 to develop
* commit 'cd071a4c04cabe612fb699210a... | | |
David Walend | 0ca9ecdc795 | Merge pull request #994 in SHRINE/shrine from feature/SHRINE2020-461-first-merge-of-release-3.0.0 to develop
* commi... | | |
dwalend | e52de743527 | Combined all the message queue parts into messagequeue/service for SHRINE2020-462 | | |
dwalend | a7350731e2c | Moved services/receiver to receiver/service for SHRINE2020-462 | | |
Ben Carmen | b4503c9215f | Merge pull request #993 in SHRINE/shrine from feature/SHRINE2020-287 to develop
* commit '11a5c62c58cf756a09aff100d9... | | |
dwalend | 85262a10c02 | Folded email into commons/util for SHRINE2020-462 | | |
dwalend | 0e003442376 | Deleting extra parts of crypto for SHRINE2020-462 | | |
dwalend | d7fb9790e92 | Almost independent of crypto for SHRINE-462 | | |
David Walend | 9993bbdcb58 | Merge pull request #997 in SHRINE/shrine from feature/SHRINE2020-458-fix-oracle-and-ms-sql-upgrade to release/3.0.0
... | | |
Marc-Danie Nazaire | 2a8a307f504 | Merge pull request #995 in SHRINE/shrine from bugfix/SHRINE2020-443 to release/3.0.0
* commit 'dbfe2cd4f49d639c9d229... | | |
Marc-Danie Nazaire | f6289e96129 | Merge pull request #991 in SHRINE/shrine from bugfix/SHRINE2020-454 to release/3.0.0
* commit 'f6c988202d19175cd38ca... | | |
bcarmen | 11a5c62c58c | update to unit test | | |
dwalend | b01077780e1 | Moved shrine-data-commons into util for SHRINE-462 | | |
dwalend | 6d74769e003 | Folded test utils into utils for SHRINE2020-462 | | |
bcarmen | cd071a4c04c | Fix of failing unit test | | |
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 | | |
| Next → |
