Commit Graph

261 Commits (dev_v3.13.6_CS_V2)

Author SHA1 Message Date
Haroon Amjad 84c718656b updates 12 months ago
taha.alam 5a45247df2 WD: scanning screen along with the circular animation 12 months ago
taha.alam 67c472bbe2 WIP: changes on vital sign screen 12 months ago
taha.alam a1595eaec0 WD: CS changes added and icon of navigation added. 12 months ago
taha.alam 0449c65723 Merge remote-tracking branch 'origin/dev_v3.13.6_CS' into dev_v3.13.6_vital_sign
# Conflicts:
#	android/settings.gradle
#	ios/Podfile
#	lib/config/localized_values.dart
#	lib/pages/landing/widgets/services_view.dart
#	lib/uitl/translations_delegate_base.dart
#	lib/vital_signs/vital_sign.dart
12 months ago
taha.alam 77dcc95bac WD: vital sign result screen modified. 12 months ago
sultan khan b287b557dc app icon change 12 months ago
haroon amjad a144d5fafe updates 1 year ago
haroon amjad 65d7f3f9b9 Font family fixes 1 year ago
haroon amjad 291cf16d22 Changes for Laser clinic full body part 1 year ago
haroon amjad 18b4fc5317 Patient app update 1 year ago
haroon amjad b3f2904e9a Waiting appointment implementation contd. 1 year ago
haroon amjad 6c9ab32d98 Native changes 2 years ago
Aamir Muhammad 77651f9652 Merge remote-tracking branch 'origin/Dev_3.3_InPatient_CR' into dev_v3.13.6
# Conflicts:
#	lib/config/config.dart
#	lib/config/localized_values.dart
#	lib/core/service/client/base_app_client.dart
#	lib/core/viewModels/project_view_model.dart
#	lib/pages/BookAppointment/BookSuccess.dart
#	lib/pages/MyAppointments/MyAppointments.dart
#	lib/pages/insurance/AttachInsuranceCardImageDialog.dart
#	lib/pages/login/confirm-login.dart
#	lib/pages/paymentService/payment_service.dart
#	lib/uitl/push-notification-handler.dart
#	lib/uitl/translations_delegate_base.dart
#	lib/uitl/utils.dart
#	lib/uitl/utils_new.dart
#	lib/widgets/avatar/large_avatar.dart
#	lib/widgets/bottom_navigation/bottom_navigation_item.dart
#	lib/widgets/bottom_options/BottomSheet.dart
#	lib/widgets/data_display/medical/medical_profile_item.dart
#	lib/widgets/drawer/app_drawer_widget.dart
#	pubspec.yaml
2 years ago
Sultan khan 8c46d2577d updated with assets 2 years ago
haroon amjad f2bf57f8cc updates 2 years ago
haroon amjad 128bd2ec54 Inpatient services implementation 3 years ago
haroon amjad 4ecab57173 Pharma LiveCare updates 3 years ago
haroon amjad 52070c8f94 Updates & fixes 3 years ago
haroon amjad 3709ebcb32 Updates 3 years ago
haroon amjad 21cf9da900 HMS Core & LiveCare Schedule fixes 3 years ago
haroon amjad b641f5b6a3 Laser Male back image added 4 years ago
haroon amjad aae48f2555 Android permission dialog updates 4 years ago
haroon amjad 907181a56c Merge branch 'development_v2.5' into haroon_development_2.5
# Conflicts:
#	lib/config/localized_values.dart
#	lib/pages/medical/balance/confirm_payment_page.dart
#	lib/uitl/translations_delegate_base.dart
4 years ago
haroon amjad 742d06976f no message 4 years ago
Haroon Amjad 1cb7eb2afb CS branch changes 4 years ago
haroon amjad ea8d700d22 updates & fixes 4 years ago
haroon amjad efced34ffa Updates 4 years ago
Zohaib Iqbal Kambrani ab8b62bc3a Packages and offers fixes, HMG Internet work in progress, 4 years ago
Fatimah Alshammari a55ca33c1b Merge branch 'development_new_design_2.0' into Fatima-New-Design
# Conflicts:
#	lib/pages/search_products_page.dart
#	lib/widgets/pharmacy/product_tile.dart
4 years ago
Fatimah Alshammari 9d9377d59f fix issues 4 years ago
haroon amjad 75423e5501 Updates 4 years ago
haroon amjad cf27c3e796 Incoming call & LiveCare pending UI revamped 4 years ago
Fatimah Alshammari d25f888c3e Merge branch 'development_new_design_2.0' into Fatima-New-Design
# Conflicts:
#	lib/pages/pharmacies/screens/lakum-main-page.dart
4 years ago
Fatimah Alshammari a858d8764a fixed issues 4 years ago
Sikander Saleem 53e0165286 improvements. 4 years ago
Sikander Saleem 7df0fc59df laser images change & offer and packages 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
devmirza121 0b8600605b Health Calculator 1.0 4 years ago
haroon amjad 8c99bba17b Merge branch 'development_new_design_2.0' into haroon-new-design 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
haroon amjad 5692bc66a9 Removing anatomy pub from project 4 years ago
haroon amjad 0853ecdc27 Body added 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
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 5e5f540431 Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/config/config.dart
4 years ago
haroon amjad b08dfb117c Updates & fixes 4 years ago