Commit Graph

30 Commits (075578602eb17174d2e0842b01dbb48c54c1040a)

Author SHA1 Message Date
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
2 months ago
Sultan khan a199ca040b quick login inprogress 2 months ago
aamir-csol 9b063ba764 fixes for signup 2 months ago
haroon amjad 542de41a82 updates & fixes 2 months ago
haroon amjad 2d0fc11f05 updates 2 months ago
aamir-csol 3db3966c06 Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/core/app_state.dart
2 months ago
aamir-csol 484ab56a8e fixes for signup 2 months ago
Sultan khan ba2c8327fe login flow inprogress 2 months ago
aamir-csol 4e1912048d login flow completion 2 months ago
aamir-csol 52fddc5323 login flow completion 2 months ago
faizatflutter b15ddd1713 completed till otp receiving 2 months ago
faizatflutter 26f0ffda2c completed till otp receiving 2 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
2 months ago
faizatflutter 923f7d7781 completed till otp receiving 2 months ago
faizatflutter 84804a59a7 completed till otp receiving 2 months ago
aamir-csol 3855ba276f calender & signup fixes. 2 months ago
aamir-csol e41ffd583d changes 2 months ago
faizatflutter 6e05ca15cf adding the login function 2 months ago
aamir-csol 85fac13314 changes 2 months ago
faizatflutter 32fadb8ad9 completed login function 2 months ago
faizatflutter 488636a13f Merge branch 'dev_aamir' into faiz_dev1
# Conflicts:
#	lib/features/authentication/authentication_view_model.dart
2 months ago
faizatflutter 572fcef0f1 checkUserAuth 2 months ago
aamir-csol d1e1154bdb changes 2 months ago
faizatflutter c6a95fe7d7 latest push after master merged 2 months ago
faizatflutter 9509d4a192 completed the deviceapi with new architecture 2 months ago
faizatflutter 6bc7af00bc completed the deviceapi with new architecture 2 months ago
Sultan khan d3aff9f93d updating structure 2 months ago
faizatflutter 45e868adba pushed new API 2 months ago
Faiz Hashmi 357cf4392e Updated architecture 2 months ago
Faiz Hashmi d65dc4ea89 initial commit 2 months ago