aamir-csol
|
24362f67cb
|
family screen & widgets
|
3 weeks ago |
|
aamir-csol
|
aaa8222b1a
|
Merge branch 'master' into dev_aamir
# Conflicts:
# lib/core/api/api_client.dart
# lib/core/app_assets.dart
# lib/features/medical_file/medical_file_repo.dart
# lib/features/medical_file/medical_file_view_model.dart
# lib/presentation/home/landing_page.dart
# lib/presentation/medical_file/medical_file_page.dart
# lib/presentation/profile_settings/profile_settings.dart
# lib/widgets/chip/app_custom_chip_widget.dart
|
3 weeks ago |
|
aamir-csol
|
d918b6e464
|
family screen & widgets
|
3 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
|
060e7a8d68
|
Merge branch 'master' into dev_aamir
|
1 month ago |
|
aamir-csol
|
288a0018ce
|
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 |
|
Sultan khan
|
318441c77f
|
Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan
|
1 month ago |
|
aamir-csol
|
45a1ce9254
|
Merge branch 'master' into dev_aamir
|
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 |
|
Sultan khan
|
3acd549de7
|
no message
|
1 month ago |
|
aamir-csol
|
9b33745a57
|
Merge branch 'master' into dev_aamir
|
1 month ago |
|
aamir-csol
|
47ce5022d3
|
family screen & widgets
|
1 month ago |
|
aamir-csol
|
1b652f877d
|
Merge branch 'master' into dev_aamir
# Conflicts:
# lib/presentation/medical_file/medical_file_page.dart
# lib/widgets/chip/app_custom_chip_widget.dart
|
1 month ago |
|
Sultan khan
|
d5bd99f525
|
Merge branch 'dev_aamir' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan
# Conflicts:
# lib/presentation/medical_file/medical_file_page.dart
|
1 month ago |
|
aamir-csol
|
192d617350
|
family screen & widgets
|
1 month ago |
|
aamir-csol
|
e48e98d61b
|
Merge branch 'master' into dev_aamir
|
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 |
|
aamir-csol
|
f9bfc131a8
|
family screen & widgets
|
1 month ago |