Commit Graph

1994 Commits (b2814d0183430a5c52c8982b85aec3a60fbe1676)

Author SHA1 Message Date
Elham Rababh b2814d0183 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into products_tails 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 3e667d6b87 fix arabic language 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
haroon amjad f06122d084 Merge branch 'Fatima-New-Design' into 'development_new_design_2.0'
Fatima new design

See merge request Cloud_Solution/diplomatic-quarter!551
4 years ago
haroon amjad 75423e5501 Updates 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
haroon amjad d1fcdcc898 Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/config/localized_values.dart
4 years ago
hussam al-habibeh 01a56da151 merge conflict resolved 4 years ago
hussam al-habibeh 141e650276 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hussam_pharmacy_fix
 Conflicts:
	lib/pages/pharmacies/screens/product-details/product-name-and-price.dart
4 years ago
hussam al-habibeh 8c4af92832 pharmacy new design home 4 years ago
hussam al-habibeh a5e7541394 new design pharmacy home 4 years ago
haroon amjad cf27c3e796 Incoming call & LiveCare pending UI revamped 4 years ago
hussam al-habibeh af0316367d Merge branch 'products_tails' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hussam_pharmacy_fix 4 years ago
Elham Rababh c5be1472e7 first step from product details 4 years ago
Fatimah Alshammari dbe74b3eb4 fix desing 4 years ago
Fatimah Alshammari bc49d0d7c0 Merge branch 'development_new_design_2.0' into Fatima-New-Design 4 years ago
Fatimah Alshammari db3ea448f6 fix design 4 years ago
Elham Rababh c6be53d800 first step from product details 4 years ago
Elham Rababh a71e7e4075 first step from product details 4 years ago
haroon amjad fe7baeab3c LiveCare permissions 4 years ago
haroon amjad 39190681c6 Updates 4 years ago
haroon amjad e3b7069aa2 Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/pages/parent_categorise_page.dart
#	lib/pages/pharmacies/screens/product-details/shared/product_details_app_bar.dart
#	lib/pages/webRTC/call_page.dart
#	lib/pages/webRTC/signaling.dart
4 years ago
haroon amjad 2274c6affe Merge branch 'zik_new_design_2.0' into 'development_new_design_2.0'
Zik new design 2.0

See merge request Cloud_Solution/diplomatic-quarter!531
4 years ago
haroon amjad 8b1733e917 no message 4 years ago
haroon amjad 003375b12f Merge branch 'Fatima-New-Design' into 'development_new_design_2.0'
Fatima new design

See merge request Cloud_Solution/diplomatic-quarter!543
4 years ago
haroon amjad 68b443905e Merge branch 'hussam_pharmacy_fix' into 'development_new_design_2.0'
Hussam pharmacy fix

See merge request Cloud_Solution/diplomatic-quarter!544
4 years ago
Elham Rababh 34596163d1 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into nov_fixes 4 years ago
Sikander Saleem 4518a26ff1 video call improvement. 4 years ago
Fatimah Alshammari 21c315c1a3 fix wishlist issue 4 years ago
hussam al-habibeh e6fd5293ca fix filited produvts API 4 years ago
Fatimah Alshammari 7bbabd798a fix issue 4 years ago
Fatimah Alshammari e640f41c35 Merge branch 'development_new_design_2.0' into Fatima-New-Design
# Conflicts:
#	lib/pages/pharmacies/screens/product-details/shared/product_details_app_bar.dart
#	lib/pages/pharmacies/widgets/ProductOrderItem.dart
4 years ago
Fatimah Alshammari 12b20831df fix app bar 4 years ago
Elham Rababh 12e47aba82 fix as first step 4 years ago
haroon amjad 816dfe4a12 Pharmacy fixes 4 years ago
haroon amjad 2c198ed224 no message 4 years ago
haroon amjad a88889ec1d Merge branch 'nov_fixes' into 'development_new_design_2.0'
small fix in order details

See merge request Cloud_Solution/diplomatic-quarter!540
4 years ago
Elham Rababh 6439fe264a small fix in order details 4 years ago