Commit Graph

1369 Commits (dev_aamir)
 

Author SHA1 Message Date
aamir-csol 43e3c05ba1 Merge branch 'master' into dev_aamir 6 hours ago
khansultan1 855a4e1032 Merge pull request 'dev_sultan' (#276) from dev_sultan into master
Reviewed-on: #276
6 hours ago
aamir-csol a017433e3e Merge branch 'master' into dev_aamir 6 hours ago
aamir-csol ff55257e73 Zoom in and Out 6 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
6 hours ago
aamir-csol fdf21b725e Zoom in and Out 6 hours ago
khansultan1 e9f812eee7 Merge pull request 'Localization' (#274) from dev_aamir into master
Reviewed-on: #274
6 hours ago
Sultan khan 5629012825 live care chat url changed 6 hours ago
Sultan khan 25cc485830 landing navigation item changed from feed back to health calculator and triage page provided 6 hours ago
aamir-csol 458819398d Localization & rad error fix 6 hours ago
aamir-csol 8c321c223d Merge branch 'master' into dev_aamir 7 hours ago
aamir-csol 2d61535a59 Localization & rad error fix 7 hours ago
Sultan khan ad75f6fdbc Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan 9 hours ago
khansultan1 9af2c88a19 Merge pull request 'Localization' (#273) from dev_aamir into master
Reviewed-on: #273
9 hours ago
aamir-csol 42f4333a28 Merge branch 'master' into dev_aamir 9 hours ago
Sultan khan d8950b2ffc Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan 9 hours ago
khansultan1 ff336e1b0e Merge pull request 'dev_sultan' (#272) from dev_sultan into master
Reviewed-on: #272
9 hours ago
aamir-csol e5a055d355 Localization & rad error fix 9 hours ago
Sultan khan b2bd03365c Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan 9 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
9 hours ago
haroon amjad fe82f12b33 fix for patient share 9 hours ago
Sultan khan f794d2b371 Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan 9 hours ago
Sultan khan 56d593430d no message 9 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
11 hours ago
tahaalam b93e23a314 Emergency servicews pages changes of passing the values which are displayed outside 11 hours ago
Sultan khan 54a6a5cd90 Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan 13 hours ago
khansultan1 3393874d78 Merge pull request 'social media icons added' (#268) from changes into master
Reviewed-on: #268
13 hours ago
Sultan khan 1ef7ed6344 no message 13 hours ago
Sultan khan fa6bdea516 Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan 13 hours ago
khansultan1 fbbdfe4c32 Merge pull request 'Localization' (#269) from dev_aamir into master
Reviewed-on: #269
13 hours ago
aamir-csol 13040a17a7 Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/features/authentication/authentication_view_model.dart
13 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
13 hours ago
tahaalam e73d2534cc social media elements added for profile and service page 13 hours ago
khansultan1 e52aa24822 Merge pull request 'dev_sultan' (#267) from dev_sultan into master
Reviewed-on: #267
13 hours ago
aamir-csol 1c929999f1 Localization 14 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
14 hours ago
Sultan khan dfc2e21e8c no message 14 hours ago
Sultan khan 1366518ce1 fixes and updates 14 hours ago
khansultan1 38e1a9ae4e Merge pull request 'Added Localized Error Handling ( faiz_dev )' (#264) from faiz_dev into master
Reviewed-on: #264
14 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
14 hours ago
faizatflutter 61f17a3feb fixed api localization issue 14 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
15 hours ago
Sultan khan 8a41b5716f updates 15 hours ago
khansultan1 779ea23efa Merge pull request 'live care changes' (#263) from changes into master
Reviewed-on: #263
15 hours ago
tahaalam 05aaa71cf9 live care changes 15 hours ago
faizatflutter 8c925a7f5e Merge branch 'master' into faiz_dev
# Conflicts:
#	ios/Podfile.lock
16 hours ago
Sultan khan 5374110bff Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan 1 day ago
khansultan1 1810071f1b Merge pull request 'changes' (#262) from changes into master
Reviewed-on: #262
1 day ago
tahaalam 513422cb03 Merge remote-tracking branch 'origin/master' into changes 1 day ago
tahaalam bf7b0d922e weather permission issue 1 day ago