Commit Graph

19 Commits (12ec392fc28270d7a75768e3643c4ecc8b1827d1)

Author SHA1 Message Date
tahaalam cd15cf1a39 Merge remote-tracking branch 'origin/master' into live_activities
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/generated/locale_keys.g.dart
#	lib/presentation/home/landing_page.dart
#	lib/presentation/home/widgets/small_service_card.dart
#	lib/splashPage.dart
#	pubspec.yaml
2 weeks ago
tahaalam 51fe8066a8 Wd:design updated for the live activity 2 weeks ago
tahaalam cacc0264bc live activity notification 3 weeks 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
1 month ago
haroon amjad 02930a901e Indoor navigation implementation & Landing page swiper card updates 1 month ago
haroon amjad 685eec6a52 updates & fixes 1 month ago
tahaalam 699ef2f672 Merge remote-tracking branch 'origin/ambulance_service' into ambulance_service
# Conflicts:
#	android/settings.gradle.kts
1 month ago
tahaalam 85f9609cbb Merge remote-tracking branch 'origin/master' into ambulance_service
# Conflicts:
#	android/app/libs/PenNavUI.aar
#	android/app/libs/Penguin.aar
#	android/app/libs/PenguinRenderer.aar
#	android/app/src/main/kotlin/com/ejada/hmg/MainActivity.kt
#	android/app/src/main/res/values/strings.xml
#	android/build/reports/problems/problems-report.html
#	ios/Runner/AppDelegate.swift
1 month ago
tahaalam 48dfddada9 live activites android and ios added. 1 month ago
haroon amjad 575a534f5e PenguinIn fixes 2 months ago
haroon amjad d202aa8423 Smartwatch integration started 2 months ago
haroon amjad 3699163579 PenguinIn SDK changes 2 months ago
haroon amjad 5c0d3144d6 iOS App Icons Added 2 months ago
tahaalam 31261092a8 rrt request creation and history listing 3 months ago
haroon amjad 2b6ee56d71 PenguinIn iOS implementation 3 months ago
tahaalam 1f852f63cf penguin sdk added 3 months ago
tahaalam 5b0a8ad898 cancel and listing request added 3 months ago
Sikander Saleem d464721733 merge conflict fixed. 5 months ago
aamir-csol 59054df238 android / ios folder push 6 months ago