Commit Graph

65 Commits (dev_aamir)

Author SHA1 Message Date
aamir-csol d1e1154bdb changes 2 months ago
aamir-csol 23a4035117 Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/main.dart
#	lib/presentation/home/landing_page.dart
#	lib/theme/colors.dart
#	lib/widgets/buttons/custom_button.dart
2 months ago
aamir-csol 67e580447e changes 2 months ago
faizatflutter 9509d4a192 completed the deviceapi with new architecture 2 months ago
aamir-csol 8f1e4500cc register & Exception bottom sheet, country dropdown. 2 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
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
aamir-csol 6f98690929 register & changes 2 months ago
Haroon Amjad 0a39a00df5 Landing page updates 2 months ago
Sultan khan cbfb381615 Merge branch 'faiz_dev' into faiz_dev1
# Conflicts:
#	ios/Podfile.lock
#	lib/main.dart
#	lib/routes/app_routes.dart
#	pubspec.lock
2 months ago
aamir-csol 4d76b34608 app bar & chip 2 months ago
aamir-csol 4e3ba99280 widgets & fixes 2 months ago
Faiz Hashmi d65dc4ea89 initial commit 2 months ago
Haroon Amjad c65d44ae4d updates 2 months ago
Haroon Amjad b6766654e0 initial commit 2 months ago