Commit Graph

1364 Commits (ab7ca36d5d9c8bd808c93547d7dd8992ec3534a5)
 

Author SHA1 Message Date
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
19 hours ago
khansultan1 e9f812eee7 Merge pull request 'Localization' (#274) from dev_aamir into master
Reviewed-on: #274
19 hours ago
Sultan khan 5629012825 live care chat url changed 19 hours ago
Sultan khan 25cc485830 landing navigation item changed from feed back to health calculator and triage page provided 20 hours ago
aamir-csol 458819398d Localization & rad error fix 20 hours ago
aamir-csol 8c321c223d Merge branch 'master' into dev_aamir 20 hours ago
aamir-csol 2d61535a59 Localization & rad error fix 20 hours ago
Sultan khan ad75f6fdbc Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan 22 hours ago
khansultan1 9af2c88a19 Merge pull request 'Localization' (#273) from dev_aamir into master
Reviewed-on: #273
22 hours ago
aamir-csol 42f4333a28 Merge branch 'master' into dev_aamir 22 hours ago
Sultan khan d8950b2ffc Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan 22 hours ago
khansultan1 ff336e1b0e Merge pull request 'dev_sultan' (#272) from dev_sultan into master
Reviewed-on: #272
22 hours ago
aamir-csol e5a055d355 Localization & rad error fix 22 hours ago
Sultan khan b2bd03365c Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan 23 hours ago
Haroon6138 a19cf13f0a Merge pull request 'fix for patient share' (#271) from haroon_dev into master
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/271
23 hours ago
haroon amjad fe82f12b33 fix for patient share 23 hours ago
Sultan khan f794d2b371 Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan 23 hours ago
Sultan khan 56d593430d no message 23 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
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
Sultan khan fa6bdea516 Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan 1 day ago
khansultan1 fbbdfe4c32 Merge pull request 'Localization' (#269) from dev_aamir into master
Reviewed-on: #269
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
khansultan1 e52aa24822 Merge pull request 'dev_sultan' (#267) from dev_sultan into master
Reviewed-on: #267
1 day ago
aamir-csol 1c929999f1 Localization 1 day 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
1 day ago
Sultan khan dfc2e21e8c no message 1 day ago
Sultan khan 1366518ce1 fixes and updates 1 day ago
khansultan1 38e1a9ae4e Merge pull request 'Added Localized Error Handling ( faiz_dev )' (#264) from faiz_dev into master
Reviewed-on: #264
1 day 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
1 day ago
faizatflutter 61f17a3feb fixed api localization issue 1 day 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
1 day ago
Sultan khan 8a41b5716f updates 1 day ago
khansultan1 779ea23efa Merge pull request 'live care changes' (#263) from changes into master
Reviewed-on: #263
1 day ago
tahaalam 05aaa71cf9 live care changes 1 day ago
faizatflutter 8c925a7f5e Merge branch 'master' into faiz_dev
# Conflicts:
#	ios/Podfile.lock
1 day ago
Sultan khan 5374110bff Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan 2 days ago
khansultan1 1810071f1b Merge pull request 'changes' (#262) from changes into master
Reviewed-on: #262
2 days ago
tahaalam 513422cb03 Merge remote-tracking branch 'origin/master' into changes 2 days ago
tahaalam bf7b0d922e weather permission issue 2 days ago
Sultan khan 464991153f Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan 2 days ago
khansultan1 a651e2a650 Merge pull request 'Localization' (#261) from dev_aamir into master
Reviewed-on: #261
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
khansultan1 b51cd52fa4 Merge pull request 'dev_sultan' (#260) from dev_sultan into master
Reviewed-on: #260
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