Commit Graph

122 Commits (faiz_dev)

Author SHA1 Message Date
aamir-csol 3db3966c06 Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/core/app_state.dart
11 months ago
aamir-csol 484ab56a8e fixes for signup 11 months ago
Sultan khan ba2c8327fe login flow inprogress 11 months ago
aamir-csol 4e1912048d login flow completion 11 months ago
faizatflutter b15ddd1713 completed till otp receiving 11 months ago
faizatflutter 26f0ffda2c completed till otp receiving 11 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
11 months ago
faizatflutter 84804a59a7 completed till otp receiving 11 months ago
aamir-csol 3855ba276f calender & signup fixes. 11 months ago
aamir-csol e41ffd583d changes 11 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
11 months ago
aamir-csol 0309299f44 changes 11 months ago
faizatflutter 6e05ca15cf adding the login function 11 months ago
aamir-csol 85fac13314 changes 11 months ago
faizatflutter 32fadb8ad9 completed login function 11 months ago
aamir-csol 7321da67e3 register step 2 & fixes 11 months ago
aamir-csol d1e1154bdb changes 11 months ago
aamir-csol 67e580447e changes 11 months ago
aamir-csol 8f1e4500cc register & Exception bottom sheet, country dropdown. 11 months ago
aamir-csol 5e292544d7 Merge remote-tracking branch 'origin/faiz_dev1' into dev_aamir
# Conflicts:
#	lib/main.dart
#	lib/presentation/authentication/register.dart
#	lib/providers/authentication_view_model.dart
11 months ago
faizatflutter e2b0930dd1 Merge branch 'master' into faiz_dev1
# Conflicts:
#	ios/Podfile.lock
#	lib/core/app_state.dart
#	lib/main.dart
#	lib/presentation/authentication/login.dart
#	lib/presentation/home/landing_page.dart
#	pubspec.yaml
11 months ago
Sultan khan d3aff9f93d updating structure 11 months ago