Commit Graph

37 Commits (5f90435442f703b248a9946ba522f2328eca3e27)

Author SHA1 Message Date
Fatimah Alshammari cc783045bb fix categories & cantact design 4 years ago
Fatimah Alshammari bc9fc5a878 fix issue 4 years ago
Fatimah Alshammari 21c315c1a3 fix wishlist issue 4 years ago
Fatimah Alshammari 12b20831df fix app bar 4 years ago
Elham Rababh 05e4e7be45 fix bottom bar in cart page 4 years ago
Fatimah Alshammari d1e0b6ccd9 fix issue 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
Elham Rababh 2981eb3236 fix public card issues 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
hussam al-habibeh 9a2d52309c products categories page fix 4 years ago
Elham Rababh a269b514a9 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into product_detail_page
 Conflicts:
	lib/config/config.dart
4 years ago
Elham Rababh c7a0d39aab first step of ProductDetailPage refactor 4 years ago
Mohammad Aljammal 8c7f397ac8 Merge branch 'pharmacy_fix' into 'development'
Pharmacy fix

See merge request Cloud_Solution/diplomatic-quarter!397
4 years ago
hussam al-habibeh dbf7ebf287 fix most viewed & best sellers moduls 4 years ago
Elham Rababh cc88f0f81e first step of fixing 4 years ago
Fatimah Alshammari 8c0dca781c fixed compare issues and arabic version 4 years ago
Fatimah Alshammari 2481e4c9ea fixed categories issues and home page button 5 years ago
Fatimah Alshammari 71a393df68 fixed categories issue 5 years ago
hussam al-habibeh 8c58dced7d Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy-bugs
 Conflicts:
	lib/core/service/pharmacy_categorise_service.dart
	lib/pages/final_products_page.dart
5 years ago
hussam al-habibeh 1b76d9c192 pharmacy bugs fixed 5 years ago
mosazaid 5d0a122689 fix bugs 5 years ago
mosazaid 1a45f99606 some fixes on pharmacy 5 years ago
Mohammad Aljammal de1b7cc1d0 fix merge issues 5 years ago
Mohammad Aljammal 77dcb918c3 Revert "Merge branch 'pharmacy-hussam' into 'master'"
This reverts merge request !149
5 years ago
hussam al-habibeh 64cbae3602 Search 5 years ago
hussam al-habibeh 69ea8b7bd7 daynmic products listing 5 years ago