Commit Graph

233 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
haroon amjad 25fa1acc9e Medical file widgets, Insurance approval implementation contd. 3 weeks ago
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
4 weeks ago
aamir-csol d918b6e464 family screen & widgets 4 weeks ago
haroon amjad 8ff5566f0b dependencies update 4 weeks ago
haroon amjad 9d48a00b21 Merge branch 'master' into haroon_dev 4 weeks ago
haroon amjad f1a60a9dfb updates 4 weeks ago
tahaalam 61007302c9 appointment date filter handled 4 weeks ago
haroon amjad d220be7283 Tamara payment flow done 4 weeks ago
haroon amjad 30eb8bf5de dental booking flow implemented 4 weeks ago
haroon amjad 2b21086cc1 Dental appointment booking flow implementation contd. 4 weeks ago
haroon amjad 415c0eb3c7 Dental appointment booking implementation contd. 4 weeks ago
haroon amjad 903248133e Lab order & results enhancements 4 weeks ago
haroon amjad 3d64ddf78b Merge branch 'master' into haroon_dev 4 weeks ago
haroon amjad db979977ca Tamara implementation & enhancements 4 weeks ago
tahaalam 36bf229787 Merge remote-tracking branch 'origin/master' into feature/lab_result
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/core/api/api_client.dart
#	lib/generated/locale_keys.g.dart
#	lib/presentation/lab/lab_results/lab_result_details.dart
4 weeks ago
tahaalam 42abf9ca1b login bypass removed 4 weeks ago
haroon amjad 8166369f85 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/core/app_assets.dart
#	lib/widgets/input_widget.dart
4 weeks ago
haroon amjad 1d22e53f63 Merge branch 'master' into haroon_dev
# Conflicts:
#	ios/Runner.xcodeproj/project.pbxproj
#	lib/presentation/medical_file/medical_file_page.dart
4 weeks ago
haroon amjad 8a7f46441c updates 4 weeks ago
tahaalam 6ef9ae813d doctors search filter added 4 weeks ago
haroon amjad 3418480122 Immediate LiveCare implementation completed 4 weeks ago
haroon amjad 10b77206f6 Immediate LiveCare consultation implementation contd. 1 month ago
tahaalam da89c41925 lab result by hospital and translations are added 1 month ago
haroon amjad 2f4d6f5553 immediate livecare consultation implementation contd. 1 month 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 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
faizatflutter 23942dc7bc Merge branch 'master' into faiz_dev
# Conflicts:
#	lib/core/api/api_client.dart
1 month ago
haroon amjad 6565ba719d Merge branch 'master' into haroon_dev 1 month ago
haroon amjad 1af2db5c09 patient profile settings page integration implementation contd. 1 month ago
tahaalam 51a4f83347 Merge remote-tracking branch 'origin/master' into feature/lab_result
# Conflicts:
#	lib/presentation/lab/lab_results/lab_result_details.dart
1 month ago
tahaalam 048f0bb459 graph design change 1 month ago
aamir-csol 060e7a8d68 Merge branch 'master' into dev_aamir 1 month ago
aamir-csol 288a0018ce family screen & widgets 1 month ago
haroon amjad 5f43063f2d Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/core/app_assets.dart
1 month ago
haroon amjad 6b28b57307 empty state implementation contd. 1 month ago
tahaalam 512628fb8b Lab result view along with the listing of items is added 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
Haroon Amjad 62e82a7a31 Empty data state implementation contd. 1 month ago
faizatflutter dc16a684c5 Merge branch 'master' into faiz_dev 1 month ago
faizatflutter 94313b8870 Improved Error Handling 1 month ago
haroon amjad a07369165d Updates 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
haroon amjad f7e26da6f4 Merge branch 'master' into haroon_dev 1 month ago
haroon amjad 344ecaba18 LiveCare Schedule implementation done 1 month ago