Commit Graph

7 Commits (1dc9400ffcda5dd3781dbace8341d4ea9208488b)

Author SHA1 Message Date
Zohaib Kambrani 1dc9400ffc Geofencing work in progress on android 5 years ago
Zohaib Kambrani 27182ee8db no message 5 years ago
Zohaib Kambrani 69d1e4bb0b no message 5 years ago
Zohaib Kambrani 0c71fbad5f no message 5 years ago
jammal 0fceca8f3e fix ios issues 5 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
5 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
5 years ago