aamir-csol
bb72c7f7d6
Merge branch 'master' into dev_aamir
...
# Conflicts:
# lib/core/api_consts.dart
# lib/presentation/hmg_services/services_page.dart
# pubspec.lock
9 months ago
aamir-csol
0017c0601b
blood donation changes
9 months ago
Haroon6138
a1beacc36e
Merge pull request 'haroon_dev' ( #159 ) from haroon_dev into master
...
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/159
9 months ago
haroon amjad
3e6ee8c10c
Merge branch 'master' into haroon_dev
...
# Conflicts:
# lib/routes/app_routes.dart
9 months ago
haroon amjad
87422e8e05
translation updates
9 months ago
Haroon6138
179b86b2b0
Merge pull request 'fatima' ( #158 ) from fatima into master
...
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/158
9 months ago
Fatimah.Alshammari
f6aa1fc7ac
Merge branch 'refs/heads/master' into fatima
9 months ago
Fatimah.Alshammari
9795276ef9
fixed errors
9 months ago
haroon amjad
96ccb40f36
Merge branch 'master' into haroon_dev
9 months ago
Haroon6138
bb7c05493a
Merge pull request 'fatima' ( #157 ) from fatima into master
...
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/157
9 months ago
haroon amjad
169215fd7b
translation changes
9 months ago
Fatimah.Alshammari
97a47ce4e8
Merge branch 'refs/heads/master' into fatima
...
# Conflicts:
# lib/core/dependencies.dart
# lib/routes/app_routes.dart
9 months ago
Fatimah.Alshammari
287e2b9562
fixed QR
9 months ago
aamir-csol
a816afadea
Merge branch 'master' into dev_aamir
...
# Conflicts:
# lib/core/dependencies.dart
# lib/presentation/hmg_services/services_page.dart
9 months ago
aamir-csol
d76ff5828f
fixes
9 months ago
haroon amjad
8f428297cb
Arabic translations added
9 months ago
Haroon6138
e9d3b3680a
Merge pull request 'haroon_dev' ( #156 ) from haroon_dev into master
...
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/156
9 months ago
haroon amjad
a0008c9104
Nearest Appointment sorting fixed
9 months ago
Fatimah.Alshammari
1d224702ac
Merge branch 'refs/heads/master' into fatima
9 months ago
Fatimah.Alshammari
69666a6f6c
fixed button
9 months ago
haroon amjad
475a9b9acb
Merge branch 'master' into haroon_dev
9 months ago
Haroon6138
06c67a0409
Merge pull request 'dev_aamir' ( #153 ) from dev_aamir into master
...
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/153
10 months ago
Haroon6138
d1b1bbf777
Merge pull request 'dev_sultan' ( #154 ) from dev_sultan into master
...
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/154
10 months ago
Sultan khan
0ddaa6899d
Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
...
* 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New :
fixed parking qr
added parking part
added monthly report
added monthly report
added monthly report
fix error
monthly report
fix toggle
fix toggle
active medication
active medication
active medication
10 months ago
Sultan khan
42222804fd
fix graph dot and bp graph.
10 months ago
aamir-csol
bf210e664d
Merge branch 'master' into dev_aamir
10 months ago
aamir-csol
6725ab028d
doctor search filter design update & switch user bug fix.
10 months ago
haroon amjad
609ae6ab83
updates
10 months ago
haroon amjad
344adf23c0
Merge branch 'master' into haroon_dev
...
# Conflicts:
# lib/core/dependencies.dart
# lib/main.dart
# lib/presentation/hmg_services/services_page.dart
# lib/presentation/home/landing_page.dart
10 months ago
haroon amjad
44ce353dac
updates
10 months ago
Haroon6138
b5753769b7
Merge pull request 'fatima' ( #152 ) from fatima into master
...
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/152
10 months ago
Fatimah.Alshammari
250af1506c
Merge branch 'master' into fatima
...
# Conflicts:
# lib/core/dependencies.dart
# lib/presentation/medical_file/medical_file_page.dart
# lib/routes/app_routes.dart
# lib/services/dialog_service.dart
# lib/theme/colors.dart
10 months ago
haroon amjad
fc750174fe
Merge branch 'master' into haroon_dev
10 months ago
haroon amjad
d848291930
updates
10 months ago
Haroon6138
aee496b7c3
Merge pull request 'dev_sultan' ( #151 ) from dev_sultan into master
...
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/151
10 months ago
Sultan khan
16da0f4d0a
Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
10 months ago
Sultan khan
8ee0e3b4ea
no message
10 months ago
Sultan khan
0c68ca4438
Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
...
* 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New :
Added 'send report to email' feature
Completed the health Tracker Module, Only the email part is left.
only explain api left.
Triage Completed. Explain API left
Till Triage Completed
refactoring
# Conflicts:
# lib/presentation/medical_file/medical_file_page.dart
10 months ago
haroon amjad
e454c9c991
Merge branch 'master' into haroon_dev
...
# Conflicts:
# lib/core/api_consts.dart
# lib/core/dependencies.dart
10 months ago
Haroon6138
96ebc3c7e9
Merge pull request 'dev_aamir' ( #149 ) from dev_aamir into master
...
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/149
10 months ago
Haroon6138
2240c6cc65
Merge pull request 'Health Trackers Feature (faiz_dev)' ( #150 ) from faiz_dev into master
...
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/150
10 months ago
Sultan khan
0514716910
no message
10 months ago
Sultan khan
e903f9c418
Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
...
* 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New :
search filter on select doctor page.
family file fix
blood group
10 months ago
Sultan khan
ac0d72b3ff
vital sign finalized.
10 months ago
aamir-csol
f62c7c9b20
Merge branch 'master' into dev_aamir
10 months ago
aamir-csol
c11e859df1
search doctor by name filter.
10 months ago
faizatflutter
ff2bcbae3f
Merge branch 'master' into faiz_dev
...
# Conflicts:
# lib/core/api_consts.dart
# lib/core/dependencies.dart
# lib/main.dart
10 months ago
faizatflutter
001808488c
Added 'send report to email' feature
10 months ago
haroon amjad
91c16f13d1
Merge branch 'master' into haroon_dev
...
# Conflicts:
# lib/core/app_assets.dart
10 months ago
Haroon6138
a0b07d4b5a
Merge pull request 'dev_aamir' ( #147 ) from dev_aamir into master
...
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/147
10 months ago