123 Commits (e53ba65dddfd332ea0a57e4748ec3cfcd010a9f1)

Author	SHA1	Message	Date
haroon amjad	6d88607631	Updates & fixes	3 years ago
Fatimah Alshammari	71a28e2ed6	Merge branch 'development_v2.5' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima_v2	3 years ago
Fatimah Alshammari	cc783045bb	fix categories & cantact design	3 years ago
haroon amjad	c05772c63a	pharmacy fixes	3 years ago
haroon amjad	b15bd2362b	Updates & fixes	3 years ago
Sikander Saleem	3ad90f1a01	Merge branch 'development_new_design_2.0' into development_v2.5	3 years ago
haroon amjad	7733c74f00	Updates & fixes	3 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	3 years ago
haroon amjad	2670d0be57	Merge branch 'development_new_design_2.0' into haroon-new-design	3 years ago
haroon amjad	330f2d6c86	Fixes & updates	3 years ago
Fatimah Alshammari	b09b1e4732	six issues	3 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	3 years ago
Fatimah Alshammari	de86cffb8c	fix lakum issues	3 years ago
haroon amjad	0b4e674097	Merge branch 'development_new_design_2.0' into haroon-new-design	3 years ago
haroon amjad	302e9dbadd	Merge branch 'development_new_design_2.0' into haroon-new-design	3 years ago
Sikander Saleem	e3bf988df5	map picker, firebase improvement and changes for v2.5	3 years ago
Fatimah Alshammari	c84d1cadad	fix address issue	3 years ago
Fatimah Alshammari	bc9fc5a878	fix issue	3 years ago
Fatimah Alshammari	9d9377d59f	fix issues	3 years ago
haroon amjad	b0ae08d6a5	updates & fixes	3 years ago
hussam al-habibeh	141e650276	Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hussam_pharmacy_fix ... Conflicts: lib/pages/pharmacies/screens/product-details/product-name-and-price.dart	3 years ago
Elham Rababh	34596163d1	Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into nov_fixes	3 years ago
Fatimah Alshammari	7bbabd798a	fix issue	3 years ago
Fatimah Alshammari	e640f41c35	Merge branch 'development_new_design_2.0' into Fatima-New-Design ... # Conflicts: # lib/pages/pharmacies/screens/product-details/shared/product_details_app_bar.dart # lib/pages/pharmacies/widgets/ProductOrderItem.dart	3 years ago
Fatimah Alshammari	12b20831df	fix app bar	3 years ago
Elham Rababh	12e47aba82	fix as first step	3 years ago
haroon amjad	816dfe4a12	Pharmacy fixes	3 years ago
Fatimah Alshammari	2992ca4f70	fix translation	3 years ago
Fatimah Alshammari	bd93395d0f	fix order details issue	3 years ago
haroon amjad	5f0985adaa	Updates	3 years ago
haroon amjad	d0c96d245b	Merge branch 'development_new_design_2.0' into haroon-new-design	3 years ago
haroon amjad	a646677fae	Pharmacy & smart watch data fixes	3 years ago
Fatimah Alshammari	468d64a1e0	fix design issue	3 years ago
Fatimah Alshammari	998c1af0f7	Merge branch 'development_new_design_2.0' into Fatima-New-Design	3 years ago
Fatimah Alshammari	ae3bb1bb2d	fix issues	3 years ago
haroon amjad	61a406085b	lakum fixes	3 years ago
haroon amjad	47b7b0db58	Merge branch 'development_new_design_2.0' into haroon-new-design ... # Conflicts: # lib/pages/pharmacy/order/Order.dart	3 years ago
Fatimah Alshammari	bdf3429502	Merge branch 'development_new_design_2.0' into Fatima-New-Design ... # Conflicts: # lib/pages/pharmacy/order/Order.dart	3 years ago
haroon amjad	777d88be30	updates	3 years ago
Fatimah Alshammari	54ff9931cb	fixed arrow issue order page	3 years ago
haroon amjad	79d99dd48a	Pharmacy security updates applied	3 years ago
Fatimah Alshammari	3bfca80ab9	fixed issue	3 years ago
haroon amjad	4823919fcb	Pharmacy fixes	3 years ago
Elham Rababh	f88864efd4	fix calling missing APi	3 years ago
Elham Rababh	2c3c270c43	finish steps inside payment	3 years ago
Elham Rababh	df9e58402d	first step from update design	3 years ago
Elham Rababh	f8883f5439	first step from fixing check out process	3 years ago
Fatimah Alshammari	ca11fe3134	fix issues	3 years ago
Fatimah Alshammari	23acdfd494	fix loader issue and design	3 years ago
haroon amjad	925e3cb686	Merge branch 'development' into haroon-new-design ... # Conflicts: # lib/core/viewModels/pharmacyModule/product_detail_view_model.dart # lib/main.dart # lib/pages/final_products_page.dart # lib/pages/landing/landing_page_pharmcy.dart # lib/pages/login/login.dart # lib/pages/pharmacies/screens/pharmacy_module_page.dart # lib/pages/pharmacies/screens/product-details/product-detail.dart # lib/pages/pharmacies/screens/product-details/shared/product_details_app_bar.dart # lib/pages/pharmacy/profile/profile.dart # lib/services/pharmacy_services/product_detail_service.dart # lib/widgets/others/app_scaffold_widget.dart # lib/widgets/pharmacy/bottom_nav_pharmacy_bar.dart	3 years ago