faiz_dev1 #12

Merged
Haroon6138 merged 13 commits from faiz_dev1 into master 2 months ago

13 Commits (main)

Author SHA1 Message Date
faizatflutter b15ddd1713 completed till otp receiving 2 months ago
faizatflutter 36c41d40f8 Merge branch 'master' into faiz_dev 2 months ago
faizatflutter 26f0ffda2c completed till otp receiving 2 months ago
faizatflutter 702c504d4e Merge branch 'refs/heads/master' into faiz_dev1
# Conflicts:
#	pubspec.yaml
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
faizatflutter 3e50a3c89d Merge branch 'dev_aamir' into faiz_dev1
# Conflicts:
#	lib/core/enums.dart
#	lib/features/authentication/authentication_view_model.dart
#	lib/presentation/authentication/register.dart
#	lib/presentation/home/landing_page.dart
2 months ago
faizatflutter 6e05ca15cf adding the login function 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 a0e5aeda05 Merge branch 'master' into faiz_dev1 2 months ago
faizatflutter 572fcef0f1 checkUserAuth 2 months ago