Commit Graph

10 Commits (02cd542bd9806b1ee9c9bbb60a6c19d76a65298b)

Author SHA1 Message Date
tahaalam b00a37cabb Merge remote-tracking branch 'origin/master' into live_activities
# Conflicts:
#	android/app/build.gradle.kts
#	android/app/proguard-rules.pro
#	android/app/src/main/AndroidManifest.xml
#	android/app/src/main/kotlin/com/cloudsolutions/HMGPatientApp/MainActivity.kt
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	ios/Runner.xcodeproj/project.pbxproj
#	ios/Runner/AppDelegate.swift
#	lib/core/cache_consts.dart
#	lib/core/utils/calender_utils_new.dart
#	lib/core/utils/push_notification_handler.dart
#	lib/presentation/appointments/appointment_details_page.dart
#	pubspec.yaml
4 months ago
Sultan khan 5f559a44dd profile image upload 7 months ago
haroon amjad 6a4793f122 Updates 7 months ago
haroon amjad d053f58b7d Updates 7 months ago
haroon amjad f09d478a03 iOS BundleID changes 9 months ago
tahaalam 51fe8066a8 Wd:design updated for the live activity 9 months ago
tahaalam e87fdafd62 Merge remote-tracking branch 'origin/master' into live_activities
# Conflicts:
#	android/app/src/main/kotlin/com/ejada/hmg/MainActivity.kt
#	android/app/src/main/res/values/mapbox_access_token.xml
#	android/build/reports/problems/problems-report.html
#	android/settings.gradle.kts
#	ios/Runner.xcodeproj/project.pbxproj
#	lib/core/utils/calender_utils_new.dart
#	lib/core/utils/push_notification_handler.dart
#	lib/presentation/home/widgets/small_service_card.dart
#	lib/presentation/tele_consultation/zoom/call_screen.dart
#	lib/routes/app_routes.dart
#	lib/splashPage.dart
#	pubspec.lock
10 months ago
tahaalam 48dfddada9 live activites android and ios added. 10 months ago
haroon amjad d202aa8423 Smartwatch integration started 11 months ago
aamir-csol 59054df238 android / ios folder push 1 year ago