Commit Graph

1090 Commits (dev_sultan)

Author SHA1 Message Date
aamir-csol 43e3c05ba1 Merge branch 'master' into dev_aamir 3 hours ago
aamir-csol ff55257e73 Zoom in and Out 3 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
3 hours ago
aamir-csol fdf21b725e Zoom in and Out 3 hours ago
Sultan khan 5629012825 live care chat url changed 3 hours ago
Sultan khan 25cc485830 landing navigation item changed from feed back to health calculator and triage page provided 3 hours ago
aamir-csol 458819398d Localization & rad error fix 3 hours ago
aamir-csol 2d61535a59 Localization & rad error fix 4 hours ago
aamir-csol 42f4333a28 Merge branch 'master' into dev_aamir 6 hours ago
khansultan1 ff336e1b0e Merge pull request 'dev_sultan' (#272) from dev_sultan into master
Reviewed-on: #272
6 hours ago
aamir-csol e5a055d355 Localization & rad error fix 6 hours ago
haroon amjad fe82f12b33 fix for patient share 6 hours ago
Sultan khan 56d593430d no message 6 hours 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
8 hours ago
tahaalam b93e23a314 Emergency servicews pages changes of passing the values which are displayed outside 8 hours ago
Sultan khan 54a6a5cd90 Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan 11 hours ago
khansultan1 3393874d78 Merge pull request 'social media icons added' (#268) from changes into master
Reviewed-on: #268
11 hours ago
Sultan khan 1ef7ed6344 no message 11 hours ago
aamir-csol 13040a17a7 Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/features/authentication/authentication_view_model.dart
11 hours 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
11 hours ago
tahaalam e73d2534cc social media elements added for profile and service page 11 hours ago
aamir-csol 1c929999f1 Localization 11 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
11 hours ago
Sultan khan 1366518ce1 fixes and updates 11 hours ago
faizatflutter 10db964fd8 Merge branch 'master' into faiz_dev
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/generated/locale_keys.g.dart
11 hours ago
faizatflutter 61f17a3feb fixed api localization issue 11 hours ago
Sultan khan b18ddd1ad7 Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
# Conflicts:
#	lib/generated/locale_keys.g.dart
12 hours ago
Sultan khan 8a41b5716f updates 12 hours ago
tahaalam 05aaa71cf9 live care changes 12 hours ago
faizatflutter 8c925a7f5e Merge branch 'master' into faiz_dev
# Conflicts:
#	ios/Podfile.lock
13 hours ago
tahaalam 513422cb03 Merge remote-tracking branch 'origin/master' into changes 1 day ago
tahaalam bf7b0d922e weather permission issue 1 day 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
1 day 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
1 day ago
aamir-csol baa9ebe7ea Merge branch 'master' into dev_aamir
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
1 day ago
Sultan khan 256537cfb3 update and fix 1 day ago
aamir-csol 1849a90b32 Localization 1 day ago
tahaalam cfcbaa85a3 LANGUAGE CHANGES 1 day ago
tahaalam ee8257054e Merge remote-tracking branch 'origin/master' into changes
# Conflicts:
#	assets/langs/en-US.json
1 day ago
tahaalam 6b4d43caf3 referral hardcoded string changes 1 day 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
1 day 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
1 day ago
Sultan khan 929a25d9a4 no message 1 day ago
tahaalam 138e65d6fc Merge remote-tracking branch 'origin/master' into changes 1 day ago
aamir-csol 60b71e9b1d Merge branch 'master' into dev_aamir 1 day ago
aamir-csol 1515fc57e5 Localization 1 day ago
tahaalam bf9b88e79c map prescriptiojn changes
date sorting for the rrt and amublance history.
weather issue,
e refferal langauge
1 day ago
Sultan khan 94993fa6fb fixes and updates 1 day ago
tahaalam 66e23197c5 referral lingual change 2 days ago
Sultan khan 42e710c61f Rad Description & Ai Description 2 days ago