 marc-danie | bbdf142a9d8 | SHRINE2020-468 - Passwords in shrine.conf make support difficult - Added test password.conf file | | |
 elizah | dfc93289463 | Merge branch 'develop' into feature/SHRINE2020-170 | | |
marc-danie | a5fb062e4c3 | Merge branch 'feature/SHRINE2020-468' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRIN... | | |
marc-danie | 3bcc9932913 | SHRINE2020-468 - Passwords in shrine.conf make support difficult - changed shrine.keystore.password to be the correct... | | |
 dwalend | b9ebcc2a6ad | Moved http4s utilities into util for SHRINE2020-464 | | |
elizah | 948486eb9d8 | Merge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-170 | | |
elizah | a587060ba97 | Merge branch 'feature/SHRINE2020-387' into develop | | |
 Eliza Huang | b665325380f | Merge pull request #1032 in SHRINE/shrine from bugfix/SHRINE2020-401 to develop
* commit 'add9c1663d8007bd9746067183... | | |
Eliza Huang | ef48669e5c4 | Merge pull request #1031 in SHRINE/shrine from bugfix/SHRINE2020-381 to develop
* commit '6e8e6afc1f5a0f2ce1517a4031... | | |
Eliza Huang | eb95d6bd8f9 | Merge pull request #1033 in SHRINE/shrine from feature/SHRINE2020-387 to develop
* commit '54dbf4a6c02f43e8da456786b... | | |
elizah | 6e8e6afc1f5 | set find patients page as default | | |
elizah | 8f710370cf7 | fix merge conflict | | |
elizah | 8a243e46f3a | remove close action on static text | | |
marc-danie | afd2b2be4aa | SHRINE2020-456 - Simplify shrine.conf with default values - replaced to use getOption().getOrElse in ConfigExtensions | | |
elizah | c43e300c4f3 | Merge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into bugfix/SHRINE2020-399 | | |
elizah | a209ad8013d | Merge branch 'feature/SHRINE2020-456' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRIN... | | |
dwalend | a3960d80872 | Moved the jmeter parts to the apps directory and deleted the tools directory for SHRINE2020-464 | | |
dwalend | 4f3931497d2 | Moved jmeter-automation for SHRINE2020-464 | | |
marc-danie | f243efd4466 | SHRINE2020-456 - Simplify shrine.conf with default values - Fixed build | | |
dwalend | d4d4b7116b4 | Moved the hub audit tool for SHRINE2020-464 | | |
dwalend | 0138946a9f0 | Moved hubAuditTool closer to the hub for SHRINE2020-464 | | |
marc-danie | 8abffe00386 | SHRINE2020-456 - Simplify shrine.conf with default values - Added getOptionWithFallback function to ConfigExtensions | | |
dwalend | 7d291add611 | Moved the ontology building tool to the ontology project for SHRINE2020-464 | | |
marc-danie | 7c01a609d6f | SHRINE2020-456 - Simplify shrine.conf with default values - replaced to use getOption().getOrElse in ConfigExtensions | | |
dwalend | 11b999c1b7e | Cleaned up some comments for SHRINE2020-464 | | |
dwalend | 320d30ec581 | Merge remote-tracking branch 'origin/develop' into feature/SHRINE2020-464 | | |
marc-danie | b8f8a27c9fd | SHRINE2020-456 - Simplify shrine.conf with default values - added buildUri function to ConfigExtensions | | |
elizah | b72052fd0c7 | move to password.conf file | | |
 bcarmen | e4e04827c99 | moved dashboard frontend code and dsa frontend code and legacy | | |
elizah | f8b34c98ff2 | Merge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-468 | | |
elizah | f759538195e | fix query round trip test | | |
dwalend | c6bb71de031 | Moved the I2B2QepService into the legacy/service subproject for SHRINE2020-464 | | |
elizah | 73387d7eddb | Merge branch 'feature/SHRINE2020-456' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRIN... | | |
elizah | ee6414a2caf | add password.conf to msg queue | | |
marc-danie | d50a5c0fb17 | SHRINE2020-456 - Simplify shrine.conf with default values - removed urlPath from test shrine.conf | | |
bcarmen | b162afdba7f | deleted unused stuff | | |
bcarmen | b907ed17eed | committing change of dashboard frontend code | | |
elizah | 5f6eac6f503 | fix exception tests | | |
elizah | 5e9cf692a0b | Merge branch 'feature/SHRINE2020-456' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRIN... | | |
marc-danie | 71e7b185179 | Added use statements to the beginning of the *.ddl files | | |
bcarmen | 45044782a50 | changed method name | | |
marc-danie | 382f0eea5a1 | SHRINE2020-456 - Simplify shrine.conf with default values - removed empty adapter block | | |
marc-danie | 1b50f57c07e | Added use statements to the beginning of the *.ddl files | | |
marc-danie | f1b237c3ab7 | Removed duplicate statement to create index "previousQueriesDateCreatedIndex" on "previousQueries" | | |
marc-danie | bdbefcb435c | Removed alter table "queriesReceived" add "userDomainName" VARCHAR(MAX) NULL statement call since userDomainName colu... | | |
elizah | 1adaa493314 | update snapshots | | |
bcarmen | 512310efe7a | saving work | | |
bcarmen | 6f503ade5ba | added demo distribution view | | |
elizah | 13932ff24ed | Merge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into bugfix/SHRINE2020-384 | | |
elizah | e5cb5a96e68 | fix merge conflicts | | |
marc-danie | fac2d09f914 | SHRINE2020-456 - Simplify shrine.conf with default values - shrine.conf cleanup | | |
marc-danie | cc6471cc1d6 | SHRINE2020-456 - Simplify shrine.conf with default values - Fix retrieval of crcEndpointUrl in DashboardService | | |
marc-danie | c7d13b57bab | SHRINE2020-456 - Simplify shrine.conf with default values - moved the messagequeue element to be a child of the hub e... | | |
marc-danie | c9512d38ed1 | SHRINE2020-456 - Simplify shrine.conf with default values - set default value for hiveCredentials.domain and hiveCred... | | |
marc-danie | f5bfbc50e2b | SHRINE2020-456 - Simplify shrine.conf with default values - set default value for webclient.domain and webclient.name | | |
marc-danie | 5d6609d9cd5 | SHRINE2020-456 - Simplify shrine.conf with default values - set default value for webclient.domain and webclient.name | | |
dwalend | 699166b0ee3 | Got rid of CertCollectionAdapter for SHRINE2020-469 and SHRINE-3425 | | |
dwalend | 554b5434131 | Removed trustModel shrine.conf value for SHRINE2020-469 | | |
dwalend | 7f0bf0734c4 | Moved a lot of crypto stuff into the crypto package for SHRINE2020-469 , SHRINE-3425 | | |
marc-danie | 9a5f1978bc5 | SHRINE2020-456 - Simplify shrine.conf with default values - set default value for hub.client.serverUrl | | |
dwalend | b3cc5b9cdcf | Merge branch 'feature/SHRINE2020-469' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRIN... | | |
dwalend | 14c8f170c5b | Part-way through removing the Peer cert business for SHRINE2020-469 and SHRINE-3425 | | |
marc-danie | 8a6344044e6 | SHRINE2020-456 - Simplify shrine.conf with default values - set default value for keystore.file and keystore.keyStore... | | |
marc-danie | 8429f797af3 | SHRINE2020-456 - Simplify shrine.conf with default values - set default value for keystore.file and keystore.keyStore... | | |
bcarmen | 11513e05f81 | Updated Unit test. | | |
marc-danie | 0cccd158454 | SHRINE2020-456 - Simplify shrine.conf with default values - set default value for adapterMappingsFileName | | |
bcarmen | c16bc723f2b | minor change | | |
bcarmen | 2da0a175c58 | saving work | | |
dwalend | 1d78d67d4d2 | Moved config things into the config package for SHRINE2020-469 | | |
marc-danie | 0ea63164b0e | SHRINE2020-456 - Simplify shrine.conf with default values - replaced url with urlPath and set a default value for pmE... | | |
dwalend | 4bd311c406e | Moved a lot of XML stuff from util to xml. Does not build. Getting some help from Ben. SHRINE2020-469 | | |
marc-danie | b7f602271fd | SHRINE2020-456 - Simplify shrine.conf with default values - replaced serverUrl with serverUrlPath and set a default v... | | |
dwalend | c7d8a6225de | Moved out the OntClient so that http4s-utils does not depend on protocol fo rSHRINE2020-469 | | |
elizah | 26afbfebd51 | add unit tests for exceptions | | |
bcarmen | 53819c535c0 | updated unit test. | | |
dwalend | adf9e2e6c95 | Big rearangement of code to split out the http4s subproject better for SHRINE-469 | | |
bcarmen | 26991cccbc1 | potential solution for selecting the demographic distribution. | | |
marc-danie | 4debe7ae54d | SHRINE2020-456 - Simplify shrine.conf with default values - Set default value for steward.createTopicsMode to Approved | | |
marc-danie | f752bcebd3d | SHRINE2020-456 - Simplify shrine.conf with default values - Moved definition of SHRINE properties external to the shr... | | |
marc-danie | 0217b90a910 | Cleared out the *-update.sql scripts for SHRINE 3.1, added update scripts for the hub, and renamed the qep update scr... | | |
marc-danie | dfe42a2fc8b | SHRINE2020-494 - Migrate the SHRINE_QUERY and QUERY_RESULT tables to Slick - Added TODO to get the QueryHistory schem... | | |
marc-danie | 971e2aba7e5 | SHRINE2020-494 - Migrate the SHRINE_QUERY and QUERY_RESULT tables to Slick - Removed unnecessary run function | | |
dwalend | 625228c8ea0 | Missed moving the dsa setup scripts in shrine-setup.zip | | |
dwalend | 879440341d7 | Moved authorization code to the QEP for SHRINE2020-469 | | |
marc-danie | 03691e90088 | SHRINE2020-494 - Migrate the SHRINE_QUERY and QUERY_RESULT tables to Slick - Added comment about the locale used in X... | | |
marc-danie | 52d2d39e1b1 | SHRINE2020-494 - Migrate the SHRINE_QUERY and QUERY_RESULT tables to Slick - removed unused daysFromNow function from... | | |
marc-danie | b5bc7ac675a | Merge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-494 | | |
elizah | 2648136fd5e | Merge branch 'feature/SHRINE2020-456' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRIN... | | |
elizah | 87531712208 | cleanup | | |
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 | | |
| Next → |
