dwalend | b851133d8dd | Added front end parts as a dependency for SHRINE2020-464 | | |
Marc-Danie Nazaire | 5f613fa590e | SHRINE2020-494 - Migrate the SHRINE_QUERY and QUERY_RESULT tables to Slick - removed selectAllQueryHistoryForNetworkI... | | |
dwalend | 6371d6fd4e0 | Merge with develop for SHRINE2020-464 | | |
dwalend | 7bf2262bd96 | Merge branch 'develop' into feature/SHRINE2020-464
# Conflicts:
# frontend/shrine-webclient/v1/dev-server/data/selec... | | |
Marc-Danie Nazaire | 31e8139a2f9 | SHRINE2020-494 - Migrate the SHRINE_QUERY and QUERY_RESULT tables to Slick - reverting changes | | |
Marc-Danie Nazaire | a0502cc749c | SHRINE2020-456 - Simplify shrine.conf with default values - removed trailing slash | | |
Marc-Danie Nazaire | 678b69e4caa | SHRINE2020-456 - Simplify shrine.conf with default values - Modified to use .map.getOrElse | | |
bcarmen | 720703b7928 | saving work | | |
bcarmen | 5d08f9ee461 | Merge branch 'develop' into feature/SHRINE2020-532 | | |
elizah | ec1c5062bb9 | combine api and root | | |
elizah | 27a8174d689 | wrong log | | |
elizah | a5c651cbf33 | combine log files | | |
dwalend | dff13eac876 | Renamed the long-named-indexing-tool to something shroter for SHRINE2020-464 | | |
Marc-Danie Nazaire | 42aa28933bb | SHRINE2020-456 - Simplify shrine.conf with default values - Fixed StaticDataServiceTest | | |
Marc-Danie Nazaire | 4757c91b123 | SHRINE2020-456 - Simplify shrine.conf with default values - Added default value for webclient.nextStepsUrl | | |
Marc-Danie Nazaire | f8a8d04e25e | SHRINE2020-456 - Simplify shrine.conf with default values - Added default value for networkStatusQuery | | |
Marc-Danie Nazaire | 38a53eb2aa9 | SHRINE2020-456 - Simplify shrine.conf with default values - Added default value for networkStatusQuery | | |
dwalend | 52fe41f329d | First batch of Bill's review comments for SHRINE2020-464 | | |
elizah | 1698b2763bd | add tests | | |
elizah | a6ca9d8257a | add default logger | | |
Marc-Danie Nazaire | db6f02ba729 | SHRINE2020-494 - Migrate the SHRINE_QUERY and QUERY_RESULT tables to Slick - Made networkId the primary key in the SH... | | |
Marc-Danie Nazaire | 308cef163c9 | SHRINE2020-494 - Migrate the SHRINE_QUERY and QUERY_RESULT tables to Slick - Removed unused deleteQueryIO function | | |
bcarmen | 4837b8e9752 | Merge branch 'develop' into feature/SHRINE2020-534 | | |
bcarmen | 64d1edbf125 | updated unit test, fixed prop name | | |
elizah | ab9d6c21287 | remove ripple effects | | |
elizah | f2b251d8648 | rename to SelectionContext | | |
elizah | cb86ce402e7 | cleanup | | |
elizah | 950936a193e | remove useCallback | | |
elizah | 8dbc4f705d6 | move event handler | | |
elizah | ae9d018f38c | cleanup reducer | | |
bcarmen | 16f7e78320b | saving work | | |
elizah | b5a99064c41 | centralize prompt | | |
elizah | 67b8704a40a | drop area style change | | |
elizah | e3ee709c498 | indicate drag region | | |
bcarmen | 7eac3889b0c | Merge branch 'develop' into bugfix/SHRINE2020-363 | | |
elizah | 68e57e2ef8b | add snapshot | | |
elizah | 8c259dd47e9 | remove group when all moved out | | |
Eliza Huang | 3a790f611f0 | Merge pull request #1037 in SHRINE/shrine from bugfix/SHRINE2020-537 to develop
* commit '722bf89b2db02f42e30344f062... | | |
elizah | 3098b620953 | correct equality | | |
elizah | bfd80052306 | Merge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-170 | | |
bcarmen | 1823add354c | saving work | | |
Marc-Danie Nazaire | 23561a43083 | SHRINE2020-494 - Migrate the SHRINE_QUERY and QUERY_RESULT tables to Slick - Added return type for toMillis function | | |
Marc-Danie Nazaire | 70e014c4f5f | Merge branches 'develop' and 'feature/SHRINE2020-494' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine in... | | |
elizah | 722bf89b2db | clear view mode on logout | | |
bcarmen | 13fdcae15b3 | saving work | | |
Eliza Huang | 54c38c72b7e | Merge pull request #1029 in SHRINE/shrine from bugfix/SHRINE2020-384 to develop
* commit '1adaa493314dc36dea0b7ea5fa... | | |
bcarmen | 1ad3ce88034 | saving work | | |
bcarmen | b8b2fe372cc | saving work | | |
bcarmen | f7b4336b3df | saving updated snapshot test | | |
bcarmen | 52f06513711 | saving work | | |
Marc-Danie Nazaire | 7a4c01b7bdc | SHRINE2020-456 - Simplify shrine.conf with default values - Fix retrieval of hub.client.serverUrl | | |
Marc-Danie Nazaire | 28d5f82c2a5 | SHRINE2020-456 - Simplify shrine.conf with default values - Removed debug statement | | |
elizah | 9f0ac8b1101 | cleanup | | |
elizah | d872a8d3d96 | display a download link | | |
elizah | 7a0a885254e | Merge branch 'feature/SHRINE2020-505' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRIN... | | |
elizah | 412fd599552 | place | | |
Marc-Danie Nazaire | 483e7cb925e | SHRINE2020-456 - Simplify shrine.conf with default values - Set createTopicsMode = Pending in shrine.conf for unit te... | | |
elizah | 47e47e22252 | rm todo | | |
elizah | 64d50ecfd93 | fix tests | | |
elizah | a6651ed891d | cleanup context reducer | | |
elizah | 020f8b6cc32 | remove logs | | |
elizah | 65235fa10ae | rename addGroupTerms | | |
elizah | 6c963f65ba8 | rename insertTerms | | |
elizah | 1a31f60d3e6 | fix tutorial | | |
elizah | 8de7ccae920 | working | | |
elizah | 006f5ffa431 | change selection color | | |
elizah | 5b67a537831 | selection color style | | |
elizah | 7c4cf8d7a39 | change on mousedown | | |
elizah | f96a6df14ac | insert term | | |
elizah | 5b243ddd50b | select with shift | | |
marc-danie | 2600cbd10bb | SHRINE2020-456 - Simplify shrine.conf with default values - Set default for createTopicsMode to Approved in the shrin... | | |
Bill Simons | c2e2891a308 | account for directory restructuring in dockerignore | | |
bcarmen | 9155e4a9698 | updated package-lock for legacy | | |
bcarmen | 927adfe3099 | updated .gitignore | | |
bcarmen | 672fc62b9ef | added package.lock files | | |
bcarmen | c46bd8f4fd3 | added package-lock.json | | |
elizah | 583e927d68a | use selection context | | |
marc-danie | 82d7e7c18de | Merge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-456 | | |
marc-danie | 339b7d61753 | SHRINE2020-468 - Passwords in shrine.conf make support difficult - Modified the shrine.conf's units tests to use the ... | | |
marc-danie | 85e0e410192 | SHRINE2020-468 - Passwords in shrine.conf make support difficult - Added password.conf to docker, unit tests, and rem... | | |
bcarmen | 9c3972f9601 | added front end build for network health | | |
elizah | aebc8fafb9e | rm unused import | | |
bcarmen | 815e176cadc | updated changes | | |
bcarmen | 975535a81d4 | removed bloop artifact | | |
elizah | 85c199c9c04 | update snapchat | | |
bcarmen | 3b4580b47f0 | updated .gitignore | | |
bcarmen | 1dc683bf1b9 | updated .gitignore | | |
bcarmen | f7131bf4f36 | updated primary .gitignore | | |
bcarmen | 239dfd6bb56 | saving work | | |
dwalend | 4aadb748ed8 | Folded Receiver into the shrine-api-app directory, alongside Bootstrap for SHRINE-464 | | |
elizah | 54a2582e62c | fixing tests | | |
dwalend | c120396226f | Moved the MOM system into the hub for SHRINE2020-464 | | |
elizah | 82ecb92d88b | fix typo | | |
elizah | 17e941a18fd | check if concept exits | | |
elizah | 4a59172e708 | move between groups | | |
Eliza Huang | a190e03b2cd | Merge pull request #1018 in SHRINE/shrine from feature/SHRINE2020-468 to feature/SHRINE2020-456
* commit '52f33dd83d... | | |
dwalend | db475ce3478 | Merge remote-tracking branch 'origin/develop' into feature/SHRINE2020-464 | | |
marc-danie | 52f33dd83d9 | SHRINE2020-468 - Passwords in shrine.conf make support difficult - Added more test password.conf file | | |
elizah | 6ad07d7d8d8 | move drag-dropable area | | |
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 | | |
Next → |