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
|
1 month ago |
haroon amjad
|
ff98262cf7
|
Merge branch 'master' into haroon_dev
# Conflicts:
# lib/presentation/home/landing_page.dart
|
1 month ago |
haroon amjad
|
796aeb03d3
|
Ancillary order fixes, QLine API integrated & other enhancements
|
1 month ago |
faizatflutter
|
c7c0a0ac09
|
Added user_info module IAP
|
1 month ago |
haroon amjad
|
e72e67d9bf
|
Appointment Queue implemented, Blood Donation implementation contd.
|
1 month ago |
faizatflutter
|
2ffd4cc1ae
|
Integrated the API for Symptoms Checker
|
1 month ago |
faizatflutter
|
e35fe9ac05
|
Merge branch 'master' into faiz_dev
# Conflicts:
# lib/core/dependencies.dart
# lib/presentation/home/landing_page.dart
# lib/presentation/lab/lab_orders_page.dart
# lib/routes/app_routes.dart
# lib/widgets/appbar/collapsing_list_view.dart
|
1 month ago |
haroon amjad
|
581a4a5a74
|
WalkIn Appointment implementation done
|
1 month ago |
haroon amjad
|
36bf63dcde
|
Incoming call updates
|
1 month ago |
haroon amjad
|
5a1c58e6b2
|
Merge branch 'master' into haroon_dev
|
2 months ago |
haroon amjad
|
1e5744cf44
|
Updates & enhancements
|
2 months ago |
Fatimah.Alshammari
|
86a91ab383
|
Merge branch 'refs/heads/master' into fatima
|
2 months ago |
Sultan khan
|
9e0336687c
|
virtual tour.
|
2 months ago |
faizatflutter
|
757ace2ba1
|
Added Organ Selector
|
2 months ago |
haroon amjad
|
9fd7f71a34
|
prescription delivery implementation contd
|
2 months ago |
Fatimah.Alshammari
|
89ff10f506
|
Merge branch 'refs/heads/master' into fatima
# Conflicts:
# lib/core/dependencies.dart
# lib/main.dart
# lib/theme/colors.dart
|
2 months ago |
haroon amjad
|
b13adde9d2
|
send feedback implementation done
|
2 months ago |
haroon amjad
|
938463aabc
|
Merge branch 'master' into haroon_dev
# Conflicts:
# lib/core/utils/date_util.dart
|
2 months ago |
haroon amjad
|
9f845f1de8
|
Feedback page implementation contd.
|
2 months ago |
tahaalam
|
31261092a8
|
rrt request creation and history listing
|
2 months ago |
Fatimah.Alshammari
|
8191852f4d
|
Merge branch 'refs/heads/master' into fatima
# Conflicts:
# lib/core/dependencies.dart
# lib/main.dart
|
2 months ago |
Haroon Amjad
|
37a0692be4
|
Merge branch 'haroon_dev' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into haroon_dev
|
2 months ago |
haroon amjad
|
f9f17f3a76
|
LiveChat implemented
|
2 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
|
2 months ago |
Fatimah.Alshammari
|
eae16eec44
|
active medication
|
2 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
|
2 months ago |
faizatflutter
|
617b68021a
|
Merge branch 'master' into faiz_dev
# Conflicts:
# lib/core/api/api_client.dart
# lib/core/dependencies.dart
# lib/main.dart
# lib/presentation/appointments/appointment_payment_page.dart
|
2 months ago |
tahaalam
|
a669265076
|
Merge remote-tracking branch 'origin/master' into ambulance_listing_and_request
# Conflicts:
# lib/core/api/api_client.dart
# lib/core/dependencies.dart
# lib/features/emergency_services/emergency_services_repo.dart
# lib/features/emergency_services/emergency_services_view_model.dart
# lib/features/emergency_services/models/resp_model/EROnlineCheckInPaymentDetailsResponse.dart
# lib/main.dart
# lib/presentation/emergency_services/call_ambulance/call_ambulance_page.dart
# lib/presentation/emergency_services/call_ambulance/widgets/HospitalBottomSheetBody.dart
# lib/presentation/emergency_services/call_ambulance/widgets/type_selection_widget.dart
# lib/presentation/emergency_services/emergency_services_page.dart
# lib/widgets/input_widget.dart
|
2 months ago |
haroon amjad
|
2a6c7fc0a1
|
Find us implemented
|
2 months ago |
tahaalam
|
5b0a8ad898
|
cancel and listing request added
|
2 months ago |
haroon amjad
|
9a48421271
|
ER Online Check-In implemented
|
2 months ago |
faizatflutter
|
100d4bda9f
|
Completed Ancillary flow with CardPayments
|
2 months ago |
haroon amjad
|
f280d4a28a
|
todo page implementation started
|
2 months ago |
haroon amjad
|
d3a8d545b2
|
Merge branch 'master' into haroon_dev
# Conflicts:
# lib/presentation/medical_file/medical_file_page.dart
# lib/presentation/my_family/widget/family_cards.dart
|
2 months ago |
haroon amjad
|
8dcc8dfbe3
|
updates
|
2 months ago |
faizatflutter
|
f96f3e563c
|
Fixed App CustomChip
|
2 months ago |
faizatflutter
|
b698b74eb5
|
Design Updates
|
2 months ago |
faizatflutter
|
8c956fc052
|
Design changes
|
3 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
|
3 months ago |
Fatimah.Alshammari
|
de8c7bc605
|
active medication
|
3 months ago |
faizatflutter
|
3e61df218b
|
Some Minor design updated
|
3 months ago |
faizatflutter
|
eabfaf8182
|
Design Updates
|
3 months ago |
haroon amjad
|
d693850ef4
|
ER services implementation contd.
|
3 months ago |
Fatimah.Alshammari
|
cb56503622
|
Merge remote-tracking branch 'refs/remotes/origin/master' into fatima
|
3 months ago |
Fatimah.Alshammari
|
e8319a0d3f
|
active medication
|
3 months ago |
haroon amjad
|
b27e3268b1
|
Merge branch 'master' into haroon_dev
# Conflicts:
# lib/presentation/home/landing_page.dart
# lib/presentation/medical_file/medical_file_page.dart
# lib/widgets/chip/app_custom_chip_widget.dart
|
3 months ago |
haroon amjad
|
25fa1acc9e
|
Medical file widgets, Insurance approval implementation contd.
|
3 months ago |
aamir-csol
|
24362f67cb
|
family screen & widgets
|
3 months ago |
aamir-csol
|
aaa8222b1a
|
Merge branch 'master' into dev_aamir
# Conflicts:
# lib/core/api/api_client.dart
# lib/core/app_assets.dart
# lib/features/medical_file/medical_file_repo.dart
# lib/features/medical_file/medical_file_view_model.dart
# lib/presentation/home/landing_page.dart
# lib/presentation/medical_file/medical_file_page.dart
# lib/presentation/profile_settings/profile_settings.dart
# lib/widgets/chip/app_custom_chip_widget.dart
|
3 months ago |
aamir-csol
|
d918b6e464
|
family screen & widgets
|
3 months ago |