Fatimah.Alshammari
|
250af1506c
|
Merge branch 'master' into fatima
# Conflicts:
# lib/core/dependencies.dart
# lib/presentation/medical_file/medical_file_page.dart
# lib/routes/app_routes.dart
# lib/services/dialog_service.dart
# lib/theme/colors.dart
|
9 months ago |
|
Fatimah.Alshammari
|
20e4f82df3
|
Merge branch 'master' into fatima
# Conflicts:
# lib/core/dependencies.dart
# lib/main.dart
# lib/presentation/hmg_services/services_page.dart
# lib/presentation/medical_file/medical_file_page.dart
# lib/routes/app_routes.dart
|
9 months ago |
|
Fatimah.Alshammari
|
8ae81d2b24
|
fixed parking qr
|
9 months ago |
|
Fatimah.Alshammari
|
11de01e079
|
Merge branch 'refs/heads/master' into fatima
# Conflicts:
# lib/presentation/hmg_services/services_page.dart
# lib/routes/app_routes.dart
# lib/theme/colors.dart
|
9 months ago |
|
Fatimah.Alshammari
|
62bb667cb8
|
added parking part
|
9 months ago |
|
Fatimah.Alshammari
|
f3674ba06f
|
Merge branch 'refs/heads/master' into fatima
# Conflicts:
# lib/core/dependencies.dart
# lib/presentation/hmg_services/services_page.dart
# lib/routes/app_routes.dart
|
10 months ago |
|
Fatimah.Alshammari
|
a53602dc8c
|
added monthly report
|
10 months ago |
|
Fatimah.Alshammari
|
7a03242396
|
added monthly report
|
10 months ago |
|
Fatimah.Alshammari
|
68f044de52
|
added monthly report
|
10 months ago |
|
Fatimah.Alshammari
|
c9de23347a
|
fix error
|
10 months ago |
|
Fatimah.Alshammari
|
190492a191
|
Merge branch 'refs/heads/master' into fatima
# Conflicts:
# lib/routes/app_routes.dart
|
10 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
|
10 months ago |
|
Fatimah.Alshammari
|
0b3fea230f
|
monthly report
|
10 months ago |
|
Fatimah.Alshammari
|
86a91ab383
|
Merge branch 'refs/heads/master' into fatima
|
11 months ago |
|
Fatimah.Alshammari
|
89ff10f506
|
Merge branch 'refs/heads/master' into fatima
# Conflicts:
# lib/core/dependencies.dart
# lib/main.dart
# lib/theme/colors.dart
|
11 months ago |
|
Fatimah.Alshammari
|
8191852f4d
|
Merge branch 'refs/heads/master' into fatima
# Conflicts:
# lib/core/dependencies.dart
# lib/main.dart
|
11 months ago |
|
Fatimah.Alshammari
|
e17d3cde87
|
fix toggle
|
11 months ago |
|
Fatimah.Alshammari
|
77242825bb
|
fix toggle
|
11 months ago |
|
Fatimah.Alshammari
|
27ad4e0764
|
Merge branch 'refs/heads/master' into fatima
# Conflicts:
# lib/core/utils/utils.dart
# lib/presentation/emergency_services/call_ambulance/tracking_screen.dart
# lib/presentation/home/landing_page.dart
|
11 months ago |
|
Fatimah.Alshammari
|
eae16eec44
|
active medication
|
11 months ago |
|
Fatimah.Alshammari
|
3f123d12d6
|
Merge remote-tracking branch 'refs/remotes/origin/master' into fatima
# Conflicts:
# lib/core/api_consts.dart
# lib/core/utils/utils.dart
# lib/main.dart
|
12 months ago |
|
Fatimah.Alshammari
|
de8c7bc605
|
active medication
|
12 months ago |
|
Fatimah.Alshammari
|
cb56503622
|
Merge remote-tracking branch 'refs/remotes/origin/master' into fatima
|
1 year ago |
|
Fatimah.Alshammari
|
e8319a0d3f
|
active medication
|
1 year ago |