Commit Graph

1253 Commits (a38a2a06193770e93ab39b54cffde6bfa9867269)
 

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
1 day ago
khansultan1 75bd5fbe15 Merge pull request 'updates and fixes' (#240) from changes into master
Reviewed-on: #240
1 day ago
Sultan khan 69310575e5 updates 1 day ago
tahaalam 994bf95043 updates and fixes 1 day ago
Haroon6138 9cf6a63c4e Merge pull request 'LiveCare Video Call fixes' (#239) from haroon_dev into master
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/239
1 day ago
haroon amjad 4f60227429 LiveCare Video Call fixes 1 day ago
Sultan khan 772f6caa38 updates 1 day ago
khansultan1 bb565c58f4 Merge pull request 'langauge regarding changes' (#237) from changes into master
Reviewed-on: #237
1 day ago
tahaalam befcee7c65 Merge remote-tracking branch 'origin/master' into changes
# Conflicts:
#	assets/langs/ar-SA.json
1 day 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
1 day ago
Sultan khan 76c3013840 no message 1 day ago
khansultan1 bd3aeefbe8 Merge pull request 'health calculator design & timer & bell icon switch changes' (#236) from dev_aamir into master
Reviewed-on: #236
1 day ago
Sultan khan 2f4db29a70 arabic updated. 1 day 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
1 day ago
aamir-csol f199fca859 health calculator design & timer & bell icon switch changes 1 day ago
aamir-csol 461fa11df3 health calculator design & timer & bell icon switch changes 1 day ago
Sultan khan ac6e96ad6c no message 1 day ago
tahaalam 04d14a4d82 langauge regarding changes 1 day ago
khansultan1 6104f38535 Merge pull request 'dev_sultan' (#235) from dev_sultan into master
Reviewed-on: #235
1 day ago
Sultan khan 16e898bb6c updates and fixes 1 day ago
aamir-csol 90bcdf674d Merge branch 'refs/heads/master' into dev_aamir
# Conflicts:
#	android/app/src/main/AndroidManifest.xml
2 days ago
Sultan khan 620d89fcd1 Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan 2 days ago
khansultan1 bc97bded62 Merge pull request 'hot fixes' (#234) from changes into master
Reviewed-on: #234
2 days ago
tahaalam 303fb87661 Merge remote-tracking branch 'origin/master' into changes 2 days ago
khansultan1 ef021c1fa0 Merge pull request 'dev_sultan' (#233) from dev_sultan into master
Reviewed-on: #233
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 3 days ago
tahaalam d97ead4e03 Merge remote-tracking branch 'origin/master' into changes
# Conflicts:
#	lib/core/app_assets.dart
3 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.
3 days ago
tahaalam 12b611500d application to get the fine location permission added to the manifest to get the accurate location 3 days ago
tahaalam ebfefefec0 issue fix for the projects having distance not found if the permission for the application 3 days ago
aamir-csol 7bf69c52f0 Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/generated/codegen_loader.g.dart
3 days ago
aamir-csol 2c7c71c566 codegen 3 days ago
Haroon6138 730a4f0040 Merge pull request 'haroon_dev' (#231) from haroon_dev into master
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/231
3 days ago
haroon amjad be8cf08005 Merge branch 'master' into haroon_dev 3 days ago
haroon amjad 509eeb69ac fixes 3 days ago
Haroon6138 b10142061e Merge pull request 'fixes and updates' (#230) from dev_sultan into master
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/230
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
Haroon6138 b7986b753b Merge pull request 'dev_sultan' (#229) from dev_sultan into master
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/229
3 days ago
Sultan khan 3d226c39d0 fixes and updates 4 days ago
Sultan khan 207b84e493 fixes and updates 4 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
4 days ago
Sultan khan 5f82f0db2d fixes and updates 4 days ago
Haroon6138 46f9d38dcc Merge pull request 'haroon_dev' (#228) from haroon_dev into master
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/228
4 days ago
haroon amjad 76ebdf6062 Merge branch 'master' into haroon_dev 4 days ago