Commit Graph

385 Commits (c19451a6b6da1c270ae2affb7d41b6cae347d9a1)

Author SHA1 Message Date
faizatflutter 84804a59a7 completed till otp receiving 9 months ago
Sikander Saleem 6473ccecb5 Merge branch 'refs/heads/master' into dev_sikander
# Conflicts:
#	lib/core/app_assets.dart
9 months ago
Haroon6138 24b98626d2 Merge pull request 'dev_aamir' (#8) from dev_aamir into master
Reviewed-on: http://34.17.52.180/Haroon6138/HMG_Patient_App_New/pulls/8
9 months ago
haroon amjad 2f9fbaef7a insurance update implementation contd. 9 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
9 months ago
aamir-csol 3855ba276f calender & signup fixes. 9 months ago
haroon amjad 333b813f90 bottom sheet fixes 10 months ago
Sultan khan 2f2a8f3f8f search lab result screen added 10 months ago
Sikander Saleem ac0b7bec44 custom tab bar added in medical file section. 10 months ago
Sikander Saleem 85bb00a8fc Merge branch 'refs/heads/master' into dev_sikander 10 months ago
Sikander Saleem 38d37fd407 custom tab bar added. 10 months ago
aamir-csol e41ffd583d changes 10 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
10 months ago
aamir-csol 0309299f44 changes 10 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
10 months ago
aamir-csol 85fac13314 changes 10 months ago
Sultan khan 886825a4b9 bottom navigation updated. 10 months ago
faizatflutter 32fadb8ad9 completed login function 10 months ago
Sultan khan 39c284d036 Merge remote-tracking branch 'origin/master' into dev_sultan
# Conflicts:
#	lib/presentation/home/landing_page.dart
10 months ago
Sultan khan f55d82ddb3 bottom navigation 10 months ago
Haroon Amjad 36c6f0d541 Landing page updates 10 months ago
aamir-csol 7321da67e3 register step 2 & fixes 10 months ago
aamir-csol d1e1154bdb changes 10 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
10 months ago
aamir-csol 67e580447e changes 10 months ago
faizatflutter 1af571705a Merge branch 'master' into faiz_dev1
# Conflicts:
#	lib/core/utils/utils.dart
#	lib/presentation/home/landing_page.dart
10 months ago
faizatflutter 9509d4a192 completed the deviceapi with new architecture 10 months ago
haroon amjad 4ecbcb9332 Homepage & medical implementation contd. 10 months ago
aamir-csol 8f1e4500cc register & Exception bottom sheet, country dropdown. 10 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
10 months ago
Haroon Amjad 0a39a00df5 Landing page updates 10 months ago
aamir-csol ea15bd9152 bottom sheet 10 months ago
aamir-csol 4d76b34608 app bar & chip 10 months ago
aamir-csol 4e3ba99280 widgets & fixes 10 months ago
Haroon Amjad b6766654e0 initial commit 10 months ago