Commit Graph

30 Commits (3e5c3a3a273d38c869de9acb65d0168ed6e4ac8c)

Author SHA1 Message Date
aamir-csol 02ae79c458 Merge branch 'refs/heads/master' into dev_aamir 2 weeks ago
haroon amjad d693850ef4 ER services implementation contd. 3 weeks ago
aamir-csol cd81372fc6 family screen add fixes & remove & switch & widgets 3 weeks ago
aamir-csol bf8f98ffb1 family screen add fixes & remove & switch & widgets 3 weeks ago
aamir-csol 24362f67cb family screen & widgets 4 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
4 weeks ago
aamir-csol d918b6e464 family screen & widgets 4 weeks ago
haroon amjad db979977ca Tamara implementation & enhancements 4 weeks ago
haroon amjad 093e645f60 request medical report implementation completed. 1 month ago
Haroon Amjad 8bb0e495cc request medical report implementation contd. 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
Sultan khan e2188b5a69 switch family member with super user 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
Sultan khan 3acd549de7 no message 1 month ago
aamir-csol 47ce5022d3 family screen & widgets 1 month ago
aamir-csol 192d617350 family screen & widgets 1 month ago
aamir-csol 1125437a56 family screen & widgets 1 month ago
aamir-csol a79dcad221 family screen & widgets 1 month ago
Sultan khan 5ce7548656 family file work-in-progress 1 month ago
Sultan khan 0a653a61f2 family file bottomsheet added 1 month ago
Sultan khan eafb52ab86 family file work in-progress 1 month ago
haroon amjad 5de5fc8be9 updates 1 month ago
Haroon Amjad 7b94199d58 Medical report implementation done, Book Appointment implementation contd. 2 months ago
Haroon Amjad 14725616c6 medical report implementation contd. 2 months ago
Haroon Amjad de717edfe8 Sickleave implementation done. 2 months ago
Haroon Amjad b240293064 medical file implementation contd. 2 months ago
haroon amjad a0bdc34685 My appointments implementation contd. 2 months ago