Commit Graph

857 Commits (d7c3cb3dbc3f7cceb6743e8ce997cecd03c61835)

Author SHA1 Message Date
Fatimah Alshammari d7c3cb3dbc fix conflict 4 years ago
Sikander Saleem 2a92478d01 nfc plugin improvement. 4 years ago
Sikander Saleem 628439ddf8 video call camera view issue fix, barcode plugin change, smart watches improvements. 4 years ago
Sikander Saleem e3bf988df5 map picker, firebase improvement and changes for v2.5 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 75423e5501 Updates 4 years ago
Elham Rababh d6eeb02c91 fix on design 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 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
haroon amjad cf27c3e796 Incoming call & LiveCare pending UI revamped 4 years ago
Elham Rababh c6be53d800 first step from product details 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
Fatimah Alshammari 127096ec04 fixed wishlist design 4 years ago
Fatimah Alshammari 21c315c1a3 fix wishlist issue 4 years ago
Sikander Saleem 407fb81038 Merge branch 'development_new_design_2.0' into new_design_sikander 4 years ago
Sikander Saleem 7df0fc59df laser images change & offer and packages 4 years ago
haroon amjad a646677fae Pharmacy & smart watch data fixes 4 years ago
Zohaib Iqbal Kambrani b596b1b61d WebRTC and Packages Offer | Merge 4 years ago
Sikander Saleem 00f63cd288 Merge branch 'development_new_design_2.0' into new_design_sikander
# Conflicts:
#	lib/pages/DrawerPages/notifications/notification_details_page.dart
#	lib/uitl/translations_delegate_base.dart
4 years ago
Sikander Saleem 9a82b9c369 laser clinic added. 4 years ago
hussam al-habibeh 1a382bfc80 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hussam_pharmacy_fix
 Conflicts:
	lib/config/config.dart
	lib/pages/parent_categorise_page.dart
	lib/pages/pharmacies/screens/cart-page/cart-order-page.dart
	lib/pages/pharmacies/screens/product-details/product-detail.dart
	lib/pages/sub_categorise_page.dart
4 years ago
Elham Rababh 05e4e7be45 fix bottom bar in cart page 4 years ago
Fatimah Alshammari c4e185ea60 fixed issues 4 years ago
hussam al-habibeh 5927f3e35f pharmacy home page update 4 years ago
haroon amjad 502c7fd3de Offers & discounts UI updating 4 years ago
Haroon Amjad d5c68c5032 Packages & offers design 4 years ago
haroon amjad b752b42a34 Updates & fixes 4 years ago
haroon amjad 9ce77b56b9 Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
haroon amjad c253ec3110 LiveCare UI revamped 4 years ago
haroon amjad f995a9fa8e Ambulance request UI revamped 4 years ago
Fatimah Alshammari 239d2c1036 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Fatima-New-Design 4 years ago
Fatimah Alshammari 23acdfd494 fix loader issue and design 4 years ago
haroon amjad 894cc0e336 Updates & fixes 4 years ago
haroon amjad be771917f0 pharmacy fixes 4 years ago
haroon amjad 5943522163 UI fixes 4 years ago
haroon amjad 8d6278a59b Pharmacy fixes 4 years ago
haroon amjad 925e3cb686 Merge branch 'development' into haroon-new-design
# Conflicts:
#	lib/core/viewModels/pharmacyModule/product_detail_view_model.dart
#	lib/main.dart
#	lib/pages/final_products_page.dart
#	lib/pages/landing/landing_page_pharmcy.dart
#	lib/pages/login/login.dart
#	lib/pages/pharmacies/screens/pharmacy_module_page.dart
#	lib/pages/pharmacies/screens/product-details/product-detail.dart
#	lib/pages/pharmacies/screens/product-details/shared/product_details_app_bar.dart
#	lib/pages/pharmacy/profile/profile.dart
#	lib/services/pharmacy_services/product_detail_service.dart
#	lib/widgets/others/app_scaffold_widget.dart
#	lib/widgets/pharmacy/bottom_nav_pharmacy_bar.dart
4 years ago
Mohammad Aljammal c0cf2f71a2 Merge branch 'bottom_nav_pharmacy' into 'development'
Bottom nav pharmacy

See merge request Cloud_Solution/diplomatic-quarter!478
4 years ago
hussam al-habibeh 46d7e7ee14 show bottom nav in pharmacy all pages 4 years ago
haroon amjad f15090c634 Merge branch 'development_new_design_2.0' into 'sultan_new_design'
# Conflicts:
#   lib/pages/login/register.dart
4 years ago
haroon amjad 8c99bba17b Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
Sultan Khan 64e62235c4 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design 4 years ago
Sultan Khan a471824507 register issues 4 years ago
haroon amjad f029aaa1c6 Fixes & code optimizations 4 years ago
Mohammad Aljammal f9e33e7212 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!467
4 years ago
Mohammad Aljammal d4283c0116 fix merge issue 4 years ago
Mohammad Aljammal 4cb63e353b Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy_fix_bugs
 Conflicts:
	lib/pages/pharmacies/screens/product-details/product-detail.dart
4 years ago
hussam al-habibeh bc91b9ad88 bottom nav pharmacy 4 years ago
haroon amjad fa5fd8e323 Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
mosazaid 4939fe63d1 pharmacy cart fixe counter 4 years ago