Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Hotfix 2.1.5 develop merge #305

Merged
merged 8 commits into from
Jul 15, 2024
Merged

Hotfix 2.1.5 develop merge #305

merged 8 commits into from
Jul 15, 2024

Conversation

azimov
Copy link
Collaborator

@azimov azimov commented Jul 15, 2024

No description provided.

azimov and others added 8 commits June 24, 2024 08:29
Get table names faile when schema specified
# Conflicts:
#	DESCRIPTION
#	NEWS.md
#	R/OhdsiShinyModules.R
#	_pkgdown.yml
#	docs/articles/AddingShinyModules.html
#	docs/articles/index.html
#	docs/news/index.html
#	docs/reference/LargeDataTable.html
#	docs/reference/OhdsiShinyModules.html
#	docs/reference/aboutHelperFile.html
#	docs/reference/aboutServer.html
#	docs/reference/aboutViewer.html
#	docs/reference/characterizationAggregateFeaturesServer.html
#	docs/reference/characterizationAggregateFeaturesViewer.html
#	docs/reference/characterizationDechallengeRechallengeServer.html
#	docs/reference/characterizationDechallengeRechallengeViewer.html
#	docs/reference/characterizationHelperFile.html
#	docs/reference/characterizationIncidenceServer.html
#	docs/reference/characterizationIncidenceViewer.html
#	docs/reference/characterizationServer.html
#	docs/reference/characterizationTableServer.html
#	docs/reference/characterizationTableViewer.html
#	docs/reference/characterizationTimeToEventServer.html
#	docs/reference/characterizationTimeToEventViewer.html
#	docs/reference/characterizationViewer.html
#	docs/reference/cohortCountsModule.html
#	docs/reference/cohortCountsView.html
#	docs/reference/cohortDefinitionsModule.html
#	docs/reference/cohortDefinitionsView.html
#	docs/reference/cohortDiagCharacterizationView.html
#	docs/reference/cohortDiagnosticsHelperFile.html
#	docs/reference/cohortDiagnosticsServer.html
#	docs/reference/cohortDiagnosticsView.html
#	docs/reference/cohortGeneratorHelperFile.html
#	docs/reference/cohortGeneratorServer.html
#	docs/reference/cohortGeneratorViewer.html
#	docs/reference/cohortMethodAttritionServer.html
#	docs/reference/cohortMethodAttritionViewer.html
#	docs/reference/cohortMethodCovariateBalanceServer.html
#	docs/reference/cohortMethodCovariateBalanceViewer.html
#	docs/reference/cohortMethodDiagnosticsSummaryServer.html
#	docs/reference/cohortMethodDiagnosticsSummaryViewer.html
#	docs/reference/cohortMethodHelperFile.html
#	docs/reference/cohortMethodKaplanMeierServer.html
#	docs/reference/cohortMethodKaplanMeierViewer.html
#	docs/reference/cohortMethodPopulationCharacteristicsServer.html
#	docs/reference/cohortMethodPopulationCharacteristicsViewer.html
#	docs/reference/cohortMethodPowerServer.html
#	docs/reference/cohortMethodPowerViewer.html
#	docs/reference/cohortMethodPropensityModelServer.html
#	docs/reference/cohortMethodPropensityModelViewer.html
#	docs/reference/cohortMethodPropensityScoreDistServer.html
#	docs/reference/cohortMethodPropensityScoreDistViewer.html
#	docs/reference/cohortMethodResultSummaryServer.html
#	docs/reference/cohortMethodResultSummaryViewer.html
#	docs/reference/cohortMethodServer.html
#	docs/reference/cohortMethodSystematicErrorServer.html
#	docs/reference/cohortMethodSystematicErrorViewer.html
#	docs/reference/cohortMethodViewer.html
#	docs/reference/cohortOverlapView.html
#	docs/reference/compareCohortCharacterizationView.html
#	docs/reference/conceptsInDataSourceView.html
#	docs/reference/createCdDatabaseDataSource.html
#	docs/reference/createCustomColDefList.html
#	docs/reference/createLargeSqlQueryDt.html
#	docs/reference/dataDiagnosticDrillServer.html
#	docs/reference/dataDiagnosticDrillViewer.html
#	docs/reference/dataDiagnosticHelperFile.html
#	docs/reference/dataDiagnosticServer.html
#	docs/reference/dataDiagnosticSummaryServer.html
#	docs/reference/dataDiagnosticSummaryViewer.html
#	docs/reference/dataDiagnosticViewer.html
#	docs/reference/databaseInformationView.html
#	docs/reference/datasourcesHelperFile.html
#	docs/reference/datasourcesServer.html
#	docs/reference/datasourcesViewer.html
#	docs/reference/evidenceSynthesisHelperFile.html
#	docs/reference/evidenceSynthesisServer.html
#	docs/reference/evidenceSynthesisViewer.html
#	docs/reference/getCirceRenderedExpression.html
#	docs/reference/getEnabledCdReports.html
#	docs/reference/getLogoImage.html
#	docs/reference/incidenceRatesView.html
#	docs/reference/inclusionRulesView.html
#	docs/reference/index.html
#	docs/reference/indexEventBreakdownView.html
#	docs/reference/largeTableServer.html
#	docs/reference/largeTableView.html
#	docs/reference/makeButtonLabel.html
#	docs/reference/orpahanConceptsView.html
#	docs/reference/patientLevelPredictionCalibrationServer.html
#	docs/reference/patientLevelPredictionCalibrationViewer.html
#	docs/reference/patientLevelPredictionCovariateSummaryServer.html
#	docs/reference/patientLevelPredictionCovariateSummaryViewer.html
#	docs/reference/patientLevelPredictionCutoffServer.html
#	docs/reference/patientLevelPredictionCutoffViewer.html
#	docs/reference/patientLevelPredictionDesignSummaryServer.html
#	docs/reference/patientLevelPredictionDesignSummaryViewer.html
#	docs/reference/patientLevelPredictionDiagnosticsServer.html
#	docs/reference/patientLevelPredictionDiagnosticsViewer.html
#	docs/reference/patientLevelPredictionDiscriminationServer.html
#	docs/reference/patientLevelPredictionDiscriminationViewer.html
#	docs/reference/patientLevelPredictionHelperFile.html
#	docs/reference/patientLevelPredictionModelSummaryServer.html
#	docs/reference/patientLevelPredictionModelSummaryViewer.html
#	docs/reference/patientLevelPredictionNbServer.html
#	docs/reference/patientLevelPredictionNbViewer.html
#	docs/reference/patientLevelPredictionServer.html
#	docs/reference/patientLevelPredictionSettingsServer.html
#	docs/reference/patientLevelPredictionSettingsViewer.html
#	docs/reference/patientLevelPredictionValidationServer.html
#	docs/reference/patientLevelPredictionValidationViewer.html
#	docs/reference/patientLevelPredictionViewer.html
#	docs/reference/phevaluatorHelperFile.html
#	docs/reference/phevaluatorServer.html
#	docs/reference/phevaluatorViewer.html
#	docs/reference/resultTableServer.html
#	docs/reference/resultTableViewer.html
#	docs/reference/sccsHelperFile.html
#	docs/reference/sccsServer.html
#	docs/reference/sccsView.html
#	docs/reference/timeDistributionsView.html
#	docs/reference/visitContextView.html
#	docs/sitemap.xml
@azimov azimov merged commit 05da629 into develop Jul 15, 2024
6 checks passed
@jreps jreps deleted the hotfix-2.1.5-develop-merge branch September 12, 2024 20:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant