Commit Graph

39 Commits (9a93e2ea1a62ccbf6d937dd7dc40d6bd0aed0a6c)

Author SHA1 Message Date
haroon amjad 3703afe8bd updates 2 months ago
haroon amjad 1f290c5bfe updates 2 months ago
haroon amjad 0ed6103b15 updates 3 months ago
Haroon Amjad 8de8039096 updates 3 months ago
aamir-csol 7296bfb6fc family fil fixes 4 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
4 months ago
aamir-csol 2c7f4ddc48 Ai Analysis & PMA-(1078,1079) 4 months ago
haroon amjad 85ccf41d04 Updates & fixes for Habib Wallet, Insurance update, Immediate LiveCare 4 months ago
haroon amjad 940ce5ff14 updates 5 months ago
aamir-csol bb4719bd87 logout & family file fix & PMA-1047 5 months ago
aamir-csol 2bbfe1f131 Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/presentation/profile_settings/profile_settings.dart
5 months ago
haroon amjad f54ce71177 translation changes 5 months ago
aamir-csol 0017c0601b blood donation changes 5 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
5 months ago
faizatflutter 49d091547a Till Triage Completed 5 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
6 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
6 months ago
Fatimah.Alshammari 8191852f4d Merge branch 'refs/heads/master' into fatima
# Conflicts:
#	lib/core/dependencies.dart
#	lib/main.dart
7 months ago
tahaalam 5b0a8ad898 cancel and listing request added 7 months ago
tahaalam 1ca39e1332 Ambulance order screens and geocoding request added 7 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
8 months ago
Fatimah.Alshammari de8c7bc605 active medication 8 months ago
aamir-csol 02ae79c458 Merge branch 'refs/heads/master' into dev_aamir 8 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
8 months ago
faizatflutter eabfaf8182 Design Updates 8 months ago
tahaalam baf7cf0ea0 dental routing fixed and laser exception removed 8 months ago
aamir-csol 58e65e7a64 Merge branch 'master' into dev_aamir 8 months ago
aamir-csol cd81372fc6 family screen add fixes & remove & switch & widgets 8 months ago
Haroon6138 5227fa6b58 Merge pull request 'family screen add fixes & remove & switch & widgets' (#79) from dev_aamir into master
Reviewed-on: http://34.17.52.180/Haroon6138/HMG_Patient_App_New/pulls/79
8 months ago
aamir-csol bf8f98ffb1 family screen add fixes & remove & switch & widgets 8 months ago
tahaalam ea92a0c75c laser appointment screen added 8 months ago
aamir-csol 24362f67cb family screen & widgets 8 months ago
aamir-csol d918b6e464 family screen & widgets 8 months ago
faizatflutter 94313b8870 Improved Error Handling 9 months ago
aamir-csol 6a09c2ec07 validations & otp widget & focus & auto fill 9 months ago
Sultan khan ba2c8327fe login flow inprogress 9 months ago
faizatflutter 84804a59a7 completed till otp receiving 10 months ago
faizatflutter 9509d4a192 completed the deviceapi with new architecture 10 months ago
faizatflutter 6bc7af00bc completed the deviceapi with new architecture 10 months ago