Commit Graph

13 Commits (46a572674f0d46655578be4be16a3d4dca1a352f)

Author SHA1 Message Date
haroon amjad b51989e798 Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/pages/pharmacies/compare.dart
#	lib/pages/pharmacies/my_reviews.dart
#	lib/pages/pharmacies/wishlist.dart
3 years ago
haroon amjad 7467da7409 Imports organized 3 years ago
Fatimah Alshammari 8c0dca781c fixed compare issues and arabic version 3 years ago
Fatimah Alshammari 2481e4c9ea fixed categories issues and home page button 4 years ago
Fatimah Alshammari 71a393df68 fixed categories issue 4 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
4 years ago
hussam al-habibeh 1b76d9c192 pharmacy bugs fixed 4 years ago
mosazaid 5d0a122689 fix bugs 4 years ago
mosazaid 1a45f99606 some fixes on pharmacy 4 years ago
Mohammad Aljammal de1b7cc1d0 fix merge issues 4 years ago
Mohammad Aljammal 77dcb918c3 Revert "Merge branch 'pharmacy-hussam' into 'master'"
This reverts merge request !149
4 years ago
hussam al-habibeh 64cbae3602 Search 4 years ago
hussam al-habibeh 69ea8b7bd7 daynmic products listing 4 years ago