Commit Graph

1263 Commits (5a4e5e138be1d6abe49912ba6ac297e63501a81b)
 

Author SHA1 Message Date
tahaalam 5a4e5e138b string localization changes 18 hours ago
tahaalam aa22ad1e07 calender request changes 19 hours ago
khansultan1 2a850c732d Merge pull request 'dev_aamir' (#244) from dev_aamir into master
Reviewed-on: #244
21 hours ago
aamir-csol 7d86ca0511 Merge branch 'master' into dev_aamir 21 hours ago
aamir-csol 4c56137f10 calender 21 hours ago
khansultan1 2c3f671a50 Merge pull request 'profile picture fix' (#243) from changes into master
Reviewed-on: #243
22 hours ago
tahaalam c19451a6b6 profile picture fix 22 hours ago
khansultan1 203c025183 Merge pull request 'no message' (#242) from dev_sultan into master
Reviewed-on: #242
24 hours ago
Sultan khan 9e5c9f9b4c no message 24 hours ago
khansultan1 81cdb4be30 Merge pull request 'dev_sultan' (#241) from dev_sultan into master
Reviewed-on: #241
2 days ago
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
2 days ago
khansultan1 75bd5fbe15 Merge pull request 'updates and fixes' (#240) from changes into master
Reviewed-on: #240
2 days ago
Sultan khan 69310575e5 updates 2 days ago
tahaalam 994bf95043 updates and fixes 2 days 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
2 days ago
haroon amjad 4f60227429 LiveCare Video Call fixes 2 days ago
Sultan khan 772f6caa38 updates 2 days ago
khansultan1 bb565c58f4 Merge pull request 'langauge regarding changes' (#237) from changes into master
Reviewed-on: #237
2 days ago
tahaalam befcee7c65 Merge remote-tracking branch 'origin/master' into changes
# Conflicts:
#	assets/langs/ar-SA.json
2 days 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
2 days ago
Sultan khan 76c3013840 no message 2 days ago
khansultan1 bd3aeefbe8 Merge pull request 'health calculator design & timer & bell icon switch changes' (#236) from dev_aamir into master
Reviewed-on: #236
2 days ago
Sultan khan 2f4db29a70 arabic updated. 2 days 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
2 days ago
aamir-csol f199fca859 health calculator design & timer & bell icon switch changes 2 days ago
aamir-csol 461fa11df3 health calculator design & timer & bell icon switch changes 2 days ago
Sultan khan ac6e96ad6c no message 2 days ago
tahaalam 04d14a4d82 langauge regarding changes 2 days ago
khansultan1 6104f38535 Merge pull request 'dev_sultan' (#235) from dev_sultan into master
Reviewed-on: #235
2 days ago
Sultan khan 16e898bb6c updates and fixes 2 days 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 3 days ago
khansultan1 bc97bded62 Merge pull request 'hot fixes' (#234) from changes into master
Reviewed-on: #234
3 days ago
tahaalam 303fb87661 Merge remote-tracking branch 'origin/master' into changes 3 days ago
khansultan1 ef021c1fa0 Merge pull request 'dev_sultan' (#233) from dev_sultan into master
Reviewed-on: #233
3 days ago
tahaalam fcf990bc00 hot fixes 3 days ago
Sultan khan cfea843c4f updates and fixes 3 days ago
aamir-csol 2b0f8b45b0 appointment reminder & weather 3 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
4 days ago
haroon amjad be8cf08005 Merge branch 'master' into haroon_dev 4 days ago
haroon amjad 509eeb69ac fixes 4 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
4 days ago
haroon amjad be08c3f228 updates 4 days ago