Commit Graph

1012 Commits (master)

Author SHA1 Message Date
Sultan khan a38a2a0619 Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
# Conflicts:
#	assets/langs/ar-SA.json
#	lib/generated/codegen_loader.g.dart
12 hours ago
khansultan1 75bd5fbe15 Merge pull request 'updates and fixes' (#240) from changes into master
Reviewed-on: #240
12 hours ago
Sultan khan 69310575e5 updates 12 hours ago
tahaalam 994bf95043 updates and fixes 12 hours ago
haroon amjad 4f60227429 LiveCare Video Call fixes 12 hours ago
Sultan khan 772f6caa38 updates 14 hours ago
tahaalam befcee7c65 Merge remote-tracking branch 'origin/master' into changes
# Conflicts:
#	assets/langs/ar-SA.json
14 hours ago
Sultan khan a2c2b24b2a 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:
  health calculator design & timer & bell icon switch changes
  health calculator design & timer & bell icon switch changes
  appointment reminder & weather
  codegen
14 hours ago
Sultan khan 76c3013840 no message 14 hours ago
Sultan khan 2f4db29a70 arabic updated. 14 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
14 hours ago
aamir-csol f199fca859 health calculator design & timer & bell icon switch changes 14 hours ago
aamir-csol 461fa11df3 health calculator design & timer & bell icon switch changes 14 hours ago
tahaalam 04d14a4d82 langauge regarding changes 14 hours ago
Sultan khan 16e898bb6c updates and fixes 15 hours ago
aamir-csol 90bcdf674d Merge branch 'refs/heads/master' into dev_aamir
# Conflicts:
#	android/app/src/main/AndroidManifest.xml
21 hours ago
tahaalam 303fb87661 Merge remote-tracking branch 'origin/master' into changes 2 days ago
tahaalam fcf990bc00 hot fixes 2 days ago
Sultan khan cfea843c4f updates and fixes 2 days ago
aamir-csol 2b0f8b45b0 appointment reminder & weather 2 days ago
Sultan khan a144f30f42 no message 2 days ago
tahaalam d97ead4e03 Merge remote-tracking branch 'origin/master' into changes
# Conflicts:
#	lib/core/app_assets.dart
2 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.
2 days ago
tahaalam ebfefefec0 issue fix for the projects having distance not found if the permission for the application 2 days ago
haroon amjad be8cf08005 Merge branch 'master' into haroon_dev 3 days ago
haroon amjad 509eeb69ac fixes 3 days ago
haroon amjad be08c3f228 updates 3 days ago
Sultan khan bd5ef5e84a no message 3 days ago
Sultan khan beab4c1d08 no message 3 days ago
Sultan khan 8e8177e573 fixes and updates 3 days ago
Sultan khan 3d226c39d0 fixes and updates 3 days ago
Sultan khan 207b84e493 fixes and updates 3 days ago
Sultan khan 7e2c470767 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 & fixes
3 days ago
Sultan khan 5f82f0db2d fixes and updates 3 days ago
haroon amjad 86fa198afc Updates & fixes 3 days ago
haroon amjad 408c0c83d9 updates 5 days ago
haroon amjad a55bfb3b51 Merge branch 'master' into haroon_dev 5 days ago
aamir-csol b4ab3a112c Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/presentation/my_family/widget/family_cards.dart
5 days ago
haroon amjad b82f4cbcb4 Merge branch 'master' into haroon_dev 5 days ago
haroon amjad e60d2566d9 Updates 5 days ago
aamir-csol 13ce350434 family file 5 days ago
Sultan khan 1aacda08a3 no message 5 days ago
Sultan khan 5989dda613 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:
  QLine API changes handled
5 days ago
Sultan khan 21c7b05df9 no message 5 days ago
Sultan khan fcdc96d944 no message 5 days ago
haroon amjad 0566685e48 QLine API changes handled 5 days ago
Sultan khan 21ae30a8cc profile picture upload 5 days ago
Sultan khan 5f559a44dd profile image upload 5 days ago
haroon amjad 6a687f4ff6 Updates & fixes 5 days ago
haroon amjad f472bd49f4 Updates 5 days ago