Commit Graph

610 Commits (e53ba65dddfd332ea0a57e4748ec3cfcd010a9f1)

Author SHA1 Message Date
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
Fatimah Alshammari 044f74865e fixed issues 4 years ago
Fatimah Alshammari 42e74759e4 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Fatima-New-Design
# Conflicts:
#	lib/pages/search_products_page.dart
4 years ago
Fatimah Alshammari e6378b7ada fix issues 4 years ago
Zohaib Iqbal Kambrani 94a5cac27d Merge branch 'development_new_design_2.0' into zik_new_design_2.0
* development_new_design_2.0:
  LiveCare Schedule fixes
  improvements.
  live care design 3.0
  dialog ui changes in wallet & improvements.
  LiveCare Schedule API fix
  live care design 2.0
  Health converters UI done
  Health Calculators APIs updated
  Translation updates
  SessionID update
  live care design 1.0
  Updates & fixes
  blood sugar dialog improvement.

# Conflicts: Rseloved
#	lib/config/localized_values.dart
#	lib/core/service/client/base_app_client.dart
#	lib/uitl/translations_delegate_base.dart
4 years ago
Zohaib Iqbal Kambrani 9d71793e88 no message 4 years ago
Sikander Saleem 8c27773f7f Merge branch 'new_design_sikander' into development_new_design_2.0 4 years ago
Sikander Saleem 40c63ae53b dialog ui changes in wallet & improvements. 4 years ago
haroon amjad 2a212149ed Health converters UI done 4 years ago
haroon amjad 73822300f9 Health Calculators APIs updated 4 years ago
haroon amjad 7123ed34ab Translation updates 4 years ago
Mirza.Shafique cacdd5907c Merge branch 'mirza_home_page' into development_new_design_2.0 4 years ago
Mirza.Shafique fd26a59b2d live care design 1.0 4 years ago
haroon amjad b08dfb117c Updates & fixes 4 years ago
haroon amjad 5474ecf2cc Translation update 4 years ago
haroon amjad 2cff7c3246 LiveCare design fixes 4 years ago
haroon amjad 6f92a093ab Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/config/config.dart
4 years ago
haroon amjad e58b925382 Merge branch 'development' into haroon-new-design
# Conflicts:
#	lib/pages/pharmacies/screens/cart-order-page.dart
4 years ago
Fatimah Alshammari a4f404386b fixed issues 4 years ago
Zohaib Iqbal Kambrani 8b1ac05012 Merge branch 'development_new_design_2.0' into zik_new_design_2.0
* development_new_design_2.0: (105 commits)
  app bar back icon issue
  improvements
  emergency nearest ui changes
  Zoom Avatar implementation
  no message
  Child Vaccine 3
  register
  register page
  Working on Health data
  Child Vaccine 2
  registration
  Ereferral fixed, HHC moved to new APIs, Notification new design implemented
  registration done
  Child Vaccine 1.0
  In App Review
  In App Review
  oder log merge fix
  design fixes 3
  Chart fix & In-App update implemented
  design fixes 1.1
  ...

# Conflicts:
#	lib/config/config.dart
#	lib/pages/landing/fragments/home_page_fragment2.dart
4 years ago
haroon amjad be91844868 Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
haroon amjad 30c6f1dedb Updates 4 years ago
Sikander Saleem 7641da8122 Merge branch 'new_design_sikander' into development_new_design_2.0
# Conflicts:
#	lib/widgets/hospital_location.dart
4 years ago
Sikander Saleem 7c4edf971a emergency nearest ui changes 4 years ago
haroon amjad 1fff2dad25 Smartwatch updates 4 years ago
Zohaib Iqbal Kambrani aad071ac67 Packages and Offers apply token 4 years ago
haroon amjad b52c719351 Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
haroon amjad 1f077f71f8 no message 4 years ago
Mirza.Shafique 957ff9039b Merge branch 'mirza_home_page' into development_new_design_2.0 4 years ago
Mirza.Shafique 1a6802ce24 Child Vaccine 3 4 years ago
haroon amjad 5287260b85 Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/config/localized_values.dart
4 years ago
Sultan Khan c14f40dae2 register page 4 years ago
haroon amjad 983fb55747 Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/uitl/translations_delegate_base.dart
4 years ago
haroon amjad 2032053cb7 Working on Health data 4 years ago
haroon amjad 3db4094585 Ereferral fixed, HHC moved to new APIs, Notification new design implemented 4 years ago
Sultan Khan a59c60f79a Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design 4 years ago
Sultan Khan 496c6ce32e registration done 4 years ago
haroon amjad 494b1f221d Updates & fixes 4 years ago
haroon amjad 1dcfe44e96 Translations 4 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
4 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
4 years ago
haroon amjad 5f963b0327 Translation updates, CMC, HHC & RRT APIs updates 4 years ago
Mirza.Shafique ab6f7b8915 Merge branch 'mirza_home_page' into development_new_design_2.0
# Conflicts:
#	lib/config/localized_values.dart
4 years ago
Mirza.Shafique eeaf7d9d2f HMG Services Detail View 4 years ago
Sikander Saleem f13871de9a find us and prescription availability hospital location ui changes, 4 years ago
haroon amjad cf7291e379 Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/config/localized_values.dart
4 years ago
haroon amjad 03882c166c Translation & UI updates 4 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
4 years ago
Fatimah Alshammari 9cf0794cf6 Fixed out of stuck items issues 4 years ago
haroon amjad 6d3ead24e1 localisation update 4 years ago
Sultan Khan a31f55aaa7 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design 4 years ago
Sultan Khan 4780039cc7 family file change 4 years ago
Mirza.Shafique e1b79ef5c1 E-Refreal design 4 years ago
haroon amjad e564cdc7e5 Updates & fixes 4 years ago
Sikander Saleem ae85f75e81 Merge branch 'new_design_sikander' into development_new_design_2.0
# Conflicts:
#	lib/config/localized_values.dart
#	lib/pages/feedback/status_feedback_page.dart
#	lib/uitl/translations_delegate_base.dart
4 years ago
Sikander Saleem a026fbf940 feedback status added. 4 years ago
haroon amjad e1f5eb8b83 Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/config/localized_values.dart
4 years ago
haroon amjad 8ea6a5de04 localization fix 4 years ago
Sikander Saleem 54c3beadf2 improvements. 4 years ago
Sikander Saleem 8f371f87d2 Merge branch 'mirza_home_page' into development_new_design_2.0
# Conflicts:
#	lib/config/localized_values.dart
#	lib/uitl/translations_delegate_base.dart
4 years ago
Mirza.Shafique dde16a13fe General page in profile 4 years ago
haroon amjad 4a2e01b8b1 Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
haroon amjad b475adb5c3 Updates & fixes 4 years ago
Sultan Khan 5c8b809e39 family file fixes 4 years ago
Mirza.Shafique d664a216c6 Profile Page and Back Button Click 4 years ago
haroon amjad cbf2e84959 fixes 4 years ago
haroon amjad a819660536 Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/config/localized_values.dart
4 years ago
haroon amjad 01ccd484f4 Calendar plugin changed 4 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
4 years ago
Sikander Saleem 8aa1fbfb4a localized_values fixed. 4 years ago
Sultan Khan 9010558dc9 family files changes 4 years ago
Sikander Saleem 08960867f7 Merge branch 'new_design_sikander' into development_new_design_2.0 4 years ago
Sikander Saleem 55df00dcd4 h20 today ui (cont.) 4 years ago
Sikander Saleem 763c16ddd0 h2o setting ui redesigned. 4 years ago
haroon amjad 96c290c3f3 Localization file updates 4 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
4 years ago
Sultan Khan 821a9b5ade Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design 4 years ago
Sultan Khan 2c1d7c511e family file changes 4 years ago
haroon amjad 230d87c473 Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/pages/feedback/send_feedback_page.dart
4 years ago
Sikander Saleem 8b49eed6ae hospital text replaced with branch 4 years ago
Elham Rababh 3dc28d318a fix bugs on wish list 4 years ago
haroon amjad 2690bddcac Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/pages/MyAppointments/AppointmentDetails.dart
#	lib/uitl/translations_delegate_base.dart
4 years ago
haroon amjad 5163c826ad Updates & fixes 4 years ago
Sikander Saleem 6099738a5c improvements 4 years ago
Haroon Amjad 19edcc210e Rate appointment UI implemented 4 years ago
haroon amjad 89e1aa70c0 updates 4 years ago
Haroon Amjad 062ca5c11c EReferral fixes 4 years ago
Haroon Amjad abcb71e86e Invoice details UI revamped 4 years ago
hussam al-habibeh dbf7ebf287 fix most viewed & best sellers moduls 4 years ago
haroon amjad 0955a22616 Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
haroon amjad fa8c739b2c updates & fixes 4 years ago
haroon amjad 46d800c0c6 UI updates & fixes 4 years ago
Mirza.Shafique ef8006efd8 Merge branch 'mirza_home_page' into development_new_design_2.0
# Conflicts:
#	lib/pages/Covid-DriveThru/Covid-TimeSlots.dart
#	lib/pages/Covid-DriveThru/covid-dirvethru-questions.dart
#	lib/pages/Covid-DriveThru/covid-payment-alert.dart
#	lib/pages/Covid-DriveThru/covid-payment-details.dart
#	lib/pages/Covid-DriveThru/covid-payment-summary.dart
4 years ago
Mirza.Shafique 5b330b2a25 Covid New Design 4 years ago
haroon amjad c3feed771c merge conflicts resolved 4 years ago
haroon amjad 5c64ce4795 Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/config/localized_values.dart
#	lib/pages/BookAppointment/DoctorProfile.dart
#	lib/pages/MyAppointments/SchedulePage.dart
#	lib/uitl/translations_delegate_base.dart
4 years ago
Sultan Khan c54146b3ba sechedule fix 4 years ago
haroon amjad a075d53dd5 UI updates & fixes 4 years ago
haroon amjad 728c22cc68 Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/config/localized_values.dart
#	lib/pages/insurance/insurance_approval_screen.dart
#	lib/uitl/translations_delegate_base.dart
4 years ago