Commit Graph

10 Commits (702c504d4eb08a92f2c9313b25d4e08764703e3a)

Author SHA1 Message Date
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 6e05ca15cf adding the login function 2 months ago
aamir-csol 8f1e4500cc register & Exception bottom sheet, country dropdown. 2 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
2 months ago
faizatflutter c1221e4970 pushed device api 2 months ago
Haroon Amjad 0a39a00df5 Landing page updates 2 months ago
Sultan khan d3aff9f93d updating structure 2 months ago
Haroon Amjad 30fd99d122 android fixes 2 months ago
aamir-csol 4e3ba99280 widgets & fixes 2 months ago
Haroon Amjad b6766654e0 initial commit 2 months ago