Commit Graph

2262 Commits (a59c60f79a2ed5d0bbf3c1a238697940530ce771)
 

Author SHA1 Message Date
Sultan Khan a59c60f79a Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design 3 years ago
Sultan Khan 496c6ce32e registration done 3 years ago
Mirza.Shafique a766c2522e Child Vaccine 1.0 3 years ago
Mirza.Shafique 41db218e9a oder log merge fix 3 years ago
Mirza.Shafique d3698a0e74 Merge branch 'mirza_home_page' into development_new_design_2.0
# Conflicts:
#	lib/pages/AlHabibMedicalService/HomeHealthCare/NewHomeHealthCare/new_Home_health_care_step_one_page.dart
#	lib/pages/AlHabibMedicalService/HomeHealthCare/orders_log_details_page.dart
3 years ago
Mirza.Shafique 3d480bac5c design fixes 3 3 years ago
haroon amjad 0eeaa5e301 Merge branch 'haroon-new-design' into 'development_new_design_2.0'
Haroon new design

See merge request Cloud_Solution/diplomatic-quarter!447
3 years ago
haroon amjad 4b0382d7c4 Merge branch 'development_new_design_2.0' into haroon-new-design 3 years ago
haroon amjad 12a58856e5 Chart fix & In-App update implemented 3 years ago
Mirza.Shafique a273bacc17 design fixes 1.1 3 years ago
Sikander Saleem 4dca22bec1 Merge branch 'new_design_sikander' into development_new_design_2.0 3 years ago
Sikander Saleem afad83182d h20 dialog ui changes 3 years ago
haroon amjad 0c895348e7 my family fix 3 years ago
haroon amjad a710406317 Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/NewCMC/new_cmc_page.dart
#	lib/pages/DrawerPages/family/my-family.dart
3 years ago
haroon amjad 75d3751719 Offers API 3 years ago
haroon amjad 494b1f221d Updates & fixes 3 years ago
Mirza.Shafique 792bb4df0b Merge branch 'mirza_home_page' into development_new_design_2.0
# Conflicts:
#	lib/pages/medical/my_trackers/Weight/WeightMonthlyPage.dart
#	lib/pages/medical/my_trackers/Weight/WeightWeeklyPage.dart
#	lib/pages/medical/my_trackers/Weight/WeightYeaPage.dart
3 years ago
Mirza.Shafique 0ba4e9047b design fixes 1.0 3 years ago
haroon amjad 8001c0140c Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/pages/medical/my_trackers/Weight/WeightWeeklyPage.dart
3 years ago
haroon amjad 1858be18b7 Feedback Status fixes 3 years ago
Sikander Saleem 554b9558b1 add reminder & send mail button color change. 3 years ago
Sikander Saleem 14ccae993e my tracker tabs switching issue fixed. 3 years ago
Haroon Amjad 59dac89118 updates 3 years ago
haroon amjad ade3cb0899 File no & UI changes 3 years ago
haroon amjad 1dcfe44e96 Translations 3 years ago
haroon amjad 2ed8008790 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_new_design_2.0 3 years ago
haroon amjad 832d48971f updates 3 years ago
Mirza.Shafique 4cf9a9b2c2 Merge branch 'mirza_home_page' into development_new_design_2.0
# Conflicts:
#	lib/config/localized_values.dart
3 years ago
Mirza.Shafique 3dbef4095f Payment page design 3 years ago
Sikander Saleem ba4792cd38 merge improvements. 3 years ago
Sikander Saleem 706832a1cb Merge branch 'development' into development_new_design_2.0
# Conflicts:
#	lib/config/config.dart
#	lib/config/localized_values.dart
#	lib/core/service/client/base_app_client.dart
#	lib/core/service/parmacyModule/parmacy_module_service.dart
#	lib/core/service/parmacyModule/prescription_service.dart
#	lib/core/viewModels/pharmacyModule/pharmacy_module_view_model.dart
#	lib/core/viewModels/pharmacyModule/product_detail_view_model.dart
#	lib/locator.dart
#	lib/main.dart
#	lib/pages/final_products_page.dart
#	lib/pages/landing/home_page.dart
#	lib/pages/parent_categorise_page.dart
#	lib/pages/pharmacies/product_detail.dart
#	lib/pages/pharmacies/screens/cart-order-preview.dart
#	lib/pages/pharmacies/screens/pharmacy_module_page.dart
#	lib/pages/pharmacies/widgets/ProductTileItem.dart
#	lib/pages/search_products_page.dart
#	lib/services/pharmacy_services/product_detail_service.dart
#	lib/uitl/translations_delegate_base.dart
#	lib/widgets/buttons/secondary_button.dart
#	lib/widgets/others/app_scaffold_widget.dart
#	lib/widgets/others/app_scafold_detail_page.dart
#	lib/widgets/pharmacy/bottom_nav_pharmacy_bar.dart
3 years ago
haroon amjad a4800ce7ca Merge branch 'haroon-new-design' into 'development_new_design_2.0'
Haroon new design

See merge request Cloud_Solution/diplomatic-quarter!446
3 years ago
haroon amjad 43a672cc68 Updates & fixes 3 years ago
haroon amjad 5d44fff28d Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/config/localized_values.dart
#	lib/uitl/translations_delegate_base.dart
3 years ago
haroon amjad 5f963b0327 Translation updates, CMC, HHC & RRT APIs updates 3 years ago
Mirza.Shafique ab6f7b8915 Merge branch 'mirza_home_page' into development_new_design_2.0
# Conflicts:
#	lib/config/localized_values.dart
3 years ago
Mirza.Shafique eeaf7d9d2f HMG Services Detail View 3 years ago
Sikander Saleem f13871de9a find us and prescription availability hospital location ui changes, 3 years ago
haroon amjad ed4fca2d4c Merge branch 'fatima-new' into 'development'
Fatima new

See merge request Cloud_Solution/diplomatic-quarter!444
3 years ago
haroon amjad 2709b177c6 Merge branch 'pharmacy_fix' into 'development'
add to cart fix

See merge request Cloud_Solution/diplomatic-quarter!435
3 years ago
haroon amjad babb48b1db base app client changes 3 years ago
haroon amjad 68642c3ba4 Merge branch 'haroon-new-design' into 'development_new_design_2.0'
Haroon new design

See merge request Cloud_Solution/diplomatic-quarter!445
3 years ago
haroon amjad cf7291e379 Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/config/localized_values.dart
3 years ago
haroon amjad 03882c166c Translation & UI updates 3 years ago
haroon amjad 90843252c3 Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/config/localized_values.dart
#	lib/pages/AlHabibMedicalService/E-Referral/New_E_Referral/new_e_referral_step_two_page.dart
#	lib/pages/AlHabibMedicalService/E-Referral/search_for_referrals_page.dart
#	lib/uitl/translations_delegate_base.dart
3 years ago
Fatimah Alshammari 9cf0794cf6 Fixed out of stuck items issues 3 years ago
Sultan khan e4c8575a7f Merge branch 'sultan_new_design' into 'development_new_design_2.0'
Sultan new design

See merge request Cloud_Solution/diplomatic-quarter!443
3 years ago
Sultan Khan 18f35a22bb FAMILY FILE 3 years ago
Sultan Khan 5a9ab457e5 family files 3 years ago
haroon amjad 6d3ead24e1 localisation update 3 years ago