Commit Graph

17 Commits (f9b8191a5ee480c681e58eeaf576dff683d8bc3e)

Author SHA1 Message Date
Mohammad Aljammal 8899bdf460 Done Prescription Delivery Address 4 years ago
Mohammad Aljammal d477481856 fix security issues in pharmacy 4 years ago
Mohammad Aljammal db2376f50c fix blood and weight on my trackers 4 years ago
Zohaib Iqbal Kambrani 9a5daed5c3 Merge branch 'development' into ZohaibIqbalKambrani
* development:
  re-design child vaccine and fix some funcrionalities
  Fix ER service
  first step from fix CMC
  fix issue on cmc
  return CMC HHC
  Nearest Er fix design
  solving NearestEr design problem
  simple fix
  hot fixing
  fix design issues

# Conflicts:
#	lib/config/localized_values.dart
4 years ago
Mohammad Aljammal 200334d8f8 Fix ER service 4 years ago
Elham Rababah d7a046f9ca fix issue on cmc 4 years ago
Zohaib Iqbal Kambrani dc83b476d6 Merge branch 'development' into ZohaibIqbalKambrani
# Conflicts:
#	android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/utils/HMGUtils.kt
#	ios/Flutter/.last_build_id
#	lib/pages/landing/landing_page.dart
#	lib/pages/medical/medical_profile_page.dart
#	lib/widgets/drawer/app_drawer_widget.dart
4 years ago
Mohammad Aljammal f77d2b497e fix issues 4 years ago
Zohaib Kambrani d8bd7d145d no message 4 years ago
Zohaib Kambrani 0f64c45e67 no message 4 years ago
Zohaib Kambrani 1dc9400ffc Geofencing work in progress on android 4 years ago
Zohaib Kambrani 27182ee8db no message 4 years ago
Zohaib Kambrani 69d1e4bb0b no message 4 years ago
Zohaib Kambrani 0c71fbad5f no message 4 years ago
jammal 0fceca8f3e fix ios issues 4 years ago
haroon amjad 7d0efda1c4 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
# Conflicts:
#	android/app/src/main/AndroidManifest.xml
#	lib/config/localized_values.dart
#	lib/core/service/client/base_app_client.dart
#	lib/pages/landing/landing_page.dart
#	lib/pages/login/confirm-login.dart
#	lib/pages/medical/medical_profile_page.dart
#	lib/services/authentication/auth_provider.dart
#	lib/uitl/translations_delegate_base.dart
#	pubspec.yaml
4 years ago
haroon amjad d8fe501341 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
# Conflicts:
#	lib/config/config.dart
#	lib/pages/BookAppointment/BookingOptions.dart
#	lib/services/appointment_services/GetDoctorsList.dart
#	lib/uitl/translations_delegate_base.dart
#	lib/widgets/others/app_scaffold_widget.dart
4 years ago