Commit Graph

672 Commits (dev_aamir)

Author SHA1 Message Date
aamir-csol ff55257e73 Zoom in and Out 13 hours ago
aamir-csol fdf21b725e Zoom in and Out 13 hours ago
aamir-csol 42f4333a28 Merge branch 'master' into dev_aamir 16 hours ago
aamir-csol e5a055d355 Localization & rad error fix 16 hours ago
haroon amjad fe82f12b33 fix for patient share 16 hours ago
aamir-csol 13040a17a7 Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/features/authentication/authentication_view_model.dart
21 hours ago
aamir-csol 1c929999f1 Localization 21 hours ago
Sultan khan 83a414796a Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
# Conflicts:
#	lib/features/authentication/authentication_view_model.dart
21 hours ago
Sultan khan 1366518ce1 fixes and updates 21 hours ago
faizatflutter 61f17a3feb fixed api localization issue 21 hours ago
Sultan khan 8a41b5716f updates 22 hours ago
faizatflutter 8c925a7f5e Merge branch 'master' into faiz_dev
# Conflicts:
#	ios/Podfile.lock
23 hours ago
tahaalam 513422cb03 Merge remote-tracking branch 'origin/master' into changes 2 days ago
tahaalam bf7b0d922e weather permission issue 2 days ago
aamir-csol cb2e3c7574 Merge branch 'master' into dev_aamir
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/generated/locale_keys.g.dart
#	lib/presentation/book_appointment/select_clinic_page.dart
2 days ago
aamir-csol baa9ebe7ea Merge branch 'master' into dev_aamir
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
2 days ago
Sultan khan 256537cfb3 update and fix 2 days ago
aamir-csol 1849a90b32 Localization 2 days ago
tahaalam 28d03644ba Merge remote-tracking branch 'origin/master' into changes
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/generated/locale_keys.g.dart
2 days ago
aamir-csol 1515fc57e5 Localization 2 days ago
tahaalam bf9b88e79c map prescriptiojn changes
date sorting for the rrt and amublance history.
weather issue,
e refferal langauge
2 days ago
tahaalam 66e23197c5 referral lingual change 2 days ago
Sultan khan bd581c4fe0 Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/generated/locale_keys.g.dart
3 days ago
Sultan khan 82f2adfc3f Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan 3 days ago
tahaalam a31c4c99df Merge remote-tracking branch 'origin/master' into changes
# Conflicts:
#	assets/langs/ar-SA.json
#	lib/generated/codegen_loader.g.dart
#	lib/generated/locale_kesy.g.dart
3 days ago
tahaalam 2d36d91ab6 language and stepper changes 3 days ago
Sultan khan c2dcf95d52 update and fix 3 days ago
aamir-csol 01e56e4fb5 Merge branch 'refs/heads/master' into dev_aamir 3 days ago
aamir-csol db2ccd3be6 Date & Time New Widget For Whole App 3 days ago
khansultan1 8e9c5ae6df Merge pull request 'radiology ai Analysis' (#246) from dev_aamir into master
Reviewed-on: #246
3 days ago
aamir-csol 4cd5132627 radiology ai Analysis 3 days ago
Sultan khan 0a24e6cfd1 Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan 3 days ago
Sultan khan fd3e434b0c no message 3 days ago
tahaalam c19451a6b6 profile picture fix 3 days ago
Sultan khan 69310575e5 updates 4 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
4 days ago
aamir-csol 461fa11df3 health calculator design & timer & bell icon switch changes 4 days ago
Sultan khan 16e898bb6c updates and fixes 4 days ago
aamir-csol 90bcdf674d Merge branch 'refs/heads/master' into dev_aamir
# Conflicts:
#	android/app/src/main/AndroidManifest.xml
4 days ago
tahaalam 303fb87661 Merge remote-tracking branch 'origin/master' into changes 5 days ago
tahaalam fcf990bc00 hot fixes 5 days ago
Sultan khan cfea843c4f updates and fixes 5 days ago
aamir-csol 2b0f8b45b0 appointment reminder & weather 5 days ago
faizatflutter 8c3121fd38 Merge branch 'master' into faiz_dev
# Conflicts:
#	ios/Podfile.lock
5 days ago
Sultan khan a144f30f42 no message 5 days ago
tahaalam d97ead4e03 Merge remote-tracking branch 'origin/master' into changes
# Conflicts:
#	lib/core/app_assets.dart
5 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.
5 days ago
tahaalam ebfefefec0 issue fix for the projects having distance not found if the permission for the application 5 days ago
Sultan khan 3d226c39d0 fixes and updates 6 days ago
Sultan khan 207b84e493 fixes and updates 6 days ago