948 Commits (b15bd2362be8eab2a0b4a5ecfbeb87463fdcff98)

Author	SHA1	Message	Date
haroon amjad	b15bd2362b	Updates & fixes	4 years ago
haroon amjad	4c2410cfd5	Health plugin updated	4 years ago
haroon amjad	2670d0be57	Merge branch 'development_new_design_2.0' into haroon-new-design	4 years ago
haroon amjad	330f2d6c86	Fixes & updates	4 years ago
Fatimah Alshammari	b09b1e4732	six issues	4 years ago
Fatimah Alshammari	ff7146e259	Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Fatima-New-Design ... # Conflicts: # lib/pages/pharmacies/screens/product-details/footor/footer-widget.dart # lib/pages/pharmacy/pharmacyContacts.dart	4 years ago
Fatimah Alshammari	de86cffb8c	fix lakum issues	4 years ago
haroon amjad	207525e31a	Fixes	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
Elham Rababh	16c1064a45	PMAU-19	4 years ago
haroon amjad	14b0c4c125	Merge branch 'products_tails' into 'development_new_design_2.0' ... fix on design See merge request Cloud_Solution/diplomatic-quarter!550	4 years ago
Elham Rababh	d6eeb02c91	fix on design	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
Elham Rababh	34596163d1	Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into nov_fixes	4 years ago
Elham Rababh	12e47aba82	fix as first step	4 years ago
haroon amjad	17d569216d	Merge branch 'Fatima-New-Design' into 'development_new_design_2.0' ... Fatima new design See merge request Cloud_Solution/diplomatic-quarter!539	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
devmirza121	f9e98c5fa4	Merge branch 'development_new_design_2.0' into mirza_home_page	4 years ago
devmirza121	7d2a6c794b	Clinic Search Dialog	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
devmirza121	f3b7a5c318	Merge branch 'development_new_design_2.0' into mirza_home_page	4 years ago
devmirza121	69b1dd6533	Medical Reminder	4 years ago
Sikander Saleem	044c442ce0	Merge branch 'development_new_design_2.0' into new_design_sikander ... # Conflicts: # lib/pages/parent_categorise_page.dart	4 years ago
Sikander Saleem	5a8c887117	Merge remote-tracking branch 'origin/development_new_design_2.0' into development_new_design_2.0	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	014074c414	Merge remote-tracking branch 'origin/development_new_design_2.0' into development_new_design_2.0 ... # Conflicts: # lib/pages/Blood/blood_donation.dart # lib/pages/BookAppointment/components/SearchByClinic.dart	4 years ago
Sikander Saleem	9a82b9c369	laser clinic added.	4 years ago
haroon amjad	79d99dd48a	Pharmacy security updates applied	4 years ago
haroon amjad	f4ccecc1af	Merge branch 'Fatima-New-Design' into 'development_new_design_2.0' ... fix issue See merge request Cloud_Solution/diplomatic-quarter!516	4 years ago
Fatimah Alshammari	adfa707eda	fix issue	4 years ago
haroon amjad	d4e71fd8ec	Merge branch 'nov_fixes' into 'development_new_design_2.0' ... fix cart back button See merge request Cloud_Solution/diplomatic-quarter!514	4 years ago
Elham Rababh	275871bc39	fix addcustomeraddress	4 years ago
haroon amjad	d630c6c45f	Pharmacy fixes	4 years ago
hussam al-habibeh	b09bc3bef9	merge dev to hussam pharmacy fix	4 years ago
hussam al-habibeh	1a382bfc80	Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hussam_pharmacy_fix ... Conflicts: lib/config/config.dart lib/pages/parent_categorise_page.dart lib/pages/pharmacies/screens/cart-page/cart-order-page.dart lib/pages/pharmacies/screens/product-details/product-detail.dart lib/pages/sub_categorise_page.dart	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	f5de786745	Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Fatima-New-Design	4 years ago
Fatimah Alshammari	c4e185ea60	fixed issues	4 years ago