608 Commits (dev_v3.13.6)

Author	SHA1	Message	Date
haroon amjad	68294690a1	prescription reminders added	4 years ago
Sikander Saleem	00f63cd288	Merge branch 'development_new_design_2.0' into new_design_sikander ... # Conflicts: # lib/pages/DrawerPages/notifications/notification_details_page.dart # lib/uitl/translations_delegate_base.dart	4 years ago
Sikander Saleem	9a82b9c369	laser clinic added.	4 years ago
Fatimah Alshammari	adfa707eda	fix issue	4 years ago
haroon amjad	a74a6d5bc8	Merge branch 'mirza_home_page' into 'development_new_design_2.0' ... Mirza home page See merge request Cloud_Solution/diplomatic-quarter!499	4 years ago
devmirza121	6575456d3b	Merge branch 'development_new_design_2.0' into mirza_home_page ... # Conflicts: # lib/uitl/translations_delegate_base.dart	4 years ago
devmirza121	dc3d3bc772	Health Calculator 5.0	4 years ago
Fatimah Alshammari	c4e185ea60	fixed issues	4 years ago
haroon amjad	338c646a43	updates	4 years ago
devmirza121	590b795356	Health Calculator 4.0 marge	4 years ago
devmirza121	a131f24952	Merge branch 'development_new_design_2.0' into mirza_home_page ... # Conflicts: # lib/config/localized_values.dart # lib/pages/AlHabibMedicalService/health_calculator/bmr_calculator/bmr_calculator.dart # lib/pages/AlHabibMedicalService/health_calculator/bmr_calculator/bmr_result_page.dart # lib/pages/AlHabibMedicalService/health_calculator/body_fat/body_fat.dart # lib/pages/AlHabibMedicalService/health_calculator/calorie_calculator/calorie_calculator.dart # lib/pages/AlHabibMedicalService/health_calculator/calorie_calculator/calorie_result_page.dart # lib/pages/AlHabibMedicalService/health_calculator/ideal_body/ideal_body.dart # lib/uitl/translations_delegate_base.dart	4 years ago
devmirza121	1d1708bdcc	Health Calculator 4.0	4 years ago
haroon amjad	75989bdc01	Health Calculators translations	4 years ago
haroon amjad	ea745f1b9f	Merge branch 'development_new_design_2.0' into haroon-new-design ... # Conflicts: # lib/config/localized_values.dart # lib/uitl/translations_delegate_base.dart	4 years ago
haroon amjad	efe8dea9a9	Merge branch 'Fatima-New-Design' into 'development_new_design_2.0' ... Fatima new design See merge request Cloud_Solution/diplomatic-quarter!489	4 years ago
haroon amjad	502c7fd3de	Offers & discounts UI updating	4 years ago
devmirza121	6225f2468d	Health Calculator 3.0	4 years ago
Fatimah Alshammari	ca11fe3134	fix issues	4 years ago
haroon amjad	894cc0e336	Updates & fixes	4 years ago
haroon amjad	be771917f0	pharmacy fixes	4 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	4 years ago
Fatimah Alshammari	78fc77159c	fix lakum issues	4 years ago
haroon amjad	8c99bba17b	Merge branch 'development_new_design_2.0' into haroon-new-design	4 years ago
haroon amjad	f029aaa1c6	Fixes & code optimizations	4 years ago
Mohammad Aljammal	f9e33e7212	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!467	4 years ago
Fatimah Alshammari	044f74865e	fixed issues	4 years ago
Fatimah Alshammari	42e74759e4	Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Fatima-New-Design ... # Conflicts: # lib/pages/search_products_page.dart	4 years ago
Fatimah Alshammari	e6378b7ada	fix issues	4 years ago
Zohaib Iqbal Kambrani	94a5cac27d	Merge branch 'development_new_design_2.0' into zik_new_design_2.0 ... * development_new_design_2.0: LiveCare Schedule fixes improvements. live care design 3.0 dialog ui changes in wallet & improvements. LiveCare Schedule API fix live care design 2.0 Health converters UI done Health Calculators APIs updated Translation updates SessionID update live care design 1.0 Updates & fixes blood sugar dialog improvement. # Conflicts: Rseloved # lib/config/localized_values.dart # lib/core/service/client/base_app_client.dart # lib/uitl/translations_delegate_base.dart	4 years ago
Zohaib Iqbal Kambrani	9d71793e88	no message	4 years ago
Sikander Saleem	8c27773f7f	Merge branch 'new_design_sikander' into development_new_design_2.0	4 years ago
Sikander Saleem	40c63ae53b	dialog ui changes in wallet & improvements.	4 years ago
haroon amjad	2a212149ed	Health converters UI done	4 years ago
haroon amjad	73822300f9	Health Calculators APIs updated	4 years ago
haroon amjad	7123ed34ab	Translation updates	4 years ago
haroon amjad	6f92a093ab	Merge branch 'development_new_design_2.0' into haroon-new-design ... # Conflicts: # lib/config/config.dart	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
haroon amjad	30c6f1dedb	Updates	4 years ago
haroon amjad	1fff2dad25	Smartwatch updates	4 years ago
Zohaib Iqbal Kambrani	aad071ac67	Packages and Offers apply token	4 years ago
haroon amjad	1f077f71f8	no message	4 years ago
haroon amjad	5287260b85	Merge branch 'development_new_design_2.0' into haroon-new-design ... # Conflicts: # lib/config/localized_values.dart	4 years ago
Sultan Khan	c14f40dae2	register page	4 years ago
haroon amjad	983fb55747	Merge branch 'development_new_design_2.0' into haroon-new-design ... # Conflicts: # lib/uitl/translations_delegate_base.dart	4 years ago
haroon amjad	2032053cb7	Working on Health data	4 years ago
haroon amjad	3db4094585	Ereferral fixed, HHC moved to new APIs, Notification new design implemented	4 years ago
Sultan Khan	a59c60f79a	Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design	4 years ago
Sultan Khan	496c6ce32e	registration done	4 years ago
haroon amjad	1dcfe44e96	Translations	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
haroon amjad	5d44fff28d	Merge branch 'development_new_design_2.0' into haroon-new-design ... # Conflicts: # lib/config/localized_values.dart # lib/uitl/translations_delegate_base.dart	4 years ago
haroon amjad	5f963b0327	Translation updates, CMC, HHC & RRT APIs updates	4 years ago
Mirza.Shafique	ab6f7b8915	Merge branch 'mirza_home_page' into development_new_design_2.0 ... # Conflicts: # lib/config/localized_values.dart	4 years ago
Mirza.Shafique	eeaf7d9d2f	HMG Services Detail View	4 years ago
Sikander Saleem	f13871de9a	find us and prescription availability hospital location ui changes,	4 years ago
haroon amjad	90843252c3	Merge branch 'development_new_design_2.0' into haroon-new-design ... # Conflicts: # lib/config/localized_values.dart # lib/pages/AlHabibMedicalService/E-Referral/New_E_Referral/new_e_referral_step_two_page.dart # lib/pages/AlHabibMedicalService/E-Referral/search_for_referrals_page.dart # lib/uitl/translations_delegate_base.dart	4 years ago
Fatimah Alshammari	9cf0794cf6	Fixed out of stuck items issues	4 years ago
haroon amjad	6d3ead24e1	localisation update	4 years ago
Mirza.Shafique	e1b79ef5c1	E-Refreal design	4 years ago
haroon amjad	e564cdc7e5	Updates & fixes	4 years ago
Sikander Saleem	ae85f75e81	Merge branch 'new_design_sikander' into development_new_design_2.0 ... # Conflicts: # lib/config/localized_values.dart # lib/pages/feedback/status_feedback_page.dart # lib/uitl/translations_delegate_base.dart	4 years ago
Sikander Saleem	a026fbf940	feedback status added.	4 years ago
Sikander Saleem	8f371f87d2	Merge branch 'mirza_home_page' into development_new_design_2.0 ... # Conflicts: # lib/config/localized_values.dart # lib/uitl/translations_delegate_base.dart	4 years ago
Mirza.Shafique	dde16a13fe	General page in profile	4 years ago
haroon amjad	b475adb5c3	Updates & fixes	4 years ago
Mirza.Shafique	d664a216c6	Profile Page and Back Button Click	4 years ago
haroon amjad	a819660536	Merge branch 'development_new_design_2.0' into haroon-new-design ... # Conflicts: # lib/config/localized_values.dart	4 years ago
haroon amjad	01ccd484f4	Calendar plugin changed	4 years ago
Sikander Saleem	08960867f7	Merge branch 'new_design_sikander' into development_new_design_2.0	4 years ago
Sikander Saleem	55df00dcd4	h20 today ui (cont.)	4 years ago
Sikander Saleem	763c16ddd0	h2o setting ui redesigned.	4 years ago
haroon amjad	829fcd1461	Merge branch 'development_new_design_2.0' into haroon-new-design ... # Conflicts: # lib/pages/ErService/rapid-response-team/rrt-order-list-item.dart	4 years ago
Sultan Khan	821a9b5ade	Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design	4 years ago
Sultan Khan	2c1d7c511e	family file changes	4 years ago
haroon amjad	230d87c473	Merge branch 'development_new_design_2.0' into haroon-new-design ... # Conflicts: # lib/pages/feedback/send_feedback_page.dart	4 years ago
Sikander Saleem	8b49eed6ae	hospital text replaced with branch	4 years ago
Elham Rababh	3dc28d318a	fix bugs on wish list	4 years ago
haroon amjad	2690bddcac	Merge branch 'development_new_design_2.0' into haroon-new-design ... # Conflicts: # lib/pages/MyAppointments/AppointmentDetails.dart # lib/uitl/translations_delegate_base.dart	4 years ago
haroon amjad	5163c826ad	Updates & fixes	4 years ago
Sikander Saleem	6099738a5c	improvements	4 years ago
Haroon Amjad	19edcc210e	Rate appointment UI implemented	4 years ago
haroon amjad	89e1aa70c0	updates	4 years ago
Haroon Amjad	062ca5c11c	EReferral fixes	4 years ago
Haroon Amjad	abcb71e86e	Invoice details UI revamped	4 years ago
hussam al-habibeh	dbf7ebf287	fix most viewed & best sellers moduls	4 years ago
haroon amjad	0955a22616	Merge branch 'development_new_design_2.0' into haroon-new-design	4 years ago
haroon amjad	fa8c739b2c	updates & fixes	4 years ago
haroon amjad	46d800c0c6	UI updates & fixes	4 years ago
Mirza.Shafique	ef8006efd8	Merge branch 'mirza_home_page' into development_new_design_2.0 ... # Conflicts: # lib/pages/Covid-DriveThru/Covid-TimeSlots.dart # lib/pages/Covid-DriveThru/covid-dirvethru-questions.dart # lib/pages/Covid-DriveThru/covid-payment-alert.dart # lib/pages/Covid-DriveThru/covid-payment-details.dart # lib/pages/Covid-DriveThru/covid-payment-summary.dart	4 years ago
Mirza.Shafique	5b330b2a25	Covid New Design	4 years ago
haroon amjad	5c64ce4795	Merge branch 'development_new_design_2.0' into haroon-new-design ... # Conflicts: # lib/config/localized_values.dart # lib/pages/BookAppointment/DoctorProfile.dart # lib/pages/MyAppointments/SchedulePage.dart # lib/uitl/translations_delegate_base.dart	4 years ago
Sultan Khan	c54146b3ba	sechedule fix	4 years ago
haroon amjad	a075d53dd5	UI updates & fixes	4 years ago
haroon amjad	728c22cc68	Merge branch 'development_new_design_2.0' into haroon-new-design ... # Conflicts: # lib/config/localized_values.dart # lib/pages/insurance/insurance_approval_screen.dart # lib/uitl/translations_delegate_base.dart	4 years ago
Sikander Saleem	e37781c3a6	insurance approval screen and detail screen ui changes.	4 years ago
haroon amjad	92bfe27a6e	updates & fixes	4 years ago
haroon amjad	b51989e798	Merge branch 'development_new_design_2.0' into haroon-new-design ... # Conflicts: # lib/pages/pharmacies/compare.dart # lib/pages/pharmacies/my_reviews.dart # lib/pages/pharmacies/wishlist.dart	4 years ago
Sikander Saleem	f0bb94c422	Merge branch 'development' into development_new_design_2.0 ... # Conflicts: # lib/config/localized_values.dart # lib/uitl/translations_delegate_base.dart	4 years ago
haroon amjad	e5a636b704	Covid Test changes	4 years ago
Fatimah Alshammari	bcfbca98a1	fixed arabic version	4 years ago
Fatimah Alshammari	8c0dca781c	fixed compare issues and arabic version	4 years ago
haroon amjad	0fe4a21388	updates & fixes	4 years ago
haroon amjad	2d7c7239c5	Health Converters fixes	4 years ago
haroon amjad	f795ba24c5	updates & fixes	4 years ago
Mirza.Shafique	b3f3558eac	CMC 1.2	4 years ago
Mirza.Shafique	82a1d410db	Merge branch 'development_new_design_2.0' into mirza_home_page ... # Conflicts: # lib/pages/landing/widgets/logged_slider_view.dart # lib/uitl/translations_delegate_base.dart	4 years ago
Sultan Khan	2019e804f0	Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_new_design_2.0	4 years ago
Mirza.Shafique	831780555c	CMC 1.0	4 years ago
haroon amjad	3bb0a8b85b	Apple Pay finalized, Translation issues fixed, other updates	4 years ago
haroon amjad	25fb5decc0	Ask Doctor page fixes	4 years ago
Sultan Khan	0086875d0d	Design Updated for tracker	4 years ago
Sikander Saleem	d9c1b8b8ea	Merge branch 'development' into development_new_design_2.0 ... # Conflicts: # lib/config/localized_values.dart # lib/main.dart # lib/pages/AlHabibMedicalService/all_habib_medical_service_page.dart # lib/pages/landing/landing_page.dart # lib/pages/medical/ask_doctor/ask_doctor_home_page.dart # lib/pages/medical/eye/EyeMeasurementsPage.dart # lib/uitl/translations_delegate_base.dart # lib/uitl/utils.dart	4 years ago
haroon amjad	4469ae1209	updates & fixes	4 years ago
Sikander Saleem	fab051f9e7	Merge branch 'development' into development_new_design_2.0 ... # Conflicts: # lib/uitl/translations_delegate_base.dart # lib/widgets/others/app_scaffold_widget.dart	4 years ago
Mohammad Aljammal	55f9bbcba4	Merge branch 'fatima-new' into 'development' ... Fatima new See merge request Cloud_Solution/diplomatic-quarter!379	4 years ago
Sikander Saleem	a61fea551c	Merge branch 'development' into development_new_design_2.0 ... # Conflicts: # lib/config/localized_values.dart # lib/pages/ErService/AmbulanceRequestIndexPages/Summary.dart # lib/uitl/translations_delegate_base.dart	4 years ago
Zohaib Iqbal Kambrani	d9672c47a0	Merge branch 'development' into ZohaibIqbalKambrani ... * development: BUG FIXES fix issues PAP-910,PAP-911 fix bugs pharmacy Dental procedures implemented Revert "Merge branch 'foote_in_all_pages' into 'development'" fixed products issues calendar events changes Covid passport CR implemented in Covid test flow doctor schedule Covid certificate passport CR implemented Covid Lab result generate certificate implemented return bottom sheet inside appointments list fix issues related to footer remove unused code remove footer from pharmacy pages first step from add footer for all pages # Conflicts: # lib/config/localized_values.dart # lib/uitl/translations_delegate_base.dart	4 years ago
Fatimah Alshammari	f09cdd944d	Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima-new ... # Conflicts: # lib/uitl/translations_delegate_base.dart	4 years ago
Fatimah Alshammari	827d8733a1	fixed shopping cart issue	4 years ago
Sikander Saleem	402cf5936a	improvement.	4 years ago
Sultan Khan	1726f8cc11	Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp	4 years ago
Sultan Khan	d1fc4751ad	BUG FIXES	4 years ago
Zohaib Iqbal Kambrani	d1c99d1d82	ER Average waiting time label applied	4 years ago
Sikander Saleem	bdb7f29d4c	Merge branch 'development' into development_new_design_2.0 ... # Conflicts: # lib/core/service/parmacyModule/prescription_service.dart # lib/pages/BookAppointment/DentalComplaints.dart # lib/pages/login/login.dart	4 years ago
Mirza.Shafique	089ad0d321	Booking appointment 1.3	4 years ago
haroon amjad	e9c26ee85f	Dental procedures implemented	4 years ago
Sikander Saleem	6191377914	Merge branch 'development' into development_new_design_2.0 ... # Conflicts: # lib/pages/login/login.dart # lib/uitl/translations_delegate_base.dart # lib/widgets/data_display/medical/LabResult/LabResultWidget.dart # lib/widgets/data_display/medical/LabResult/laboratory_result_widget.dart	4 years ago
Mirza.Shafique	ad025f3d8e	Booking appointment 1.2	4 years ago
Mirza.Shafique	d2b2b4063d	Booking appointment 1.1	4 years ago
haroon amjad	72dbdd2c2b	Merge branch 'development' into Haroon	4 years ago
haroon amjad	e96157c74a	Covid certificate passport CR implemented	4 years ago
Zohaib Iqbal Kambrani	d33432d238	Covid Drive-Thru Questions Screen	4 years ago
haroon amjad	73097d15de	Covid Lab result generate certificate implemented	4 years ago
Sikander Saleem	2ba91e54ab	merge-changes	4 years ago
Sikander Saleem	94ff5cff40	Merge branch 'development' into development_new_design_2.0 ... # Conflicts: # lib/config/localized_values.dart # lib/uitl/translations_delegate_base.dart	4 years ago
haroon amjad	5f521556dc	Dental flow fixes	4 years ago
Sikander Saleem	288d64214e	improvements	4 years ago
Sikander Saleem	bb18645d85	Merge branch 'development' into development_new_design_2.0 ... # Conflicts: # lib/config/localized_values.dart # lib/pages/AlHabibMedicalService/ancillary-orders/ancillaryOrdersDetails.dart # lib/pages/MyAppointments/AppointmentDetails.dart # lib/pages/landing/landing_page.dart # lib/pages/medical/medical_profile_page.dart # lib/uitl/translations_delegate_base.dart	4 years ago
Sikander Saleem	5ab9dd1761	Appointment screen Changes & improvements.	4 years ago
Sultan Khan	57d87dfc03	Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp	4 years ago
Sultan Khan	11ffed2ae3	bug fixes	4 years ago
haroon amjad	cbbca5ce86	Merge branch 'development' into Haroon	4 years ago
haroon amjad	0121337d1b	LiveCare Flow from book appointment flow implemented	4 years ago
Sikander Saleem	6c8f1c6185	merge improvement.	4 years ago
Sikander Saleem	197e7d5742	Merge branch 'development' into development_new_design_2.0 ... # Conflicts: # lib/config/localized_values.dart # lib/pages/medical/patient_sick_leave_page.dart # lib/uitl/translations_delegate_base.dart # lib/uitl/utils.dart	4 years ago
Sikander Saleem	b3fd1cb93d	lab result detail flow chart screen & improvement.	4 years ago
Fatimah Alshammari	787b55a803	Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima-new ... # Conflicts: # lib/pages/medical/my_trackers/blood_pressure/AddBloodPressurePage.dart # lib/uitl/translations_delegate_base.dart	4 years ago
Fatimah Alshammari	34ccb132dc	fixed issues	4 years ago
haroon amjad	cbbef80bd5	Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development ... # Conflicts: # lib/config/localized_values.dart # lib/uitl/translations_delegate_base.dart	4 years ago
haroon amjad	eadba3f767	Working on livecare appointment booking page	4 years ago