Commit Graph

2438 Commits (464df82da01a7fe73c1ffc7fddc464aeb70cc872)
 

Author SHA1 Message Date
haroon amjad 464df82da0 Merge branch 'haroon-new-design' into 'development_new_design_2.0'
Updates & fixes

See merge request Cloud_Solution/diplomatic-quarter!491
4 years ago
haroon amjad b752b42a34 Updates & fixes 4 years ago
haroon amjad eb12c8301c Merge branch 'haroon-new-design' into 'development_new_design_2.0'
Haroon new design

See merge request Cloud_Solution/diplomatic-quarter!488
4 years ago
haroon amjad 9ce77b56b9 Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
haroon amjad 75056478fc Merge branch 'Fatima-New-Design' into 'development_new_design_2.0'
Fatima new design

See merge request Cloud_Solution/diplomatic-quarter!487
4 years ago
haroon amjad 30e67bbe3e updates 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
haroon amjad caab3339e3 Merge branch 'haroon-new-design' into 'development_new_design_2.0'
Updates & fixes

See merge request Cloud_Solution/diplomatic-quarter!486
4 years ago
Fatimah Alshammari 23acdfd494 fix loader issue and design 4 years ago
haroon amjad 894cc0e336 Updates & fixes 4 years ago
Fatimah Alshammari 6f63250252 fix issues 4 years ago
haroon amjad 96684d77e0 Merge branch 'haroon-new-design' into 'development_new_design_2.0'
Haroon new design

See merge request Cloud_Solution/diplomatic-quarter!485
4 years ago
haroon amjad e1e31de818 Lakum fixes 4 years ago
haroon amjad 72784f68b9 Fixes & updates 4 years ago
haroon amjad 2e6ebc2933 Merge branch 'haroon-new-design' into 'development_new_design_2.0'
Haroon new design

See merge request Cloud_Solution/diplomatic-quarter!483
4 years ago
haroon amjad be771917f0 pharmacy fixes 4 years ago
haroon amjad bebcd85557 Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
haroon amjad 5943522163 UI fixes 4 years ago
haroon amjad e3f720e68e Merge branch 'Fatima-New-Design' into 'development_new_design_2.0'
Fatima new design

See merge request Cloud_Solution/diplomatic-quarter!482
4 years ago
Fatimah Alshammari 28678633e7 Merge branch 'development_new_design_2.0' into Fatima-New-Design
# Conflicts:
#	lib/pages/pharmacies/product-brands.dart
#	lib/pages/pharmacies/screens/lakum-main-page.dart
4 years ago
Fatimah Alshammari 78fc77159c fix lakum issues 4 years ago
haroon amjad 8d6278a59b Pharmacy fixes 4 years ago
haroon amjad 541f5f06e7 Merge branch 'haroon-new-design' into 'development_new_design_2.0'
Haroon new design

See merge request Cloud_Solution/diplomatic-quarter!481
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
haroon amjad 585e26b091 Registration fix 4 years ago
Mohammad Aljammal fd46259701 Merge branch 'bottom_nav_pharmacy' into 'development'
show bottom nav in pharmacy all pages

See merge request Cloud_Solution/diplomatic-quarter!479
4 years ago
hussam al-habibeh cb85085969 show bottom nav in pharmacy all pages 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 52fba56bc3 Merge branch 'sultan_new_design' into 'development_new_design_2.0'
Sultan new design

See merge request Cloud_Solution/diplomatic-quarter!476
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 ecfbc3efab Merge branch 'haroon-new-design' into 'development_new_design_2.0'
Haroon new design

See merge request Cloud_Solution/diplomatic-quarter!477
4 years ago
haroon amjad 8c99bba17b Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
haroon amjad e7f5fc8434 Blood donation fixes 4 years ago
haroon amjad be2854c906 Merge branch 'mirza_home_page' into 'development_new_design_2.0'
feedback status bar

See merge request Cloud_Solution/diplomatic-quarter!475
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
Mirza.Shafique fa986476ee feedback status bar 4 years ago
haroon amjad e82b8d4439 Lakum & other fixes 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 8a0d0282ce Merge branch 'pharmacy_fix_bugs' into 'development'
pharmacy cart fixe counter

See merge request Cloud_Solution/diplomatic-quarter!470
4 years ago
Mohammad Aljammal 60d2496f0a Merge branch 'haroon-new-design' into 'development_new_design_2.0'
Haroon new design

See merge request Cloud_Solution/diplomatic-quarter!472
4 years ago
Mohammad Aljammal f424315a19 last commit 😄 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
Mohammad Aljammal 0d29ba70f5 Merge branch 'Oct_fixes' into 'development_new_design_2.0'
fix proceed button

See merge request Cloud_Solution/diplomatic-quarter!471
4 years ago
Fatimah Alshammari 9cececf3f1 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Fatima-New-Design 4 years ago