Commit Graph

76 Commits (c9de23347a69da4ad2ae3bbcf559e94752cee5cc)

Author SHA1 Message Date
aamir-csol c27d7301d9 calender & signup fixes. 4 months ago
aamir-csol da035650c0 Merge branch 'master' into dev_aamir
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/extensions/string_extensions.dart
#	lib/generated/locale_keys.g.dart
4 months ago
Sikander Saleem 85bb00a8fc Merge branch 'refs/heads/master' into dev_sikander 4 months ago
Sikander Saleem 38d37fd407 custom tab bar added. 4 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
4 months ago
aamir-csol 85fac13314 changes 4 months ago
Sultan khan 886825a4b9 bottom navigation updated. 4 months ago
faizatflutter 32fadb8ad9 completed login function 4 months ago
aamir-csol 7321da67e3 register step 2 & fixes 4 months ago
aamir-csol ed24365eff Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/presentation/home/landing_page.dart
#	lib/theme/colors.dart
4 months ago
Haroon Amjad f5e655fd35 Lab order API implemented 5 months ago
aamir-csol d1e1154bdb changes 5 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
5 months ago
aamir-csol 67e580447e changes 5 months ago
faizatflutter 9509d4a192 completed the deviceapi with new architecture 5 months ago
aamir-csol 8f1e4500cc register & Exception bottom sheet, country dropdown. 5 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
5 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
5 months ago
aamir-csol 6f98690929 register & changes 5 months ago
Haroon Amjad 0a39a00df5 Landing page updates 5 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
5 months ago
aamir-csol 4d76b34608 app bar & chip 5 months ago
aamir-csol 4e3ba99280 widgets & fixes 5 months ago
Faiz Hashmi d65dc4ea89 initial commit 5 months ago
Haroon Amjad c65d44ae4d updates 5 months ago
Haroon Amjad b6766654e0 initial commit 5 months ago