 tahaalam
|
14842677e5
|
Merge remote-tracking branch 'origin/master'
|
9 months ago |
Sultan khan
|
d62324044a
|
default appointment load fix
|
9 months ago |
|
Sultan khan
|
dc8031bb41
|
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:
updates
fixed the suggested design changes. (Not reminder ones)
fixed the suggested design changes. (Not reminder ones)
|
9 months ago |
|
Sultan khan
|
5a1fe2b5ca
|
vital sign page added
|
9 months ago |
|
Sultan khan
|
f7021f685a
|
no message
|
9 months ago |
faizatflutter
|
597579e677
|
refactoring
|
9 months ago |
 Haroon6138
|
1dce2a5c3a
|
Merge pull request 'haroon_dev' (#139) from haroon_dev into master
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/139
|
9 months ago |
|
haroon amjad
|
93979707e4
|
Merge branch 'master' into haroon_dev
|
9 months ago |
|
Haroon6138
|
cc7239a473
|
Merge pull request 'suggested design changes fixed. faiz_dev' (#138) from faiz_dev into master
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/138
|
9 months ago |
|
haroon amjad
|
213662e718
|
updates
|
9 months ago |
|
faizatflutter
|
57f693e0d9
|
fixed the suggested design changes. (Not reminder ones)
|
9 months ago |
|
faizatflutter
|
460e32d25a
|
Merge branch 'master' into faiz_dev
# Conflicts:
# lib/presentation/hmg_services/services_page.dart
|
9 months ago |
|
faizatflutter
|
a29c0dd6bc
|
fixed the suggested design changes. (Not reminder ones)
|
9 months ago |
|
Haroon6138
|
06f6cb1514
|
Merge pull request 'dev_sultan' (#137) from dev_sultan into master
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/137
|
9 months ago |
|
Sultan khan
|
0895d94df2
|
Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
|
9 months ago |
|
Sultan khan
|
afe169d2d9
|
silent login fix
|
9 months ago |
|
Haroon6138
|
d01506ae14
|
Merge pull request 'fixed' (#136) from faiz_dev into master
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/136
|
9 months ago |
|
faizatflutter
|
40f6cafb48
|
fixed routing again and again.
|
9 months ago |
|
faizatflutter
|
81e0680cb3
|
fixed routing again and again.
|
9 months ago |
|
Haroon6138
|
0ffa5d7474
|
Merge pull request 'Water intake Module Completed (faiz_dev)' (#135) from faiz_dev into master
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/135
|
9 months ago |
|
Sultan khan
|
449c693fdb
|
Merge branch 'refs/heads/faiz_dev' into dev_sultan
# Conflicts:
# lib/presentation/book_appointment/laser/laser_appointment.dart
|
9 months ago |
|
faizatflutter
|
f8fdd7570e
|
Merge branch 'master' into faiz_dev
# Conflicts:
# lib/routes/app_routes.dart
# lib/theme/colors.dart
|
9 months ago |
|
faizatflutter
|
0e2de5a55d
|
Completed Graph
|
9 months ago |
|
Haroon6138
|
8a589ecaaf
|
Merge pull request 'haroon_dev' (#134) from haroon_dev into master
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/134
|
9 months ago |
|
haroon amjad
|
e9590a15d3
|
updates & fixes
|
9 months ago |
|
haroon amjad
|
162337b317
|
Added appointment nearest gate & floor
|
10 months ago |
Fatimah.Alshammari
|
11de01e079
|
Merge branch 'refs/heads/master' into fatima
# Conflicts:
# lib/presentation/hmg_services/services_page.dart
# lib/routes/app_routes.dart
# lib/theme/colors.dart
|
10 months ago |
|
Fatimah.Alshammari
|
62bb667cb8
|
added parking part
|
10 months ago |
|
faizatflutter
|
d4dd475e0b
|
Added Graph
|
10 months ago |
|
Sultan khan
|
d55fe5e527
|
Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
|
10 months ago |
|
Sultan khan
|
0e26505692
|
covid page inprogress
|
10 months ago |
|
Haroon6138
|
58b1e3a386
|
Merge pull request 'dev_aamir' (#133) from dev_aamir into master
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/133
|
10 months ago |
aamir-csol
|
6c1707128b
|
Merge branch 'master' into dev_aamir
|
10 months ago |
|
aamir-csol
|
3601e39a29
|
Health calculators & converters
|
10 months ago |
|
Haroon6138
|
e0606ceb65
|
Merge pull request 'dev_sultan' (#132) from dev_sultan into master
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/132
|
10 months ago |
|
faizatflutter
|
333046951c
|
Merge branch 'master' into faiz_dev
# Conflicts:
# lib/core/app_assets.dart
# lib/core/dependencies.dart
# lib/main.dart
# lib/routes/app_routes.dart
|
10 months ago |
|
Sultan khan
|
6ceee6973f
|
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:
sickleave fix
Health calculators & converters
updates
updates
updates
updates
Nearest Appointment selected
# Conflicts:
# lib/presentation/lab/lab_orders_page.dart
|
10 months ago |
|
Sultan khan
|
68a34369ee
|
no message
|
10 months ago |
|
Sultan khan
|
873b2a1591
|
sorting done, covid inprogress
|
10 months ago |
|
faizatflutter
|
a1aaa041d1
|
Water Intake Final Touches
|
10 months ago |
|
Haroon6138
|
37574412a5
|
Merge pull request 'haroon_dev' (#130) from haroon_dev into master
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/130
|
10 months ago |
|
haroon amjad
|
b353de3cf8
|
Merge branch 'master' into haroon_dev
# Conflicts:
# lib/presentation/book_appointment/select_doctor_page.dart
# lib/presentation/book_appointment/widgets/doctor_card.dart
|
10 months ago |
|
haroon amjad
|
dcdd17f0e9
|
sickleave fix
|
10 months ago |
|
Haroon6138
|
8b90a84adf
|
Merge pull request 'dev_aamir' (#129) from dev_aamir into master
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/129
|
10 months ago |
|
aamir-csol
|
54f8391066
|
Merge branch 'master' into dev_aamir
# Conflicts:
# lib/presentation/lab/lab_orders_page.dart
|
10 months ago |
|
aamir-csol
|
135b05e561
|
Health calculators & converters
|
10 months ago |
|
haroon amjad
|
510d82b592
|
Merge branch 'master' into haroon_dev
|
10 months ago |
|
Haroon6138
|
e1a021129b
|
Merge pull request 'dev_sultan' (#128) from dev_sultan into master
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/128
|
10 months ago |
|
haroon amjad
|
1c883764ac
|
updates
|
10 months ago |
|
Sultan khan
|
366429f083
|
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:
Health calculators & converters
Health calculators & converters
collapsing_list_view improvement
# Conflicts:
# lib/widgets/appbar/collapsing_list_view.dart
|
10 months ago |