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

Pluggable Chat & Video #889

Open
wants to merge 66 commits into
base: development_master
Choose a base branch
from

Conversation

mithunvaghela
Copy link
Collaborator

Pluggable module chat and video merge pull request

prajwalmw and others added 30 commits September 26, 2024 19:37
Created Dao interfaces for pre-existing Entities
…e_webrtc

Development master pluggable webrtc
…dit removed, added maharashtra as default state
prajwalmw and others added 30 commits October 14, 2024 13:01
…opment_pluggable_webrtc

# Conflicts:
#	data/src/main/java/org/intelehealth/coreroomdb/entity/Person.kt
…le_webrtc' into development_master

# Conflicts:
#	app/build.gradle
#	app/src/main/java/org/intelehealth/app/activities/loginActivity/LoginActivityNew.java
#	app/src/main/java/org/intelehealth/app/activities/patientDetailActivity/PatientDetailActivity2.java
#	app/src/main/java/org/intelehealth/app/activities/setupActivity/SetupActivityNew.java
#	app/src/main/java/org/intelehealth/app/networkApiCalls/ApiInterface.java
#	app/src/main/java/org/intelehealth/app/ui/splash/activity/SplashActivity.kt
#	app/src/main/java/org/intelehealth/app/utilities/NetworkUtils.java
#	app/src/main/java/org/intelehealth/app/utilities/SessionManager.java
#	features/ondemand/klivekit/src/main/AndroidManifest.xml
#	features/ondemand/klivekit/src/main/java/org/intelehealth/klivekit/call/utils/CallHandlerUtils.kt
#	features/ondemand/video/src/main/java/org/intelehealth/app/feature/video/utils/CallHandlerUtils.kt
#	settings.gradle
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.

4 participants