Commit Graph

65 Commits (f19d06512aae7a8d8ddc2290b8a79f6dfdbeb413)

Author SHA1 Message Date
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
aamir-csol 7dcc827721 Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/features/authentication/authentication_view_model.dart
1 year ago
aamir-csol cd48d83c07 signup 1 year ago
Haroon Amjad 6b2ec5aa2c updates, fixes & service privileges 1 year ago
Sultan khan 2a081e30b5 saved login done. 1 year ago
Sultan khan 9f0fb27baf Merge branch 'dev_aamir' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan
# Conflicts:
#	lib/features/authentication/authentication_view_model.dart
1 year ago
aamir-csol c129eb2c2f Merge branch 'master' into dev_aamir 1 year ago
Sultan khan b4667f5c94 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
1 year ago
aamir-csol ffb399c704 fixes for signup 1 year ago
Sultan khan 075578602e Merge branch 'dev_aamir' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan
# Conflicts:
#	lib/features/authentication/authentication_repo.dart
#	lib/features/authentication/authentication_view_model.dart
1 year ago
Sultan khan a199ca040b quick login inprogress 1 year ago
aamir-csol 9b063ba764 fixes for signup 1 year ago
Haroon Amjad 003a161b52 custom chips implemented 1 year ago
haroon amjad f8be788a60 updates & fixes 1 year ago
haroon amjad 542de41a82 updates & fixes 1 year ago
aamir-csol 3db3966c06 Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/core/app_state.dart
1 year ago
aamir-csol 484ab56a8e fixes for signup 1 year ago
Sultan khan ba2c8327fe login flow inprogress 1 year ago
aamir-csol 4e1912048d login flow completion 1 year ago
faizatflutter b15ddd1713 completed till otp receiving 1 year ago
faizatflutter 26f0ffda2c completed till otp receiving 1 year ago
faizatflutter db50bd8f23 Merge branch 'master' into faiz_dev1
# Conflicts:
#	lib/core/api_consts.dart
#	lib/core/app_state.dart
#	lib/features/authentication/authentication_view_model.dart
#	lib/presentation/authentication/login.dart
#	lib/presentation/authentication/register.dart
#	lib/widgets/bottomsheet/generic_bottom_sheet.dart
#	lib/widgets/input_widget.dart
1 year ago