46 Commits (e3b7069aa201a0a954cb7368ba4cd619a200a0dc)

Author	SHA1	Message	Date
haroon amjad	e3b7069aa2	Merge branch 'development_new_design_2.0' into haroon-new-design ... # Conflicts: # lib/pages/parent_categorise_page.dart # lib/pages/pharmacies/screens/product-details/shared/product_details_app_bar.dart # lib/pages/webRTC/call_page.dart # lib/pages/webRTC/signaling.dart	4 years ago
haroon amjad	8b1733e917	no message	4 years ago
haroon amjad	003375b12f	Merge branch 'Fatima-New-Design' into 'development_new_design_2.0' ... Fatima new design See merge request Cloud_Solution/diplomatic-quarter!543	4 years ago
Fatimah Alshammari	21c315c1a3	fix wishlist issue	4 years ago
hussam al-habibeh	e6fd5293ca	fix filited produvts API	4 years ago
Fatimah Alshammari	12b20831df	fix app bar	4 years ago
hussam al-habibeh	ff86dcbdc0	sub categories pagnation	4 years ago
hussam al-habibeh	300668cc81	sub Categorise fixed	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
hussam al-habibeh	a35e149088	product pagination	4 years ago
Elham Rababh	05e4e7be45	fix bottom bar in cart page	4 years ago
Fatimah Alshammari	96ec3f2926	fix issues	4 years ago
Fatimah Alshammari	c4e185ea60	fixed issues	4 years ago
Fatimah Alshammari	62d904aa68	fixed issues	4 years ago
Fatimah Alshammari	eb4801c7ee	fixed rating issues	4 years ago
haroon amjad	be771917f0	pharmacy fixes	4 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	4 years ago
hussam al-habibeh	bc91b9ad88	bottom nav pharmacy	4 years ago
Fatimah Alshammari	e6378b7ada	fix issues	4 years ago
Elham Rababh	2c30b5a494	fix issues	4 years ago
Fatimah Alshammari	3be7f7f899	fixed loader issue	4 years ago
Fatimah Alshammari	9cf0794cf6	Fixed out of stuck items issues	4 years ago
Fatimah Alshammari	e2763a5bd5	fixed cart shopping issues	4 years ago
Fatimah Alshammari	30a1353be6	fixed brands design and recommended products issues	4 years ago
Fatimah Alshammari	10f75191c6	added shopping cart to categories	4 years ago
Fatimah Alshammari	ac63f09633	edit arabic version	4 years ago
Fatimah Alshammari	8baad999c5	Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima-new ... # Conflicts: # lib/config/config.dart # lib/pages/parent_categorise_page.dart # lib/pages/pharmacies/screens/pharmacy_module_page.dart # lib/pages/pharmacies/wishlist.dart	4 years ago
Fatimah Alshammari	4309952b17	fixed subCategories	4 years ago
Elham Rababh	65cf4316ab	Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into product_detail_page ... Conflicts: lib/pages/pharmacies/screens/pharmacy_module_page.dart lib/widgets/others/app_scaffold_widget.dart	4 years ago
Elham Rababh	c7a0d39aab	first step of ProductDetailPage refactor	4 years ago
hussam al-habibeh	806e07e4e6	products categories page fix	4 years ago
hussam al-habibeh	e4d54f0c0b	parent product and sub product update	4 years ago
hussam al-habibeh	f1c2dbbbfc	Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into blood_pressure ... Conflicts: lib/pages/parent_categorise_page.dart lib/pages/sub_categorise_page.dart	4 years ago
hussam al-habibeh	0a1db70229	parent product and sub product update	4 years ago
Fatimah Alshammari	7ebeb8cb4b	Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima-new ... # Conflicts: # lib/pages/parent_categorise_page.dart # lib/pages/sub_categorise_page.dart	4 years ago
hussam al-habibeh	b0165c0d29	fix pharmacy products filtering	4 years ago
Fatimah Alshammari	8c0dca781c	fixed compare issues and arabic version	4 years ago
hussam al-habibeh	a534b1415e	products filtering fix	5 years ago
hussam al-habibeh	2723422bbf	daynimic listing	5 years ago
haroon amjad	da3ad90ddd	added app-wide route transition animation	5 years ago
hussam al-habibeh	1b76d9c192	pharmacy bugs fixed	5 years ago
hussam al-habibeh	e85b21c08f	parent_categorise_page update	5 years ago
hussam al-habibeh	64cbae3602	Search	5 years ago
hussam al-habibeh	69ea8b7bd7	daynmic products listing	5 years ago
hussam al-habibeh	69a6bc2812	offers page	5 years ago