Commit Graph

176 Commits (e8c71e96d9f4d557298b3673f8c4754ce2f82b3a)

Author SHA1 Message Date
Sikander Saleem 85bb00a8fc Merge branch 'refs/heads/master' into dev_sikander 3 months ago
Sikander Saleem 38d37fd407 custom tab bar added. 3 months ago
aamir-csol e41ffd583d changes 3 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
3 months ago
aamir-csol 0309299f44 changes 3 months ago
aamir-csol cf1908b44a Merge branch 'master' into dev_aamir
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/generated/locale_keys.g.dart
#	lib/theme/colors.dart
3 months ago
aamir-csol 85fac13314 changes 3 months ago
Sultan khan 886825a4b9 bottom navigation updated. 3 months ago
faizatflutter 32fadb8ad9 completed login function 3 months ago
Sultan khan 39c284d036 Merge remote-tracking branch 'origin/master' into dev_sultan
# Conflicts:
#	lib/presentation/home/landing_page.dart
3 months ago
Sultan khan f55d82ddb3 bottom navigation 3 months ago
Haroon Amjad 36c6f0d541 Landing page updates 3 months ago
aamir-csol 7321da67e3 register step 2 & fixes 3 months ago
aamir-csol d1e1154bdb changes 3 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
3 months ago
aamir-csol 67e580447e changes 3 months ago
faizatflutter 1af571705a Merge branch 'master' into faiz_dev1
# Conflicts:
#	lib/core/utils/utils.dart
#	lib/presentation/home/landing_page.dart
3 months ago
faizatflutter 9509d4a192 completed the deviceapi with new architecture 3 months ago
haroon amjad 4ecbcb9332 Homepage & medical implementation contd. 3 months ago
aamir-csol 8f1e4500cc register & Exception bottom sheet, country dropdown. 3 months ago
aamir-csol 9c52a6122f 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
#	lib/presentation/authantication/login.dart
3 months ago
Haroon Amjad 0a39a00df5 Landing page updates 3 months ago
aamir-csol ea15bd9152 bottom sheet 3 months ago
aamir-csol 4d76b34608 app bar & chip 3 months ago
aamir-csol 4e3ba99280 widgets & fixes 3 months ago
Haroon Amjad b6766654e0 initial commit 3 months ago