530 Commits (0acc134e6e3c48138152d095daf87bc5f652a881)

Author	SHA1	Message	Date
haroon amjad	0acc134e6e	Updates & fixes	4 years ago
haroon amjad	eb6b0aefc0	Merge branch 'fatima_v2' into 'development_v2.5' ... Fatima v2 See merge request Cloud_Solution/diplomatic-quarter!580	4 years ago
haroon amjad	693f8cb090	Updates & fixes	4 years ago
Fatimah Alshammari	0b21252ae7	fix category issue	4 years ago
Fatimah Alshammari	0985436a10	fix translation issue	4 years ago
haroon amjad	c05772c63a	pharmacy fixes	4 years ago
haroon amjad	b15bd2362b	Updates & fixes	4 years ago
Fatimah Alshammari	b09b1e4732	six issues	4 years ago
Fatimah Alshammari	de86cffb8c	fix lakum issues	4 years ago
Fatimah Alshammari	a55ca33c1b	Merge branch 'development_new_design_2.0' into Fatima-New-Design ... # Conflicts: # lib/pages/search_products_page.dart # lib/widgets/pharmacy/product_tile.dart	4 years ago
Fatimah Alshammari	bc9fc5a878	fix issue	4 years ago
haroon amjad	d1fcdcc898	Merge branch 'development_new_design_2.0' into haroon-new-design ... # Conflicts: # lib/config/localized_values.dart	4 years ago
haroon amjad	cf27c3e796	Incoming call & LiveCare pending UI revamped	4 years ago
Elham Rababh	c6be53d800	first step from product details	4 years ago
Elham Rababh	a71e7e4075	first step from product details	4 years ago
Fatimah Alshammari	d25f888c3e	Merge branch 'development_new_design_2.0' into Fatima-New-Design ... # Conflicts: # lib/pages/pharmacies/screens/lakum-main-page.dart	4 years ago
Fatimah Alshammari	a858d8764a	fixed issues	4 years ago
haroon amjad	4b446bb6d0	Merge branch 'development_new_design_2.0' into haroon-new-design	4 years ago
Sikander Saleem	407fb81038	Merge branch 'development_new_design_2.0' into new_design_sikander	4 years ago
Sikander Saleem	7df0fc59df	laser images change & offer and packages	4 years ago
haroon amjad	5f0985adaa	Updates	4 years ago
haroon amjad	a646677fae	Pharmacy & smart watch data fixes	4 years ago
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