Commit Graph

966 Commits (43e3c05ba11e49a1c8cf6ab157d37af7e1e70484)

Author SHA1 Message Date
aamir-csol 43e3c05ba1 Merge branch 'master' into dev_aamir 22 hours ago
Sultan khan ab7ca36d5d Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
# Conflicts:
#	assets/langs/en-US.json
22 hours ago
aamir-csol fdf21b725e Zoom in and Out 22 hours ago
Sultan khan 5629012825 live care chat url changed 22 hours ago
Sultan khan 25cc485830 landing navigation item changed from feed back to health calculator and triage page provided 22 hours ago
aamir-csol 458819398d Localization & rad error fix 23 hours ago
aamir-csol 2d61535a59 Localization & rad error fix 23 hours ago
aamir-csol 42f4333a28 Merge branch 'master' into dev_aamir 1 day ago
khansultan1 ff336e1b0e Merge pull request 'dev_sultan' (#272) from dev_sultan into master
Reviewed-on: #272
1 day ago
aamir-csol e5a055d355 Localization & rad error fix 1 day ago
haroon amjad fe82f12b33 fix for patient share 1 day ago
Sultan khan 56d593430d no message 1 day ago
khansultan1 78cf05c0e5 Merge pull request 'Emergency servicews pages changes of passing the values which are displayed outside' (#270) from changes into master
Reviewed-on: #270
1 day ago
tahaalam b93e23a314 Emergency servicews pages changes of passing the values which are displayed outside 1 day ago
Sultan khan 54a6a5cd90 Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan 1 day ago
khansultan1 3393874d78 Merge pull request 'social media icons added' (#268) from changes into master
Reviewed-on: #268
1 day ago
Sultan khan 1ef7ed6344 no message 1 day ago
aamir-csol 13040a17a7 Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/features/authentication/authentication_view_model.dart
1 day ago
tahaalam fb64d3b957 Merge remote-tracking branch 'origin/master' into changes
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/features/authentication/authentication_view_model.dart
#	lib/generated/locale_keys.g.dart
1 day ago
tahaalam e73d2534cc social media elements added for profile and service page 1 day ago
aamir-csol 1c929999f1 Localization 1 day ago
Sultan khan 1366518ce1 fixes and updates 1 day ago
tahaalam 05aaa71cf9 live care changes 1 day 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
Sultan khan 6c3808effe 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
#	lib/presentation/blood_donation/widgets/select_gender_widget.dart
#	lib/presentation/comprehensive_checkup/comprehensive_checkup_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 cfcbaa85a3 LANGUAGE CHANGES 2 days ago
tahaalam ee8257054e Merge remote-tracking branch 'origin/master' into changes
# Conflicts:
#	assets/langs/en-US.json
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
Sultan khan fee2001499 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
2 days ago
Sultan khan 929a25d9a4 no message 2 days ago
tahaalam 138e65d6fc Merge remote-tracking branch 'origin/master' into changes 2 days ago
aamir-csol 60b71e9b1d Merge branch 'master' into dev_aamir 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
Sultan khan 94993fa6fb fixes and updates 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
Sultan khan c1c434789e Rad Description & Ai Description 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
tahaalam 50a597b4d3 lang changes 3 days ago