Commit Graph

20 Commits (0e5fd1d1ec109dd857756b94ac351f1da1275b95)

Author SHA1 Message Date
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
Elham Rababh c7a0d39aab first step of ProductDetailPage refactor 4 years ago
Fatimah Alshammari b3285f4528 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima-new
# Conflicts:
#	lib/pages/sub_categorise_page.dart
4 years ago
Fatimah Alshammari bdededa397 fixed arabic version 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
Fatimah Alshammari bcfbca98a1 fixed arabic version 4 years ago
hussam al-habibeh cb9d8cb9d9 fix pharmacy products filtering 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
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