Commit Graph

86 Commits (841fca027cdd8a67dda40c22efdc95d72cf623cd)

Author SHA1 Message Date
haroon amjad 1a68ffd500 Updates 7 months ago
haroon amjad abbf016694 Merge branch 'master' into haroon_dev 7 months ago
haroon amjad 2c0d010bac updates 7 months ago
Sultan khan f51e37db55 Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
* 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New:
  updates
  updates
  lab test description update

# Conflicts:
#	lib/core/api/api_client.dart
#	lib/presentation/authentication/login.dart
7 months ago
Sultan khan 4f303d8496 other country login done. 7 months ago
Sultan khan 80adf1bd2f Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
* 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New:
  updates & fixes
  updates
  updates
  Dark mode persistence added in the app
  Dark mode enabled
  Updates & fixes
  updates
  updates
  updates
7 months ago
haroon amjad 29447cc9fa updates 7 months ago
haroon amjad 6e71aa7f13 updates & fixes 7 months ago
haroon amjad f46b3f745f Dark mode enabled 7 months ago
Sultan khan acfab432cc multiple submit button commented 7 months ago
Sultan khan b91850d388 Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
* 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New: (67 commits)
  added women support in symptoms checker module.
  family fil fixes
  PMA-1100
  updates
  updates
  Updates & fixes
  updates
  Ai Analysis & PMA-(1078,1079)
  update
  updates
  arabic fixes
  arabic fixes
  Vital sign data connected to Symptom checker
  Date format changed to en-US
  confirm button added
  iOS BundleID changes
  Services price list implemented
  Indoor navigation implemented
  updates & fixes
  JIRA bug fixes & updates
  ...

# Conflicts:
#	lib/presentation/authentication/register_step2.dart
#	lib/presentation/vital_sign/vital_sign_page.dart
8 months ago
Sultan khan c416d84a3a register insurance in progress. 8 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
8 months ago
haroon amjad 68f5e64557 updates 8 months ago
aamir-csol 2c7f4ddc48 Ai Analysis & PMA-(1078,1079) 8 months ago
Haroon Amjad a4573c8710 arabic fixes 8 months ago
Haroon Amjad 4ce1e912ce Vital sign data connected to Symptom checker 8 months ago
haroon amjad 10a5a6f558 Ask Doctor implemented 9 months ago
haroon amjad f54ce71177 translation changes 9 months ago
haroon amjad 8f428297cb Arabic translations added 9 months ago
haroon amjad b10d715d55 App updates 9 months ago
faizatflutter c7c0a0ac09 Added user_info module IAP 10 months ago
aamir-csol f91f8e63d7 Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/presentation/medical_file/medical_file_page.dart
#	lib/presentation/medical_file/widgets/lab_rad_card.dart
10 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
10 months ago
haroon amjad 36bf63dcde Incoming call updates 10 months ago
Haroon Amjad 73b05276f6 Feedback page implementation contd. 11 months ago
haroon amjad f9f17f3a76 LiveChat implemented 11 months ago
faizatflutter b698b74eb5 Design Updates 11 months ago
aamir-csol 987fe73128 family screen add fixes & remove & switch & widgets 12 months ago
faizatflutter 72d765e508 Design Updates 12 months ago
faizatflutter eabfaf8182 Design Updates 12 months ago
aamir-csol 8240d3e78d Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/presentation/authentication/register_step2.dart
1 year ago
haroon amjad 3b5d2d27a4 Updates 1 year ago
aamir-csol 17c47d093c otp screen & register Uae & resend Activation Code. 1 year ago
haroon amjad 2961583414 update 1 year ago
aamir-csol 2b7656d83a otp screen & register Uae & resend Activation Code. 1 year ago
aamir-csol 5de8314f3f otp screen & register Uae & resend Activation Code. 1 year ago
aamir-csol 15c07cb4e2 otp screen & register Uae & resend Activation Code. 1 year ago
aamir-csol fbd6ef0cf8 Merge branch 'master' into dev_aamir
# Conflicts:
#	assets/langs/en-US.json
#	lib/features/authentication/widgets/otp_verification_screen.dart
#	lib/widgets/input_widget.dart
1 year ago
aamir-csol 4e17ff9c82 otp screen & register Uae & resend Activation Code. 1 year ago
haroon amjad 9f95150a94 book appointment implementation completed. 1 year ago
aamir-csol 21a9cc8c89 otp screen & register Uae & resend Activation Code. 1 year ago
aamir-csol 6a09c2ec07 validations & otp widget & focus & auto fill 1 year ago
Haroon Amjad de717edfe8 Sickleave implementation done. 1 year ago
aamir-csol 6f011880bd Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/core/api_consts.dart
#	lib/features/authentication/authentication_view_model.dart
1 year ago
aamir-csol 2b18e08e64 signup completed 1 year ago
aamir-csol 8c55064158 signup completed 1 year ago
Sultan khan 299c0b0e29 login flow complete 1 year ago
Sultan khan 58d33e2dae Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan
# Conflicts:
#	lib/features/authentication/authentication_view_model.dart
#	lib/presentation/home/landing_page.dart
1 year ago
Sultan khan 1466b6b71a no message 1 year ago