Commit Graph

68 Commits (c00e69ef0c22a8d986bcbefdc192eb448123b6f3)

Author SHA1 Message Date
Sultan khan 6b766e558d Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/core/app_assets.dart
#	lib/generated/locale_keys.g.dart
#	lib/presentation/home/landing_page.dart
#	lib/presentation/home/navigation_screen.dart
9 months ago
Sultan khan 286dfaa376 no message 9 months 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
9 months ago
aamir-csol 4e17ff9c82 otp screen & register Uae & resend Activation Code. 9 months ago
Sultan khan 009fa1859e Merge branch 'dev_aamir' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan 9 months ago
Sultan khan fdd5d4cf6d fixes 9 months ago
aamir-csol 21a9cc8c89 otp screen & register Uae & resend Activation Code. 9 months ago
haroon amjad 6f745f3666 calendar implementation contd. 9 months ago
aamir-csol 87830e17ab otp screen 9 months ago
aamir-csol 6a09c2ec07 validations & otp widget & focus & auto fill 9 months ago
aamir-csol 7c8d7b67a9 signup finalize 9 months ago
aamir-csol b7e19a0af8 Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/features/authentication/authentication_view_model.dart
9 months ago
aamir-csol 0c58c22ea5 sign 9 months ago
haroon amjad d87562caf5 updates 9 months ago
haroon amjad 3a649bca35 Merge branch 'master' into haroon_dev 9 months ago
aamir-csol 6f011880bd Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/core/api_consts.dart
#	lib/features/authentication/authentication_view_model.dart
9 months ago
aamir-csol 70810fa14c signup completed 9 months ago
aamir-csol 8c55064158 signup completed 9 months ago
haroon amjad 1de551e799 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/core/app_assets.dart
#	lib/features/authentication/authentication_view_model.dart
9 months ago
haroon amjad 28da6e0a2c updates 9 months ago
Sultan khan a5f64798e0 login fixes 9 months ago
Sultan khan 299c0b0e29 login flow complete 9 months 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
9 months ago
Sultan khan 1466b6b71a no message 9 months ago
aamir-csol 7dcc827721 Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/features/authentication/authentication_view_model.dart
9 months ago
aamir-csol cd48d83c07 signup 9 months ago
Haroon Amjad 6b2ec5aa2c updates, fixes & service privileges 9 months ago
Haroon Amjad 255b3c1565 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/features/authentication/authentication_view_model.dart
9 months ago
Sultan khan 2a081e30b5 saved login done. 9 months ago
haroon amjad e37eb78f81 my appointments changes implementation contd. 9 months 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
9 months ago
aamir-csol c129eb2c2f Merge branch 'master' into dev_aamir 9 months 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
9 months ago
aamir-csol ffb399c704 fixes for signup 9 months 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
9 months ago
Sultan khan a199ca040b quick login inprogress 9 months ago
aamir-csol 9b063ba764 fixes for signup 9 months ago
Haroon Amjad 003a161b52 custom chips implemented 9 months ago
haroon amjad 542de41a82 updates & fixes 9 months ago
haroon amjad 2d0fc11f05 updates 9 months ago
aamir-csol 3db3966c06 Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/core/app_state.dart
9 months ago
aamir-csol 484ab56a8e fixes for signup 9 months ago
Sultan khan ba2c8327fe login flow inprogress 9 months ago
aamir-csol 4e1912048d login flow completion 9 months ago
aamir-csol 52fddc5323 login flow completion 9 months ago
haroon amjad d794787459 updates 10 months ago
faizatflutter b15ddd1713 completed till otp receiving 10 months ago
faizatflutter 26f0ffda2c completed till otp receiving 10 months 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
10 months ago
faizatflutter 923f7d7781 completed till otp receiving 10 months ago