Commit Graph

17 Commits (e64d1088a6a8fc88872fe2a3b4d77413f7339fff)

Author SHA1 Message Date
haroon amjad e748712954 Initial Commit 6 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 40656a65d8 update in progress 2 years ago
Zohaib Iqbal Kambrani 612d9eb019 Project Filter Applied on Packages & Offers 4 years ago
Zohaib Iqbal Kambrani 94a99a911e Offer And Packages (View Only) 4 years ago
Zohaib Iqbal Kambrani ab8b62bc3a Packages and offers fixes, HMG Internet work in progress, 4 years ago
Sikander Saleem e3bf988df5 map picker, firebase improvement and changes for v2.5 4 years ago
Sikander Saleem 7df0fc59df laser images change & offer and packages 4 years ago
haroon amjad 502c7fd3de Offers & discounts UI updating 4 years ago
Haroon Amjad d5c68c5032 Packages & offers design 4 years ago
haroon amjad 8d6278a59b Pharmacy fixes 4 years ago
Zohaib Iqbal Kambrani 9d71793e88 no message 4 years ago
Zohaib Iqbal Kambrani aad071ac67 Packages and Offers apply token 4 years ago
haroon amjad 7467da7409 Imports organized 4 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 6f2c947687 Packages And offers.. 5 years ago
Zohaib Iqbal Kambrani f410ce20ca Packages and Offers in Progress 5 years ago