haroon amjad
|
e748712954
|
Initial Commit
|
5 months ago |
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
|
2 years ago |
Sultan khan
|
c96c151f44
|
null safety issue fixed.
|
2 years ago |
Sultan khan
|
b45cbbcf29
|
updates
|
2 years ago |
haroon amjad
|
a646677fae
|
Pharmacy & smart watch data fixes
|
4 years ago |
haroon amjad
|
5943522163
|
UI fixes
|
4 years ago |
Fatimah Alshammari
|
e494c9304d
|
fixed issues
|
4 years ago |
hussam al-habibeh
|
a8fb7152b1
|
add to cart fix
|
4 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
|
4 years ago |
hussam al-habibeh
|
66acda38a3
|
add to cart fix
|
4 years ago |
mosazaid
|
b779c250a4
|
pharmacy cart and wishlist fixes
|
4 years ago |
Mohammad Aljammal
|
eb19daa98f
|
fix car count
|
4 years ago |
hussam al-habibeh
|
d4fd95606e
|
add pharmacy icons for bottom nav
|
4 years ago |
Mohammad Aljammal
|
43e7bb9ff3
|
fix bottom navigation bar
|
4 years ago |
hussam al-habibeh
|
7427cd68ff
|
fix bottom nav bar ui
|
4 years ago |
Sultan Khan
|
b891c1bd80
|
theme issue
|
5 years ago |
Sultan Khan
|
c65983bfdb
|
code merged
|
5 years ago |
Mohammad Aljammal
|
77dcb918c3
|
Revert "Merge branch 'pharmacy-hussam' into 'master'"
This reverts merge request !149
|
5 years ago |
hussam al-habibeh
|
f7cee8f484
|
pharmacy module app && category home page
|
5 years ago |