Commit Graph

340 Commits (259e27d4a7e8d7ddf751de88de36fe901df0e2da)

Author SHA1 Message Date
haroon amjad 693f8cb090 Updates & fixes 4 years ago
haroon amjad 8f91d0a0dc lakum fix 4 years ago
haroon amjad 40d649dfa4 Updates & fixes 4 years ago
haroon amjad 28107f9a48 Compare duplication fixed 4 years ago
haroon amjad 8c3b443f79 Merge branch 'development_v2.5' into haroon_development_2.5 4 years ago
haroon amjad 4e3d99b007 Updates & fixes 4 years ago
Fatimah Alshammari e5f0f5777b Merge branch 'development_v2.5' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima_v2
# Conflicts:
#	lib/services/pharmacy_services/product_detail_service.dart
4 years ago
haroon amjad 6d88607631 Updates & fixes 4 years ago
Fatimah Alshammari 57d10d9e1f fix compare issue 4 years ago
haroon amjad c2b0326676 Updates & fixes 4 years ago
haroon amjad 2670d0be57 Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
haroon amjad 9c0337aa01 updates & fixes 4 years ago
haroon amjad 330f2d6c86 Fixes & updates 4 years ago
Fatimah Alshammari b09b1e4732 six issues 4 years ago
Fatimah Alshammari f9d1bbe2ee disable lakum on check out page 4 years ago
Fatimah Alshammari cf7dd13a83 fix issue 4 years ago
Fatimah Alshammari ff7146e259 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Fatima-New-Design
# Conflicts:
#	lib/pages/pharmacies/screens/product-details/footor/footer-widget.dart
#	lib/pages/pharmacy/pharmacyContacts.dart
4 years ago
Fatimah Alshammari de86cffb8c fix lakum issues 4 years ago
haroon amjad a60e878fef Updates & fixes 4 years ago
haroon amjad 03e554b1af Merge branch 'hussam_pharmacy_fix' into 'development_new_design_2.0'
Hussam pharmacy fix

See merge request Cloud_Solution/diplomatic-quarter!562
4 years ago
hussam al-habibeh cf556c66b0 add quantity filed fixed 4 years ago
hussam al-habibeh 516fddf962 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hussam_pharmacy_fix 4 years ago
hussam al-habibeh e291d46af7 pharmacy uo fix 4 years ago
Fatimah Alshammari 749b89b67d fix issue 4 years ago
Fatimah Alshammari a1b4e1c8a3 Merge branch 'development_new_design_2.0' into Fatima-New-Design 4 years ago
Fatimah Alshammari 7ffb431454 added map luncher 4 years ago
haroon amjad 302e9dbadd Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
Fatimah Alshammari a55ca33c1b Merge branch 'development_new_design_2.0' into Fatima-New-Design
# Conflicts:
#	lib/pages/search_products_page.dart
#	lib/widgets/pharmacy/product_tile.dart
4 years ago
Fatimah Alshammari bc9fc5a878 fix issue 4 years ago
haroon amjad eb64962d7c Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
haroon amjad b0ae08d6a5 updates & fixes 4 years ago
haroon amjad d7de2d6802 Merge branch 'products_tails' into 'development_new_design_2.0'
Products tails

See merge request Cloud_Solution/diplomatic-quarter!557
4 years ago
haroon amjad 18c5b53b30 Merge branch 'hussam_pharmacy_fix' into 'development_new_design_2.0'
pharmacy design home page

See merge request Cloud_Solution/diplomatic-quarter!556
4 years ago
Elham Rababh b2814d0183 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into products_tails 4 years ago
hussam al-habibeh 9c8bd64142 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hussam_pharmacy_fix 4 years ago
hussam al-habibeh 6b1c0e04d0 pharmacy design home page 4 years ago
Elham Rababh 16c1064a45 PMAU-19 4 years ago
haroon amjad c1b194d15d Merge branch 'hussam_pharmacy_fix' into 'development_new_design_2.0'
pharmacy home design

See merge request Cloud_Solution/diplomatic-quarter!555
4 years ago
Elham Rababh f623828d78 fix arabic language 4 years ago
hussam al-habibeh 01433963bd pharmacy home design 4 years ago
Elham Rababh 8f044a635a fix footer design 4 years ago
haroon amjad 1a90698a99 Merge branch 'hussam_pharmacy_fix' into 'development_new_design_2.0'
fix ontap on prodcut card

See merge request Cloud_Solution/diplomatic-quarter!554
4 years ago
hussam al-habibeh 1984400239 fix ontap on prodcut card 4 years ago
haroon amjad 6c20bf50b5 Merge branch 'hussam_pharmacy_fix' into 'development_new_design_2.0'
Hussam pharmacy fix

See merge request Cloud_Solution/diplomatic-quarter!553
4 years ago
hussam al-habibeh 3c97122308 pharmacy home dsign 4 years ago
haroon amjad 14b0c4c125 Merge branch 'products_tails' into 'development_new_design_2.0'
fix on design

See merge request Cloud_Solution/diplomatic-quarter!550
4 years ago
Fatimah Alshammari 4d8271c45d fix product details issue 4 years ago
Fatimah Alshammari 169ebac076 Merge branch 'development_new_design_2.0' into Fatima-New-Design
# Conflicts:
#	lib/pages/pharmacies/screens/product-details/product-name-and-price.dart
4 years ago
Elham Rababh d6eeb02c91 fix on design 4 years ago
Fatimah Alshammari fb974af726 fix issues 4 years ago