 haroon amjad
|
b27e3268b1
|
Merge branch 'master' into haroon_dev
# Conflicts:
# lib/presentation/home/landing_page.dart
# lib/presentation/medical_file/medical_file_page.dart
# lib/widgets/chip/app_custom_chip_widget.dart
|
4 weeks ago |
aamir-csol
|
24362f67cb
|
family screen & widgets
|
4 weeks ago |
|
aamir-csol
|
d918b6e464
|
family screen & widgets
|
4 weeks ago |
|
aamir-csol
|
e5488299b8
|
Merge branch 'master' into dev_aamir
# Conflicts:
# lib/extensions/string_extensions.dart
# lib/presentation/my_family/widget/family_cards.dart
# lib/widgets/chip/app_custom_chip_widget.dart
# lib/widgets/common_bottom_sheet.dart
|
1 month ago |
|
aamir-csol
|
1335d3a7c8
|
family screen & widgets
|
1 month ago |
|
aamir-csol
|
36193d349c
|
Merge remote-tracking branch 'origin/dev_sultan' into dev_aamir
# Conflicts:
# lib/features/authentication/authentication_repo.dart
# lib/features/authentication/authentication_view_model.dart
# lib/features/medical_file/medical_file_view_model.dart
|
1 month ago |
|
aamir-csol
|
02433e1bef
|
family screen & widgets
|
1 month ago |
Sultan khan
|
e2188b5a69
|
switch family member with super user
|
1 month ago |
faizatflutter
|
94313b8870
|
Improved Error Handling
|
1 month ago |
|
Sultan khan
|
3642523fdf
|
Merge branch 'dev_aamir' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan
# Conflicts:
# lib/features/medical_file/medical_file_view_model.dart
|
1 month ago |
|
aamir-csol
|
9e8011c34c
|
family screen & widgets
|
1 month ago |
|
aamir-csol
|
47ce5022d3
|
family screen & widgets
|
1 month ago |
|
aamir-csol
|
192d617350
|
family screen & widgets
|
1 month ago |
|
aamir-csol
|
e5f4da4e16
|
Merge branch 'master' into dev_aamir
# Conflicts:
# lib/presentation/medical_file/medical_file_page.dart
|
1 month ago |
|
aamir-csol
|
1125437a56
|
family screen & widgets
|
1 month ago |
|
haroon amjad
|
3e95999bf3
|
Merge branch 'master' into haroon_dev
|
1 month ago |
|
aamir-csol
|
f9bfc131a8
|
family screen & widgets
|
1 month ago |
|
haroon amjad
|
6048b3b5f1
|
Advance payment module implementation contd.
|
1 month ago |
|
aamir-csol
|
17c47d093c
|
otp screen & register Uae & resend Activation Code.
|
1 month ago |
|
aamir-csol
|
3ddd7781cd
|
Merge branch 'master' into dev_aamir
|
1 month ago |
|
haroon amjad
|
c191fd0be1
|
updates
|
1 month ago |
|
aamir-csol
|
3b1b51ef6f
|
otp screen & register Uae & resend Activation Code.
|
1 month ago |
|
Sultan khan
|
cd5da116f9
|
Merge branch 'dev_aamir' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan
# Conflicts:
# lib/features/authentication/authentication_view_model.dart
# lib/features/authentication/widgets/otp_verification_screen.dart
|
1 month ago |
|
Sultan khan
|
fe36c2a1c1
|
auto sms
|
1 month ago |
|
aamir-csol
|
5de8314f3f
|
otp screen & register Uae & resend Activation Code.
|
1 month ago |
|
aamir-csol
|
15c07cb4e2
|
otp screen & register Uae & resend Activation Code.
|
1 month ago |
|
Sultan khan
|
6b766e558d
|
Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan
# Conflicts:
# assets/langs/ar-SA.json
# assets/langs/en-US.json
# lib/core/app_assets.dart
# lib/generated/locale_keys.g.dart
# lib/presentation/home/landing_page.dart
# lib/presentation/home/navigation_screen.dart
|
2 months ago |
|
Sultan khan
|
286dfaa376
|
no message
|
2 months ago |
|
aamir-csol
|
4e17ff9c82
|
otp screen & register Uae & resend Activation Code.
|
2 months ago |
|
Sultan khan
|
009fa1859e
|
Merge branch 'dev_aamir' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan
|
2 months ago |
|
Sultan khan
|
fdd5d4cf6d
|
fixes
|
2 months ago |
|
aamir-csol
|
21a9cc8c89
|
otp screen & register Uae & resend Activation Code.
|
2 months ago |
|
aamir-csol
|
6a09c2ec07
|
validations & otp widget & focus & auto fill
|
2 months ago |
|
aamir-csol
|
7c8d7b67a9
|
signup finalize
|
2 months ago |
|
aamir-csol
|
b7e19a0af8
|
Merge branch 'master' into dev_aamir
# Conflicts:
# lib/features/authentication/authentication_view_model.dart
|
2 months ago |
|
aamir-csol
|
0c58c22ea5
|
sign
|
2 months ago |
|
haroon amjad
|
d87562caf5
|
updates
|
2 months ago |
|
haroon amjad
|
3a649bca35
|
Merge branch 'master' into haroon_dev
|
2 months ago |
|
aamir-csol
|
6f011880bd
|
Merge branch 'master' into dev_aamir
# Conflicts:
# lib/core/api_consts.dart
# lib/features/authentication/authentication_view_model.dart
|
2 months ago |
|
aamir-csol
|
70810fa14c
|
signup completed
|
2 months ago |
|
aamir-csol
|
8c55064158
|
signup completed
|
2 months ago |
|
haroon amjad
|
1de551e799
|
Merge branch 'master' into haroon_dev
# Conflicts:
# lib/core/app_assets.dart
# lib/features/authentication/authentication_view_model.dart
|
2 months ago |
|
haroon amjad
|
28da6e0a2c
|
updates
|
2 months ago |
|
Sultan khan
|
a5f64798e0
|
login fixes
|
2 months ago |
|
Sultan khan
|
299c0b0e29
|
login flow complete
|
2 months ago |
|
Sultan khan
|
58d33e2dae
|
Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan
# Conflicts:
# lib/features/authentication/authentication_view_model.dart
# lib/presentation/home/landing_page.dart
|
2 months ago |
|
Sultan khan
|
1466b6b71a
|
no message
|
2 months ago |
|
aamir-csol
|
7dcc827721
|
Merge branch 'master' into dev_aamir
# Conflicts:
# lib/features/authentication/authentication_view_model.dart
|
2 months ago |
|
aamir-csol
|
cd48d83c07
|
signup
|
2 months ago |
Haroon Amjad
|
6b2ec5aa2c
|
updates, fixes & service privileges
|
2 months ago |