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 |
khansultan1
|
e52aa24822
|
Merge pull request 'dev_sultan' (#267) from dev_sultan into master
Reviewed-on: #267
|
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
|
dfc2e21e8c
|
no message
|
11 hours ago |
Sultan khan
|
1366518ce1
|
fixes and updates
|
11 hours ago |
khansultan1
|
38e1a9ae4e
|
Merge pull request 'Added Localized Error Handling ( faiz_dev )' (#264) from faiz_dev into master
Reviewed-on: #264
|
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 |
khansultan1
|
779ea23efa
|
Merge pull request 'live care changes' (#263) from changes into master
Reviewed-on: #263
|
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 |
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 |
Sultan khan
|
464991153f
|
Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
|
1 day ago |
khansultan1
|
a651e2a650
|
Merge pull request 'Localization' (#261) from dev_aamir into master
Reviewed-on: #261
|
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 |
khansultan1
|
b51cd52fa4
|
Merge pull request 'dev_sultan' (#260) from dev_sultan into master
Reviewed-on: #260
|
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 |
khansultan1
|
d7794d8ab2
|
Merge pull request 'language changes' (#258) from changes into master
Reviewed-on: #258
|
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
|
c91d25add3
|
Merge remote-tracking branch 'origin/master' into changes
|
1 day ago |
tahaalam
|
cfcbaa85a3
|
LANGUAGE CHANGES
|
1 day ago |
Sultan khan
|
086df4cdd8
|
Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
|
1 day ago |
khansultan1
|
fbe2406d34
|
Merge pull request 'map changes and refferal changes' (#255) from changes into master
Reviewed-on: #255
|
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 |
khansultan1
|
fecf17fb7e
|
Merge pull request 'dev_sultan' (#257) from dev_sultan into master
Reviewed-on: #257
|
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 |
khansultan1
|
43497a2f11
|
Merge pull request 'Localization' (#256) from dev_aamir into master
Reviewed-on: #256
|
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
|
a81044c7eb
|
Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
|
1 day ago |
khansultan1
|
8be2398cc6
|
Merge pull request 'fixes and updates' (#254) from dev_sultan into master
Reviewed-on: #254
|
1 day ago |
Sultan khan
|
94993fa6fb
|
fixes and updates
|
1 day ago |
tahaalam
|
66e23197c5
|
referral lingual change
|
2 days ago |
khansultan1
|
1e65a67f0e
|
Merge pull request 'dev_sultan' (#253) from dev_sultan into master
Reviewed-on: #253
|
2 days ago |
Sultan khan
|
42e710c61f
|
Rad Description & Ai Description
|
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
|
2 days ago |
khansultan1
|
248faa3ac7
|
Merge pull request 'language changes' (#251) from changes into master
Reviewed-on: #251
|
2 days ago |