Commit Graph

1219 Commits (c56e4a1a5c72d9ef376dd0165b6e59cd33c79622)

Author SHA1 Message Date
Mohammad Aljammal 76eef8625d Merge branch 'pharmacy_fix_bugs' into 'development'
fix bugs pharmacy home

See merge request Cloud_Solution/diplomatic-quarter!411
4 years ago
mosazaid 594b2710b3 fix bugs pharmacy home 4 years ago
Mohammad Aljammal 361b72624b Merge branch 'pharmacy_fix' into 'development'
Pharmacy fix

See merge request Cloud_Solution/diplomatic-quarter!407
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 bb96201c2e remove the custom scaffold 4 years ago
hussam al-habibeh f3000d0ee3 My account design fix 4 years ago
Elham Rababh e20e90c20c fix quantity_box 4 years ago
Elham Rababh d5f1a162c0 replace bottom sheet button 4 years ago
mosazaid 185d66e342 fix bugs pharmacy home 4 years ago
Elham Rababh 6fe41382c0 first step from design 4 years ago
mosazaid c558fe6bd9 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy_fix_bugs 4 years ago
mosazaid f47d59c43f fix bugs pharmacy home 4 years ago
Elham Rababh 2839af658a fix issues 4 years ago
mosazaid fdb61c78c5 fix bugs pharmacy home 4 years ago
hussam al-habibeh 9a2d52309c products categories page fix 4 years ago
hussam al-habibeh cb2b9db0ab Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy_fix 4 years ago
Mohammad Aljammal b53bd5fd62 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix_product_tile
 Conflicts:
	lib/pages/pharmacies/screens/pharmacy_module_page.dart
4 years ago
Mohammad Aljammal 43e7bb9ff3 fix bottom navigation bar 4 years ago
mosazaid a398ede172 fix bugs pharmacy home 4 years ago
hussam al-habibeh 2265487ccd remove cart cout & icon from AppBar 4 years ago
Elham Rababh 769dc4e0ac first step of ProductDetailPage refactor 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
hussam al-habibeh 806e07e4e6 products categories page fix 4 years ago
mosazaid f329eea798 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy_fix_bugs 4 years ago
mosazaid 01a77d5352 fix bugs pharmacy 4 years ago
Mohammad Aljammal d64e2a469f Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix_product_tile 4 years ago
Mohammad Aljammal 8ecd4a24d8 fix product tile 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 db277a62f5 fix brand design 4 years ago
Elham Rababh 9b42d411ca remove cart from product details 4 years ago
Elham Rababh cc88f0f81e first step of fixing 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
Mohammad Aljammal 473f372a85 Merge branch 'blood_pressure' into 'development'
fix pharmacy products filtering

See merge request Cloud_Solution/diplomatic-quarter!388
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 2caf4d4837 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima-new 4 years ago
Fatimah Alshammari 8c0dca781c fixed compare issues and arabic version 4 years ago
Mohammad Aljammal 9fb4e79c34 Merge branch 'sep_fixes' into 'development'
Sep fixes

See merge request Cloud_Solution/diplomatic-quarter!387
4 years ago
Elham Rababh bb372210e0 PAP-938: fix Referral sent 4 years ago
Elham Rababh bff7020b78 PAP-939: fixes 4 years ago
Fatimah Alshammari 62167baec5 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima-new 4 years ago
Fatimah Alshammari 6d72be2a73 fixed cart order issues 4 years ago
haroon amjad 4469ae1209 updates & fixes 4 years ago
haroon amjad e679c7df0d updates & fixes 4 years ago