Elham Rababah
aab33b3e03
PAP-609: fix text align
5 years ago
Elham Rababah
6e7f62ca21
PAP-612: show ok and cancel options
5 years ago
Zohaib Iqbal Kambrani
b91ce441e2
Merge branch 'development' into ZohaibIqbalKambrani
...
# Conflicts: Resolved
# lib/core/model/pharmacies/order_model.dart
# lib/core/service/client/base_app_client.dart
# lib/main.dart
# lib/pages/landing/home_page.dart
# lib/pages/pharmacy/order/OrderDetails.dart
# lib/pages/pharmacy/order/TrackDriver.dart
# lib/routes.dart
# lib/uitl/translations_delegate_base.dart
# lib/uitl/utils.dart
# lib/widgets/in_app_browser/InAppBrowser.dart
# lib/widgets/others/app_scaffold_widget.dart
# pubspec.yaml
5 years ago
Zohaib Iqbal Kambrani
f410ce20ca
Packages and Offers in Progress
5 years ago
Mohammad Aljammal
8899bdf460
Done Prescription Delivery Address
5 years ago
Mohammad Aljammal
d477481856
fix security issues in pharmacy
5 years ago
Mohammad Aljammal
db2376f50c
fix blood and weight on my trackers
5 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
5 years ago
Mohammad Aljammal
200334d8f8
Fix ER service
5 years ago
Elham Rababah
d7a046f9ca
fix issue on cmc
5 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
5 years ago
Mohammad Aljammal
f77d2b497e
fix issues
5 years ago
Zohaib Kambrani
d8bd7d145d
no message
5 years ago
Zohaib Kambrani
0f64c45e67
no message
5 years ago
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
6 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
6 years ago