Commit Graph

22 Commits (a25df34f422b07f2430ff464f4cfbe692dddb4b1)

Author SHA1 Message Date
tahaalam 3f9046f1e4 Merge remote-tracking branch 'origin/master' into watch_integration
# Conflicts:
#	android/app/src/main/AndroidManifest.xml
#	android/app/src/main/kotlin/com/ejada/hmg/MainActivity.kt
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	ios/Runner.xcodeproj/project.pbxproj
#	lib/core/api_consts.dart
#	lib/generated/locale_keys.g.dart
1 month ago
haroon amjad ec506869cc Android package name updated to new package details 1 month ago
haroon amjad 5015747580 LiveCare changes 1 month ago
tahaalam 02398d3bb4 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	ios/Runner.xcodeproj/project.pbxproj
#	lib/generated/locale_keys.g.dart
#	lib/theme/colors.dart
1 month ago
tahaalam d137e1166d watch integration ui added. 1 month ago
haroon amjad 000c403f6b confirm button added 2 months ago
haroon amjad f09d478a03 iOS BundleID changes 2 months ago
haroon amjad 2ab3e178a2 Indoor navigation implemented 2 months ago
haroon amjad 02930a901e Indoor navigation implementation & Landing page swiper card updates 3 months ago
haroon amjad 685eec6a52 updates & fixes 3 months ago
tahaalam 699ef2f672 Merge remote-tracking branch 'origin/ambulance_service' into ambulance_service
# Conflicts:
#	android/settings.gradle.kts
3 months 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
3 months ago
haroon amjad 575a534f5e PenguinIn fixes 3 months ago
haroon amjad d202aa8423 Smartwatch integration started 3 months ago
haroon amjad 3699163579 PenguinIn SDK changes 4 months ago
haroon amjad 5c0d3144d6 iOS App Icons Added 4 months ago
tahaalam 31261092a8 rrt request creation and history listing 4 months ago
haroon amjad 2b6ee56d71 PenguinIn iOS implementation 4 months ago
tahaalam 1f852f63cf penguin sdk added 4 months ago
tahaalam 5b0a8ad898 cancel and listing request added 4 months ago
Sikander Saleem d464721733 merge conflict fixed. 7 months ago
aamir-csol 59054df238 android / ios folder push 7 months ago