Commit Graph

513 Commits (8e132e964f723896bb01db0e126691ec6aa52116)
 

Author SHA1 Message Date
Sultan khan 8e132e964f Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
# Conflicts:
#	lib/presentation/emergency_services/call_ambulance/tracking_screen.dart
#	lib/presentation/profile_settings/profile_settings.dart
#	lib/presentation/radiology/radiology_orders_page.dart
#	lib/widgets/chip/app_custom_chip_widget.dart
2 weeks ago
Sultan khan 171bd644d1 e-referral work in progress. 2 weeks ago
Haroon6138 4aa368d13a Merge pull request 'ambulance_listing_and_request' (#96) from ambulance_listing_and_request into master
Reviewed-on: #96
2 weeks ago
tahaalam 525504265c issue resolution 2 weeks ago
tahaalam 53be50b40c Merge remote-tracking branch 'origin/master' into ambulance_listing_and_request
# Conflicts:
#	lib/core/dependencies.dart
#	lib/features/emergency_services/emergency_services_view_model.dart
#	lib/presentation/appointments/widgets/appointment_doctor_card.dart
#	lib/widgets/common_bottom_sheet.dart
2 weeks ago
tahaalam fbe5d35013 merge issues resolve for the ambulance request. 2 weeks ago
Haroon6138 5b7c1c5a41 Merge pull request 'Ancillary Orders Complete Flow (faiz_dev)' (#94) from faiz_dev into master
Reviewed-on: #94
2 weeks ago
faizatflutter 7d64f78246 merge changes 2 weeks 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
2 weeks ago
faizatflutter 16b5ff1b62 Ancillary Orders Flow Completed 2 weeks ago
tahaalam a669265076 Merge remote-tracking branch 'origin/master' into ambulance_listing_and_request
# Conflicts:
#	lib/core/api/api_client.dart
#	lib/core/dependencies.dart
#	lib/features/emergency_services/emergency_services_repo.dart
#	lib/features/emergency_services/emergency_services_view_model.dart
#	lib/features/emergency_services/models/resp_model/EROnlineCheckInPaymentDetailsResponse.dart
#	lib/main.dart
#	lib/presentation/emergency_services/call_ambulance/call_ambulance_page.dart
#	lib/presentation/emergency_services/call_ambulance/widgets/HospitalBottomSheetBody.dart
#	lib/presentation/emergency_services/call_ambulance/widgets/type_selection_widget.dart
#	lib/presentation/emergency_services/emergency_services_page.dart
#	lib/widgets/input_widget.dart
2 weeks ago
Haroon6138 21f5067ea4 Merge pull request 'haroon_dev' (#93) from haroon_dev into master
Reviewed-on: #93
2 weeks ago
haroon amjad 096b2b7cbf livechat implementation contd. 3 weeks ago
haroon amjad 2a6c7fc0a1 Find us implemented 3 weeks ago
tahaalam 5b0a8ad898 cancel and listing request added 3 weeks ago
haroon amjad 14f57027f4 Eye measurements done 3 weeks ago
haroon amjad c600b0ee7a Ask doctor implemented 3 weeks ago
haroon amjad 21b7b32013 Ask doctor implementation contd. 3 weeks ago
Haroon6138 43d64b761c Merge pull request 'haroon_dev' (#92) from haroon_dev into master
Reviewed-on: #92
3 weeks ago
haroon amjad 9a48421271 ER Online Check-In implemented 3 weeks ago
faizatflutter 100d4bda9f Completed Ancillary flow with CardPayments 3 weeks ago
Haroon Amjad cc1e073f6d ER Online CheckIn implementation contd. 3 weeks ago
haroon amjad 60bd9ee55a ER Online CheckIn implementation contd. 3 weeks ago
tahaalam 1ca39e1332 Ambulance order screens and geocoding request added 3 weeks ago
Sultan khan c701572dde radiology search 4 weeks ago
Sultan khan 028e03a97b filter radiology 4 weeks ago
Haroon6138 955f3c1888 Merge pull request 'haroon_dev' (#91) from haroon_dev into master
Reviewed-on: #91
4 weeks ago
haroon amjad f280d4a28a todo page implementation started 4 weeks 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
4 weeks ago
haroon amjad 8dcc8dfbe3 updates 4 weeks ago
Haroon6138 5aef8d67de Merge pull request 'Fixed App CustomChip' (#90) from faiz_dev into master
Reviewed-on: http://34.17.52.180/Haroon6138/HMG_Patient_App_New/pulls/90
4 weeks ago
faizatflutter f96f3e563c Fixed App CustomChip 4 weeks 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
4 weeks ago
haroon amjad 2160f87c59 updates 4 weeks ago
Haroon6138 d0513b7ec6 Merge pull request 'Design Updates (faiz_dev)' (#89) from faiz_dev into master
Reviewed-on: http://34.17.52.180/Haroon6138/HMG_Patient_App_New/pulls/89
4 weeks ago
faizatflutter b698b74eb5 Design Updates 4 weeks ago
Haroon Amjad 2e16622cc3 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/core/utils/size_utils.dart
#	lib/presentation/home/widgets/large_service_card.dart
1 month ago
faizatflutter dc5eba7d12 refactored code 1 month ago
faizatflutter 28f8aec60f resolved fSize issue 1 month ago
faizatflutter c1971ef287 Merge branch 'refs/heads/master' into faiz_dev 1 month ago
faizatflutter e8c71e96d9 Updated README.md 1 month ago
Haroon6138 622851a1a0 Merge pull request 'Design Fixes for Responsiveness (faiz_dev)' (#88) from faiz_dev into master
Reviewed-on: http://34.17.52.180/Haroon6138/HMG_Patient_App_New/pulls/88
1 month ago
faizatflutter 290dc5c4bb Updated README.md 1 month ago
faizatflutter 495eb13153 Updated README.md 1 month ago
faizatflutter 8c956fc052 Design changes 1 month ago
haroon amjad 487b29fec3 Merge branch 'master' into haroon_dev 1 month ago
Haroon6138 ceb0f1ebb6 Merge pull request 'ambulance_ui' (#87) from ambulance_ui into master
Reviewed-on: http://34.17.52.180/Haroon6138/HMG_Patient_App_New/pulls/87
1 month ago
tahaalam 57056e67f3 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	lib/extensions/string_extensions.dart
#	lib/widgets/buttons/custom_button.dart
2 months ago
tahaalam 90128a812b call ambulance module design added. 2 months ago
faizatflutter f508d441e2 Merge branch 'master' into faiz_dev 2 months ago