Commit Graph

14 Commits (b27e3268b1663c0b8afea6b174720a15c4cacea6)

Author SHA1 Message Date
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
3 weeks ago
aamir-csol 24362f67cb family screen & widgets 3 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 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
faizatflutter 94313b8870 Improved Error Handling 1 month ago
Sultan khan 3acd549de7 no message 1 month ago
aamir-csol 192d617350 family screen & widgets 1 month ago
aamir-csol 1125437a56 family screen & widgets 1 month ago
aamir-csol f9bfc131a8 family screen & widgets 1 month ago
aamir-csol a79dcad221 family screen & widgets 1 month ago