Sultan khan
|
4338da513d
|
Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6
# Conflicts:
# lib/config/config.dart
# lib/core/model/labs/patient_lab_orders.dart
# lib/core/model/labs/request_patient_lab_special_result.dart
# lib/core/model/labs/request_send_lab_report_email.dart
# lib/core/model/radiology/final_radiology.dart
# lib/core/model/radiology/request_send_rad_report_email.dart
# lib/core/model/rate/appoitment_rated.dart
# lib/core/service/client/base_app_client.dart
# lib/core/service/medical/labs_service.dart
# lib/core/service/medical/radiology_service.dart
# lib/core/viewModels/medical/labs_view_model.dart
# lib/core/viewModels/medical/radiology_view_model.dart
# lib/models/Authentication/check_activation_code_request.dart
# lib/models/FamilyFiles/GetAllSharedRecordsByStatusReq.dart
# lib/pages/BookAppointment/BookSuccess.dart
# lib/pages/BookAppointment/QRCode.dart
# lib/pages/DrawerPages/family/my-family.dart
# lib/pages/DrawerPages/notifications/notification_details_page.dart
# lib/pages/MyAppointments/AppointmentDetails.dart
# lib/pages/MyAppointments/MyAppointments.dart
# lib/pages/MyAppointments/widgets/AppointmentActions.dart
# lib/pages/ToDoList/ToDo.dart
# lib/pages/landing/landing_page.dart
# lib/pages/livecare/widgets/clinic_list.dart
# lib/pages/login/confirm-login.dart
# lib/pages/login/login.dart
# lib/pages/medical/labs/laboratory_result_page.dart
# lib/pages/medical/radiology/radiology_details_page.dart
# lib/services/authentication/auth_provider.dart
# lib/splashPage.dart
# lib/uitl/push-notification-handler.dart
# lib/widgets/drawer/app_drawer_widget.dart
|
3 years ago |
|
Sultan khan
|
40656a65d8
|
update in progress
|
3 years ago |
|
Zohaib Iqbal Kambrani
|
35b129fb68
|
migrated project to latest flutter sdk
|
4 years ago |
Fatimah Alshammari
|
ff7146e259
|
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Fatima-New-Design
# Conflicts:
# lib/pages/pharmacies/screens/product-details/footor/footer-widget.dart
# lib/pages/pharmacy/pharmacyContacts.dart
|
5 years ago |
|
Fatimah Alshammari
|
de86cffb8c
|
fix lakum issues
|
5 years ago |
haroon amjad
|
a60e878fef
|
Updates & fixes
|
5 years ago |
hussam al-habibeh
|
cf556c66b0
|
add quantity filed fixed
|
5 years ago |
Elham Rababh
|
f623828d78
|
fix arabic language
|
5 years ago |
|
Elham Rababh
|
8f044a635a
|
fix footer design
|
5 years ago |
|
Elham Rababh
|
d6eeb02c91
|
fix on design
|
5 years ago |
|
Elham Rababh
|
c6be53d800
|
first step from product details
|
5 years ago |
|
Elham Rababh
|
a71e7e4075
|
first step from product details
|
5 years ago |
|
Fatimah Alshammari
|
a858d8764a
|
fixed issues
|
5 years ago |
|
haroon amjad
|
a646677fae
|
Pharmacy & smart watch data fixes
|
5 years ago |
|
Elham Rababh
|
65aac99806
|
fix Availabilty part
|
5 years ago |
|
haroon amjad
|
6ffa07392c
|
Product detail page updates
|
5 years ago |
|
haroon amjad
|
be771917f0
|
pharmacy fixes
|
5 years ago |
|
Fatimah Alshammari
|
28678633e7
|
Merge branch 'development_new_design_2.0' into Fatima-New-Design
# Conflicts:
# lib/pages/pharmacies/product-brands.dart
# lib/pages/pharmacies/screens/lakum-main-page.dart
|
5 years ago |
|
haroon amjad
|
f029aaa1c6
|
Fixes & code optimizations
|
5 years ago |
|
Fatimah Alshammari
|
044f74865e
|
fixed issues
|
5 years ago |
|
Fatimah Alshammari
|
e6378b7ada
|
fix issues
|
5 years ago |
|
Elham Rababh
|
2c30b5a494
|
fix issues
|
5 years ago |
|
haroon amjad
|
3dc82a0547
|
Pharmacy updates
|
5 years ago |
|
Fatimah Alshammari
|
a4f404386b
|
fixed issues
|
5 years ago |
|
hussam al-habibeh
|
75ef3fde80
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy_fix
Conflicts:
lib/widgets/pharmacy/bottom_nav_pharmacy_item.dart
|
5 years ago |
|
hussam al-habibeh
|
66acda38a3
|
add to cart fix
|
5 years ago |
|
Elham Rababh
|
75fdadafbd
|
refactor widget in the cart preview
|
5 years ago |
|
Elham Rababh
|
8fac62bcb1
|
fix bottom sheet functions
|
5 years ago |
|
Elham Rababh
|
7de8c2588f
|
fix coloring issue
|
5 years ago |
|
Elham Rababh
|
2981eb3236
|
fix public card issues
|
5 years ago |
|
Elham Rababh
|
3b79d0ac41
|
return the disable colors
|
5 years ago |
|
Elham Rababh
|
47e19c4ab5
|
add loader and cache on images
|
5 years ago |
|
Elham Rababh
|
a5751f0d70
|
handel un login cases
|
5 years ago |
|
Elham Rababh
|
7c15bca746
|
fix item
|
5 years ago |
|
Elham Rababh
|
e20e90c20c
|
fix quantity_box
|
5 years ago |