Commit Graph

1680 Commits (c558fe6bd9c16d21342ff0ece4d2a7d26ecd2e18)
 

Author SHA1 Message Date
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
mosazaid fdb61c78c5 fix bugs pharmacy home 4 years ago
Mohammad Aljammal 8e30860fc2 Merge branch 'pharmacy_fix' into 'development'
Pharmacy fix

See merge request Cloud_Solution/diplomatic-quarter!401
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 767a4fc835 Merge branch 'fix_product_tile' into 'development'
Fix product tile

See merge request Cloud_Solution/diplomatic-quarter!399
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
Mohammad Aljammal 7cc5ec58d1 Merge branch 'pharmacy_fix_bugs' into 'development'
fix bugs pharmacy

See merge request Cloud_Solution/diplomatic-quarter!398
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
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
Mohammad Aljammal edffa96925 Merge branch 'brands' into 'development'
Brands

See merge request Cloud_Solution/diplomatic-quarter!396
4 years ago
Elham Rababh db277a62f5 fix brand design 4 years ago
Elham Rababh a6a7ed4e1b remove cart from product details 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 7427cd68ff fix bottom nav bar ui 4 years ago
Mohammad Aljammal cfe9e35c38 Merge branch 'blood_pressure' into 'development'
parent product and sub product update

See merge request Cloud_Solution/diplomatic-quarter!389
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
Mohammad Aljammal 1d7e97a9af Merge branch 'fatima-new' into 'development'
Fatima new

See merge request Cloud_Solution/diplomatic-quarter!386
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 ab0e388cbe Merge branch 'Haroon' into 'development'
updates & fixes

See merge request Cloud_Solution/diplomatic-quarter!385
4 years ago
haroon amjad 4469ae1209 updates & fixes 4 years ago
haroon amjad e679c7df0d updates & fixes 4 years ago
haroon amjad b90c189b6d Merge branch 'Haroon' into 'development'
updates & fixes

See merge request Cloud_Solution/diplomatic-quarter!384
4 years ago
haroon amjad 75c0de091f Merge branch 'Haroon' into 'development'
updates & fixes

See merge request Cloud_Solution/diplomatic-quarter!383
4 years ago
haroon amjad 44d59ed01a updates & fixes 4 years ago
Mohammad Aljammal 55f9bbcba4 Merge branch 'fatima-new' into 'development'
Fatima new

See merge request Cloud_Solution/diplomatic-quarter!379
4 years ago
haroon amjad b83318faf8 Merge branch 'Haroon' into 'development'
Haroon

See merge request Cloud_Solution/diplomatic-quarter!382
4 years ago