Commit Graph

575 Commits (changes)

Author SHA1 Message Date
tahaalam befcee7c65 Merge remote-tracking branch 'origin/master' into changes
# Conflicts:
#	assets/langs/ar-SA.json
3 hours ago
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
3 hours ago
aamir-csol 461fa11df3 health calculator design & timer & bell icon switch changes 4 hours ago
tahaalam 04d14a4d82 langauge regarding changes 4 hours ago
Sultan khan 16e898bb6c updates and fixes 4 hours ago
aamir-csol 90bcdf674d Merge branch 'refs/heads/master' into dev_aamir
# Conflicts:
#	android/app/src/main/AndroidManifest.xml
11 hours ago
tahaalam 303fb87661 Merge remote-tracking branch 'origin/master' into changes 1 day ago
tahaalam fcf990bc00 hot fixes 1 day ago
Sultan khan cfea843c4f updates and fixes 1 day ago
aamir-csol 2b0f8b45b0 appointment reminder & weather 1 day ago
Sultan khan a144f30f42 no message 1 day ago
tahaalam d97ead4e03 Merge remote-tracking branch 'origin/master' into changes
# Conflicts:
#	lib/core/app_assets.dart
1 day 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.
1 day ago
haroon amjad 86fa198afc Updates & fixes 3 days ago
haroon amjad 408c0c83d9 updates 4 days ago
Sultan khan fcdc96d944 no message 4 days ago
Sultan khan 21ae30a8cc profile picture upload 4 days ago
Sultan khan 5f559a44dd profile image upload 4 days ago
haroon amjad a0d9c35d0a Merge branch 'master' into haroon_dev 4 days ago
haroon amjad 5b44329972 updates 4 days ago
aamir-csol 7a0caa05c3 Merge branch 'master' into dev_aamir 4 days ago
aamir-csol d1e0ec31e6 radiology ai lab analysis & lab ai analysis api end points updates. 4 days ago
haroon amjad b33a559305 Dental workflow implemented 5 days ago
Sultan khan 3d1c415e2c my invoice updated 5 days ago
haroon amjad a2de3f1b14 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/presentation/symptoms_checker/widgets/selected_organs_section.dart
5 days ago
aamir-csol 10fa8c46cf radiology ai lab analysis & lab ai analysis api end points updates. 5 days ago
haroon amjad 572c37785b updates 5 days ago
haroon amjad 13a4c9e0f8 updates 6 days ago
haroon amjad e3f5bb69ac Updates 6 days ago
haroon amjad 92101d2b05 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/presentation/my_family/widget/family_cards.dart
6 days ago
haroon amjad 89a1da4407 Updates 6 days ago
haroon amjad 56f5151c0c Font changes, Updates & fixes 6 days ago
aamir-csol be6d33e51b family switch parent child and child 2 6 days ago
aamir-csol e9ec23f506 family switch parent child and child 2 1 week ago
haroon amjad 0eb9ec11d3 remote localization files added 1 week ago
haroon amjad f929bd9017 Updates 1 week ago
aamir-csol aa17688de6 Merge branch 'master' into dev_aamir 1 week ago
haroon amjad 3d39190c62 updates & fixes 1 week ago
haroon amjad 04cbb3db40 no message 1 week ago
haroon amjad f7446d0d41 updates 1 week ago
aamir-csol 2a8f67bba1 family file switch back multi 1 week ago
haroon amjad 3703afe8bd updates 1 week ago
haroon amjad 93af246700 updates 1 week ago
haroon amjad f9f2e22376 updates 1 week ago
haroon amjad 7e73741d08 Bookmark icons added 2 weeks ago
haroon amjad bd65d05e9e Merge branch 'master' into haroon_dev 2 weeks ago
haroon amjad a13d0cf0e4 updates 2 weeks ago
Sultan khan c970a3f697 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
  family file switch back issue fixed
  Vital sign updates
  updates
  Updates
  Added location option in region selection bottom sheet
  Updates
  Profile settings update
2 weeks ago
Sultan khan 6178062ed0 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: (33 commits)
  reminder start time added to the prescription
  Invoices Filter
  Updates
  updates
  Revert "graph values fix and comparision with the pdf"
  graph values fix and comparision with the pdf
  graph values fix and comparision with the pdf
  Updates
  Updates
  updates
  Updates
  Updates
  Updates
  Updates
  Habib Wallet updates
  Changes for AI Lab analysis
  App update page updates
  updates
  Updates
  warning dialog displayed to user if the watch intented is not currently implemented
  ...

# Conflicts:
#	lib/features/authentication/authentication_view_model.dart
2 weeks ago
haroon amjad 837a934d0d updates 2 weeks ago