34 Commits (dev_3.13.6_CR6750)

Author	SHA1	Message	Date
haroon amjad	5b7b40c732	Updates & fixes	1 year 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
Aamir Muhammad	b4bc99369f	Changes into Rating Bar	2 years ago
Sultan khan	0c534cffae	code update in progress	2 years ago
Sultan khan	40656a65d8	update in progress	2 years ago
Zohaib Iqbal Kambrani	35b129fb68	migrated project to latest flutter sdk	3 years ago
Zohaib Iqbal Kambrani	612d9eb019	Project Filter Applied on Packages & Offers	3 years ago
Zohaib Iqbal Kambrani	94a99a911e	Offer And Packages (View Only)	3 years ago
Zohaib Iqbal	259e27d4a7	Merge branch 'development_v2.5' into 'zik_new_design_flutter_v2.5' ... # Conflicts: # lib/pages/landing/fragments/home_page_fragment2.dart # lib/uitl/app_shared_preferences.dart # lib/widgets/in_app_browser/InAppBrowser.dart	4 years ago
Zohaib Iqbal Kambrani	ab8b62bc3a	Packages and offers fixes, HMG Internet work in progress,	4 years ago
haroon amjad	40d649dfa4	Updates & fixes	4 years ago
Sikander Saleem	9ba7b3b44b	Merge branch 'development_new_design_2.0' into development_v2.5 ... # Conflicts: # lib/pages/BookAppointment/BookConfirm.dart # lib/pages/medical/smart_watch_health_data/syncHealthData.dart # lib/pages/vaccine/my_vaccines_screen.dart # lib/widgets/in_app_browser/InAppBrowser.dart # pubspec.yaml	4 years ago
haroon amjad	207525e31a	Fixes	4 years ago
Sikander Saleem	e3bf988df5	map picker, firebase improvement and changes for v2.5	4 years ago
haroon amjad	2274c6affe	Merge branch 'zik_new_design_2.0' into 'development_new_design_2.0' ... Zik new design 2.0 See merge request Cloud_Solution/diplomatic-quarter!531	4 years ago
Sikander Saleem	7df0fc59df	laser images change & offer and packages	4 years ago
Zohaib Iqbal Kambrani	b596b1b61d	WebRTC and Packages Offer | Merge	4 years ago
haroon amjad	90b821a37d	Offers & packages UI completed	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	9fd2304d33	tamara.	4 years ago
Zohaib Iqbal Kambrani	f3462dfc19	Applied cost from api at cart	4 years ago
Zohaib Iqbal Kambrani	8b1ac05012	Merge branch 'development_new_design_2.0' into zik_new_design_2.0 ... * development_new_design_2.0: (105 commits) app bar back icon issue improvements emergency nearest ui changes Zoom Avatar implementation no message Child Vaccine 3 register register page Working on Health data Child Vaccine 2 registration Ereferral fixed, HHC moved to new APIs, Notification new design implemented registration done Child Vaccine 1.0 In App Review In App Review oder log merge fix design fixes 3 Chart fix & In-App update implemented design fixes 1.1 ... # Conflicts: # lib/config/config.dart # lib/pages/landing/fragments/home_page_fragment2.dart	4 years ago
Zohaib Iqbal Kambrani	aad071ac67	Packages and Offers apply token	4 years ago
Mirza.Shafique	a273bacc17	design fixes 1.1	4 years ago
Sikander Saleem	706832a1cb	Merge branch 'development' into development_new_design_2.0 ... # Conflicts: # lib/config/config.dart # lib/config/localized_values.dart # lib/core/service/client/base_app_client.dart # lib/core/service/parmacyModule/parmacy_module_service.dart # lib/core/service/parmacyModule/prescription_service.dart # lib/core/viewModels/pharmacyModule/pharmacy_module_view_model.dart # lib/core/viewModels/pharmacyModule/product_detail_view_model.dart # lib/locator.dart # lib/main.dart # lib/pages/final_products_page.dart # lib/pages/landing/home_page.dart # lib/pages/parent_categorise_page.dart # lib/pages/pharmacies/product_detail.dart # lib/pages/pharmacies/screens/cart-order-preview.dart # lib/pages/pharmacies/screens/pharmacy_module_page.dart # lib/pages/pharmacies/widgets/ProductTileItem.dart # lib/pages/search_products_page.dart # lib/services/pharmacy_services/product_detail_service.dart # lib/uitl/translations_delegate_base.dart # lib/widgets/buttons/secondary_button.dart # lib/widgets/others/app_scaffold_widget.dart # lib/widgets/others/app_scafold_detail_page.dart # lib/widgets/pharmacy/bottom_nav_pharmacy_bar.dart	4 years ago
Mohammad Aljammal	9e31d497ed	fix wish list issue	4 years ago
haroon amjad	7467da7409	Imports organized	4 years ago
hussam al-habibeh	14939d3513	jira bugs (Health Calculator)	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	6f2c947687	Packages And offers..	5 years ago
Zohaib Iqbal Kambrani	f410ce20ca	Packages and Offers in Progress	5 years ago