Commit Graph

8 Commits (bb4719bd8747b27cd6f663b6ed842e41ef8bceda)

Author SHA1 Message Date
Fatimah.Alshammari c9de23347a fix error 2 months ago
Fatimah.Alshammari 3d8daeb58d Merge branch 'refs/heads/master' into fatima
# Conflicts:
#	lib/core/app_assets.dart
#	lib/core/dependencies.dart
#	lib/core/utils/calendar_utils.dart
#	lib/features/hmg_services/models/ui_models/hmg_services_component_model.dart
#	lib/main.dart
#	lib/presentation/hmg_services/services_page.dart
#	lib/presentation/hmg_services/services_view.dart
#	lib/presentation/medical_file/medical_file_page.dart
#	lib/routes/app_routes.dart
#	lib/theme/colors.dart
#	pubspec.yaml
2 months ago
Fatimah.Alshammari 0b3fea230f monthly report 2 months ago
haroon amjad d202aa8423 Smartwatch integration started 2 months ago
haroon amjad a83a35a284 Services Page Revamp 2 months ago
Sultan khan 9e0336687c virtual tour. 2 months ago
faizatflutter 721bf95c1b Comprehensive checkup in progress 2 months ago
Sultan khan 171bd644d1 e-referral work in progress. 3 months ago