Commit Graph

21 Commits (c921228ad9730b758aba1b11fdad86e6fe3249b7)

Author SHA1 Message Date
aamir-csol c921228ad9 Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/presentation/book_appointment/select_clinic_page.dart
#	lib/presentation/health_calculators/health_calculator_result.dart
4 weeks ago
aamir-csol f509a09b34 Health calculators & converters 4 weeks ago
haroon amjad 450f07d39d updates & fixes 1 month ago
haroon amjad a80410d64b LiveCare flow from clinic selection implemented 1 month ago
haroon amjad 3060c57201 updates 1 month ago
haroon amjad f1004f39af Merge branch 'master' into haroon_dev 1 month ago
aamir-csol 7d71d994ea Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/core/app_assets.dart
#	lib/core/enums.dart
#	lib/core/utils/calender_utils_new.dart
#	lib/main.dart
#	lib/presentation/hmg_services/services_page.dart
#	lib/presentation/hmg_services/services_view.dart
#	lib/routes/app_routes.dart
1 month ago
aamir-csol 335e6a6649 Health Calculators 1 month ago
haroon amjad eff6cbbaad updates & fixes 1 month ago
haroon amjad d202aa8423 Smartwatch integration started 1 month ago
faizatflutter 449c338c46 refactor 1 month ago
faizatflutter 5fd1905d8c Complete UserInfo Selection Module 1 month ago
haroon amjad a83a35a284 Services Page Revamp 1 month ago
haroon amjad e72e67d9bf Appointment Queue implemented, Blood Donation implementation contd. 1 month ago
Sultan khan 9e0336687c virtual tour. 2 months ago
haroon amjad 63d844a5e9 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/core/api/api_client.dart
#	lib/core/api_consts.dart
#	lib/core/dependencies.dart
#	lib/features/radiology/radiology_view_model.dart
#	lib/presentation/appointments/appointment_details_page.dart
#	lib/presentation/emergency_services/history/widget/ambulance_history_item.dart
#	lib/presentation/emergency_services/history/widget/rrt_item.dart
2 months ago
faizatflutter fe00447483 HHC in Progress 2 months ago
haroon amjad b13adde9d2 send feedback implementation done 2 months ago
faizatflutter 721bf95c1b Comprehensive checkup in progress 2 months ago
Sultan khan 171bd644d1 e-referral work in progress. 2 months ago
haroon amjad d693850ef4 ER services implementation contd. 3 months ago