Commit Graph

417 Commits (fbe5d35013a9ac4dcec8c5829991bb0c64707e1b)

Author SHA1 Message Date
tahaalam fbe5d35013 merge issues resolve for the ambulance request. 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
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
haroon amjad 9a48421271 ER Online Check-In implemented 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
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
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
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
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 8c956fc052 Design changes 1 month ago
haroon amjad 487b29fec3 Merge branch 'master' into haroon_dev 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 3e61df218b Some Minor design updated 2 months ago
haroon amjad 65220270c2 Size utils & fixes 2 months ago
haroon amjad 3c81cffa75 Merge branch 'master' into haroon_dev 2 months ago
haroon amjad 8a6f94cc1d updates 2 months ago
faizatflutter 72d765e508 Design Updates 2 months ago
faizatflutter 21be3a2d06 Merge branch 'master' into faiz_dev
# Conflicts:
#	lib/core/utils/utils.dart
#	lib/presentation/book_appointment/laser/widgets/body_part_listing.dart
#	lib/widgets/buttons/custom_button.dart
#	lib/widgets/common_bottom_sheet.dart
#	lib/widgets/input_widget.dart
2 months ago
faizatflutter 462f4eba14 Design Updates 2 months ago
haroon amjad 4b52862ba0 updates 2 months ago
faizatflutter eabfaf8182 Design Updates 2 months ago
haroon amjad 1c3ed8f2e1 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/core/dependencies.dart
#	lib/features/emergency_services/emergency_services_repo.dart
#	lib/features/emergency_services/emergency_services_view_model.dart
#	lib/presentation/emergency_services/emergency_services_page.dart
2 months ago
haroon amjad 1f7a941aa0 RRT Services implementation contd. 2 months ago
tahaalam d480798053 location dennied forever handled and error builder added to the image network 2 months ago
tahaalam 47d158c1e2 Merge remote-tracking branch 'origin/master' 2 months ago
tahaalam c146747e5e nearest er clinic repo viewmodel and view added 2 months ago
tahaalam d9796154dc Merge remote-tracking branch 'origin/master' into laser_appointment
# Conflicts:
#	lib/presentation/book_appointment/select_clinic_page.dart
2 months ago
haroon amjad d755eb0df8 contd. 2 months ago
haroon amjad 0441d072fa Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/presentation/lab/lab_orders_page.dart
#	lib/presentation/lab/lab_result_via_clinic/LabResultByClinic.dart
2 months ago
haroon amjad d693850ef4 ER services implementation contd. 2 months ago
tahaalam baf7cf0ea0 dental routing fixed and laser exception removed 2 months ago
tahaalam a7bd5f61cb Merge remote-tracking branch 'origin/master' into feature/lab_result 2 months ago
tahaalam 9e3035f02b units added to lab result and it graph and unwanted values removed from graph 2 months ago
haroon amjad 7a35f0ded6 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/features/authentication/authentication_view_model.dart
2 months ago
Haroon6138 5227fa6b58 Merge pull request 'family screen add fixes & remove & switch & widgets' (#79) from dev_aamir into master
Reviewed-on: http://34.17.52.180/Haroon6138/HMG_Patient_App_New/pulls/79
2 months ago