faizatflutter
|
fd88e8f381
|
Merge branch 'master' into faiz_dev
# Conflicts:
# lib/core/api/api_client.dart
# lib/core/api_consts.dart
# lib/generated/locale_keys.g.dart
|
4 weeks ago |
|
faizatflutter
|
47b733c186
|
fixed strings bugs
|
4 weeks ago |
 haroon amjad
|
6abcdf135e
|
Clarity implementation, LiveCare update insurance API implemented
|
1 month ago |
 Aamir Muhammad
|
217b423308
|
OTP Changes & Drop Down Fixes.
|
2 months ago |
|
Aamir Muhammad
|
1ff91bb159
|
Image Functionality & Discounts & Offers
|
2 months ago |
|
Aamir Muhammad
|
7cd1d84ff6
|
Image Functionality & Discounts & Offers
|
2 months ago |
|
haroon amjad
|
c9406aa66d
|
Updates & http client enhancements
|
3 months ago |
aamir-csol
|
dfd7160030
|
Medical File Navigation & Keyboard Fix
|
3 months ago |
|
haroon amjad
|
16f3298f37
|
Added shared preferences check in the prescription reminders
|
3 months ago |
|
haroon amjad
|
2fd4a3e1a7
|
Updates
|
3 months ago |
|
faizatflutter
|
61f17a3feb
|
fixed api localization issue
|
3 months ago |
|
haroon amjad
|
4959392f74
|
Updates
|
4 months ago |
|
haroon amjad
|
3703afe8bd
|
updates
|
4 months ago |
|
haroon amjad
|
1f290c5bfe
|
updates
|
4 months ago |
|
haroon amjad
|
0ed6103b15
|
updates
|
4 months ago |
Haroon Amjad
|
8de8039096
|
updates
|
5 months ago |
|
aamir-csol
|
7296bfb6fc
|
family fil fixes
|
6 months ago |
|
haroon amjad
|
20ed54243b
|
updates
|
6 months ago |
|
aamir-csol
|
a105d87241
|
Merge branch 'master' into dev_aamir
# Conflicts:
# assets/langs/ar-SA.json
# assets/langs/en-US.json
# lib/features/authentication/authentication_view_model.dart
# lib/generated/locale_keys.g.dart
|
6 months ago |
|
aamir-csol
|
2c7f4ddc48
|
Ai Analysis & PMA-(1078,1079)
|
6 months ago |
|
haroon amjad
|
85ccf41d04
|
Updates & fixes for Habib Wallet, Insurance update, Immediate LiveCare
|
6 months ago |
|
haroon amjad
|
cfd0c16738
|
updates & fixes
|
6 months ago |
|
Haroon Amjad
|
537d93915e
|
Zoom SDK fixes
|
6 months ago |
|
haroon amjad
|
940ce5ff14
|
updates
|
6 months ago |
|
aamir-csol
|
bb4719bd87
|
logout & family file fix & PMA-1047
|
6 months ago |
|
aamir-csol
|
2bbfe1f131
|
Merge branch 'master' into dev_aamir
# Conflicts:
# lib/presentation/profile_settings/profile_settings.dart
|
6 months ago |
|
haroon amjad
|
f54ce71177
|
translation changes
|
6 months ago |
|
aamir-csol
|
0017c0601b
|
blood donation changes
|
6 months ago |
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
|
7 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
|
7 months ago |
|
faizatflutter
|
49d091547a
|
Till Triage Completed
|
7 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
|
7 months ago |
|
faizatflutter
|
d4dd475e0b
|
Added Graph
|
7 months ago |
|
aamir-csol
|
135b05e561
|
Health calculators & converters
|
7 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
|
7 months ago |
|
aamir-csol
|
0f17a655ed
|
Merge branch 'master' into dev_aamir
# Conflicts:
# ios/Runner/AppDelegate.swift
# lib/core/dependencies.dart
# lib/core/utils/utils.dart
# lib/features/emergency_services/emergency_services_view_model.dart
# lib/presentation/authentication/quick_login.dart
# lib/presentation/emergency_services/RRT/rrt_request_type_select.dart
# lib/presentation/emergency_services/call_ambulance/call_ambulance_page.dart
# lib/presentation/emergency_services/call_ambulance/requesting_services_page.dart
# lib/presentation/emergency_services/call_ambulance/tracking_screen.dart
# lib/presentation/emergency_services/emergency_services_page.dart
# lib/presentation/medical_file/medical_file_page.dart
# lib/presentation/my_family/widget/family_cards.dart
# lib/widgets/appbar/collapsing_list_view.dart
# lib/widgets/common_bottom_sheet.dart
|
8 months ago |
|
Fatimah.Alshammari
|
89ff10f506
|
Merge branch 'refs/heads/master' into fatima
# Conflicts:
# lib/core/dependencies.dart
# lib/main.dart
# lib/theme/colors.dart
|
8 months ago |
|
faizatflutter
|
721bf95c1b
|
Comprehensive checkup in progress
|
8 months ago |
|
Fatimah.Alshammari
|
8191852f4d
|
Merge branch 'refs/heads/master' into fatima
# Conflicts:
# lib/core/dependencies.dart
# lib/main.dart
|
8 months ago |
 tahaalam
|
53be50b40c
|
Merge remote-tracking branch 'origin/master' into ambulance_listing_and_request
# Conflicts:
# lib/core/dependencies.dart
# lib/features/emergency_services/emergency_services_view_model.dart
# lib/presentation/appointments/widgets/appointment_doctor_card.dart
# lib/widgets/common_bottom_sheet.dart
|
8 months ago |
|
tahaalam
|
5b0a8ad898
|
cancel and listing request added
|
9 months ago |
|
faizatflutter
|
100d4bda9f
|
Completed Ancillary flow with CardPayments
|
9 months ago |
|
tahaalam
|
1ca39e1332
|
Ambulance order screens and geocoding request added
|
9 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
|
9 months ago |
|
Fatimah.Alshammari
|
de8c7bc605
|
active medication
|
9 months ago |
|
aamir-csol
|
02ae79c458
|
Merge branch 'refs/heads/master' into dev_aamir
|
9 months ago |
|
faizatflutter
|
21be3a2d06
|
Merge branch 'master' into faiz_dev
# Conflicts:
# lib/core/utils/utils.dart
# lib/presentation/book_appointment/laser/widgets/body_part_listing.dart
# lib/widgets/buttons/custom_button.dart
# lib/widgets/common_bottom_sheet.dart
# lib/widgets/input_widget.dart
|
10 months ago |
|
faizatflutter
|
eabfaf8182
|
Design Updates
|
10 months ago |
|
tahaalam
|
baf7cf0ea0
|
dental routing fixed and laser exception removed
|
10 months ago |
|
aamir-csol
|
58e65e7a64
|
Merge branch 'master' into dev_aamir
|
10 months ago |