Commit Graph

385 Commits (befcee7c656f19f2477d5c7070ed75fd9b4d931c)

Author SHA1 Message Date
aamir-csol f0b8db0318 Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/features/medical_file/medical_file_view_model.dart
#	lib/presentation/appointments/appointment_details_page.dart
2 days ago
aamir-csol 461fa11df3 health calculator design & timer & bell icon switch changes 2 days ago
Sultan khan 16e898bb6c updates and fixes 2 days ago
tahaalam fcf990bc00 hot fixes 3 days ago
tahaalam d97ead4e03 Merge remote-tracking branch 'origin/master' into changes
# Conflicts:
#	lib/core/app_assets.dart
4 days ago
tahaalam fb93aa1092 ambulance call page changes:
1. icon change for the success of ambulance call and rrt.
2. flow changed to first select the appoiintment then hospital.
3. location accorate enabled.
4 days ago
haroon amjad be8cf08005 Merge branch 'master' into haroon_dev 4 days ago
haroon amjad 509eeb69ac fixes 4 days ago
haroon amjad be08c3f228 updates 4 days ago
Sultan khan bd5ef5e84a no message 4 days ago
Sultan khan 5f82f0db2d fixes and updates 5 days ago
Sultan khan fcdc96d944 no message 7 days ago
Sultan khan 21ae30a8cc profile picture upload 7 days ago
Sultan khan 5f559a44dd profile image upload 7 days ago
haroon amjad 5b44329972 updates 7 days ago
Sultan khan 6d647d75be Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
* 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New:
  Updates
  radiology ai lab analysis & lab ai analysis api end points updates.
  Updates
  updates
  updates

# Conflicts:
#	lib/presentation/symptoms_checker/widgets/selected_organs_section.dart
1 week ago
Sultan khan a5f7bd80b2 updates 1 week ago
haroon amjad a2de3f1b14 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/presentation/symptoms_checker/widgets/selected_organs_section.dart
1 week ago
Sultan khan 712e835176 ui fixes 1 week ago
aamir-csol 10fa8c46cf radiology ai lab analysis & lab ai analysis api end points updates. 1 week ago
haroon amjad 572c37785b updates 1 week ago
haroon amjad 991f9c7a9b Pull to refresh implemented 1 week ago
haroon amjad 71030c0fe9 Updates & fixes 1 week ago
haroon amjad e3f5bb69ac Updates 1 week ago
haroon amjad 081dfce480 Merge branch 'master' into haroon_dev
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/extensions/string_extensions.dart
#	lib/generated/locale_keys.g.dart
#	lib/presentation/emergency_services/call_ambulance/call_ambulance_page.dart
#	lib/presentation/emergency_services/widgets/location_input_bottom_sheet.dart
#	lib/widgets/input_widget.dart
1 week ago
haroon amjad a9f46a39cc Updates 1 week ago
Sultan khan 0d4563542a WD:map issues resolved:
1. map type added to the screen along with the translation
2. null shown for the arabic name of the fixed to show the actual name.
3. if the user opens the locationBottomsheet and close it without input of the area the screen freezes with no action on the location.
4. Gms And Hms Maps handled.
5. theme handled inside the maps screen.
1 week ago
haroon amjad 89a1da4407 Updates 1 week ago
haroon amjad 56f5151c0c Font changes, Updates & fixes 1 week ago
tahaalam c716490b0e map type is added to the maps already present 1 week ago
haroon amjad 453cfc07e1 Updates 1 week ago
haroon amjad 3d39190c62 updates & fixes 1 week ago
haroon amjad 3703afe8bd updates 2 weeks ago
haroon amjad edeae70aa0 Updates 2 weeks ago
haroon amjad 1f290c5bfe updates 2 weeks ago
haroon amjad deca29b423 updates & fixes 2 weeks ago
haroon amjad 93af246700 updates 2 weeks ago
haroon amjad db89408185 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/generated/locale_keys.g.dart
2 weeks ago
haroon amjad 78a6d55b35 Merge branch 'master' into watch_integration
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/generated/locale_keys.g.dart
2 weeks ago
haroon amjad 841fca027c updates 2 weeks ago
tahaalam a8138ba231 Merge remote-tracking branch 'origin/master' into reminer 2 weeks ago
tahaalam 8b829b9101 reminder start time added to the prescription 2 weeks ago
tahaalam 2babda2d63 Merge remote-tracking branch 'origin/master' into labs_graph_pdf 2 weeks ago
tahaalam 1d1c756412 graph values fix and comparision with the pdf 2 weeks ago
haroon amjad 1709b80e84 Updates 2 weeks ago
haroon amjad d053f58b7d Updates 3 weeks ago
haroon amjad 3d877ed28d Updates 3 weeks ago
Haroon Amjad 55b8bc162c Updates 4 weeks ago
tahaalam f84d5c6769 Merge remote-tracking branch 'origin/master' into watch_integration
# Conflicts:
#	lib/splashPage.dart
1 month ago
tahaalam dda4dbeba9 merge issue resolution some import were missing from master. 1 month ago