Commit Graph

82 Commits (2ffd4cc1aec8f9c6a592d2e22f80dca056dda71b)

Author SHA1 Message Date
faizatflutter e35fe9ac05 Merge branch 'master' into faiz_dev
# Conflicts:
#	lib/core/dependencies.dart
#	lib/presentation/home/landing_page.dart
#	lib/presentation/lab/lab_orders_page.dart
#	lib/routes/app_routes.dart
#	lib/widgets/appbar/collapsing_list_view.dart
2 months ago
haroon amjad 36bf63dcde Incoming call updates 2 months ago
haroon amjad 1e5744cf44 Updates & enhancements 3 months ago
faizatflutter 757ace2ba1 Added Organ Selector 3 months ago
haroon amjad f142ff90be updates 3 months ago
haroon amjad 07a3052b8e appointment prescription implemented 3 months ago
haroon amjad 63d844a5e9 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/core/api/api_client.dart
#	lib/core/api_consts.dart
#	lib/core/dependencies.dart
#	lib/features/radiology/radiology_view_model.dart
#	lib/presentation/appointments/appointment_details_page.dart
#	lib/presentation/emergency_services/history/widget/ambulance_history_item.dart
#	lib/presentation/emergency_services/history/widget/rrt_item.dart
3 months ago
haroon amjad c03c84287c Appointment details Lab & radiology integration implemented 3 months ago
haroon amjad ffca4317aa updates 3 months ago
faizatflutter 721bf95c1b Comprehensive checkup in progress 3 months ago
haroon amjad f9f17f3a76 LiveChat implemented 3 months ago
faizatflutter 617b68021a Merge branch 'master' into faiz_dev
# Conflicts:
#	lib/core/api/api_client.dart
#	lib/core/dependencies.dart
#	lib/main.dart
#	lib/presentation/appointments/appointment_payment_page.dart
3 months ago
haroon amjad 14f57027f4 Eye measurements done 3 months ago
faizatflutter 100d4bda9f Completed Ancillary flow with CardPayments 3 months ago
haroon amjad d3a8d545b2 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/presentation/medical_file/medical_file_page.dart
#	lib/presentation/my_family/widget/family_cards.dart
3 months ago
haroon amjad 8dcc8dfbe3 updates 3 months ago
faizatflutter f96f3e563c Fixed App CustomChip 3 months ago
haroon amjad 8976f4db9d Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/presentation/emergency_services/call_ambulance/tracking_screen.dart
#	lib/presentation/medical_file/medical_file_page.dart
3 months ago
haroon amjad 2160f87c59 updates 3 months ago
faizatflutter b698b74eb5 Design Updates 3 months ago
faizatflutter 8c956fc052 Design changes 4 months ago
faizatflutter 72d765e508 Design Updates 4 months ago
faizatflutter 462f4eba14 Design Updates 4 months ago
faizatflutter eabfaf8182 Design Updates 4 months ago
haroon amjad 1e08394ba1 Lab report PDF implementation contd. 4 months ago
haroon amjad 663eda0076 updates & fixes 4 months ago
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 months ago
haroon amjad 25fa1acc9e Medical file widgets, Insurance approval implementation contd. 4 months ago
aamir-csol 24362f67cb family screen & widgets 4 months 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 months ago
aamir-csol d918b6e464 family screen & widgets 4 months ago
haroon amjad db979977ca Tamara implementation & enhancements 4 months ago
haroon amjad 5e000db556 updates 4 months 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 months ago
haroon amjad 093e645f60 request medical report implementation completed. 4 months ago
Haroon Amjad 8bb0e495cc request medical report implementation contd. 4 months 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
4 months ago
aamir-csol 1335d3a7c8 family screen & widgets 4 months ago
faizatflutter 23942dc7bc Merge branch 'master' into faiz_dev
# Conflicts:
#	lib/core/api/api_client.dart
4 months ago
aamir-csol 288a0018ce family screen & widgets 5 months ago
haroon amjad 6b28b57307 empty state implementation contd. 5 months ago
Haroon Amjad 62e82a7a31 Empty data state implementation contd. 5 months ago
faizatflutter 94313b8870 Improved Error Handling 5 months ago
haroon amjad a07369165d Updates 5 months 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
5 months ago
aamir-csol 192d617350 family screen & widgets 5 months ago
aamir-csol e5f4da4e16 Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/presentation/medical_file/medical_file_page.dart
5 months ago
Sultan khan 3d1d78ba48 Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan 5 months ago
Sultan khan 8f8c4c7f65 Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan
# Conflicts:
#	lib/presentation/medical_file/medical_file_page.dart
5 months ago
haroon amjad 836a72ec22 App directionality changes 5 months ago