Commit Graph

2238 Commits (1dcfe44e969014aae019024d9008600bb68f64e7)
 

Author SHA1 Message Date
Mirza.Shafique d48a4ff4e3 Back Button on Landing Page 3 years ago
Mirza.Shafique 3a07d39bff Merge branch 'development_new_design_2.0' into mirza_home_page 3 years ago
Sultan Khan 549ddfdbb9 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design 3 years ago
mosazaid 9a1dc3c678 pharmacy cart and wishlist fixes 3 years ago
haroon amjad 6c4afaf114 Advance payment API updates 3 years ago
Fatimah Alshammari 10f75191c6 added shopping cart to categories 3 years ago
mosazaid c7f558b92e Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy_fix_bugs 3 years ago
haroon amjad b37944866e Merge branch 'haroon-new-design' into 'development_new_design_2.0'
Haroon new design

See merge request Cloud_Solution/diplomatic-quarter!429
3 years ago
Mirza.Shafique 4d372bffb2 Merge branch 'development_new_design_2.0' into mirza_home_page 3 years ago
Mirza.Shafique e788f09ed9 Show Chart Widget 3 years ago
Haroon Amjad 1fa6a4409b Family files fixes 3 years ago
Haroon Amjad 134ccb7ee1 Merge branch 'haroon-new-design' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into haroon-new-design 3 years ago
haroon amjad 587210ee58 UI fixes 3 years ago
haroon amjad a819660536 Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/config/localized_values.dart
3 years ago
haroon amjad 01ccd484f4 Calendar plugin changed 3 years ago
Sultan khan 7e095248c5 Merge branch 'sultan_new_design' into 'development_new_design_2.0'
family files changes

See merge request Cloud_Solution/diplomatic-quarter!428
3 years ago
Sultan Khan 9b94fe33cf Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design 3 years ago
Sikander Saleem 8aa1fbfb4a localized_values fixed. 3 years ago
Sultan Khan 9010558dc9 family files changes 3 years ago
Sikander Saleem 08960867f7 Merge branch 'new_design_sikander' into development_new_design_2.0 3 years ago
Sikander Saleem 2aa6ad5d6b h20 today ui (cont.)1 3 years ago
Sikander Saleem 55df00dcd4 h20 today ui (cont.) 3 years ago
haroon amjad 7264d03818 Family Files previleges fix 3 years ago
Sikander Saleem 763c16ddd0 h2o setting ui redesigned. 3 years ago
haroon amjad 870da89aec Merge branch 'development_new_design_2.0' into haroon-new-design 3 years ago
haroon amjad 259581c4f8 updates & fixes 3 years ago
Mohammad Aljammal 29d0afdea4 Merge branch 'product_detail_page' into 'development'
fix bottom sheet functions

See merge request Cloud_Solution/diplomatic-quarter!424
3 years ago
Mohammad Aljammal 0e5fd1d1ec Merge branch 'fatima-new' into 'development'
Fatima new

See merge request Cloud_Solution/diplomatic-quarter!425
3 years ago
Elham Rababh be21cb352b return recommended products 3 years ago
haroon amjad fa929adfd9 Merge branch 'haroon-new-design' into 'development_new_design_2.0'
Haroon new design

See merge request Cloud_Solution/diplomatic-quarter!427
3 years ago
haroon amjad a7ccc73c36 updates 3 years ago
haroon amjad 96c290c3f3 Localization file updates 3 years ago
haroon amjad 829fcd1461 Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/pages/ErService/rapid-response-team/rrt-order-list-item.dart
3 years ago
haroon amjad 2c4ff16f0c updates & fixes 3 years ago
Sultan khan 0db34ed226 Merge branch 'sultan_new_design' into 'development_new_design_2.0'
Sultan new design

See merge request Cloud_Solution/diplomatic-quarter!426
3 years ago
Sultan Khan 821a9b5ade Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design 3 years ago
Sultan Khan 2c1d7c511e family file changes 3 years ago
haroon amjad 230d87c473 Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/pages/feedback/send_feedback_page.dart
3 years ago
haroon amjad 01ca8b8f84 updates & fixes 3 years ago
Mirza.Shafique cb230db0c5 Merge branch 'mirza_home_page' into development_new_design_2.0 3 years ago
Mirza.Shafique a9773e81e7 Bug Fixes prescription 3 years ago
Sikander Saleem 8b49eed6ae hospital text replaced with branch 3 years ago
Fatimah Alshammari ac63f09633 edit arabic version 3 years ago
Fatimah Alshammari 8baad999c5 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima-new
# Conflicts:
#	lib/config/config.dart
#	lib/pages/parent_categorise_page.dart
#	lib/pages/pharmacies/screens/pharmacy_module_page.dart
#	lib/pages/pharmacies/wishlist.dart
3 years ago
Elham Rababh 8fac62bcb1 fix bottom sheet functions 3 years ago
Fatimah Alshammari 74929f76e5 edit home page 3 years ago
Mohammad Aljammal bcd99555e3 Merge branch 'pharmacy_fix_bugs' into 'development'
Pharmacy fix bugs

See merge request Cloud_Solution/diplomatic-quarter!423
3 years ago
mosazaid 988625e4f1 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy_fix_bugs 3 years ago
mosazaid c1f3d3cc1c fixes 3 years ago
Mohammad Aljammal ad8fd65f75 Merge branch 'product_detail_page' into 'development'
add count to cart

See merge request Cloud_Solution/diplomatic-quarter!422
3 years ago