Commit Graph

730 Commits (a2fde1ddebbdf07c006ba40faabbec3769b0e47a)
 

Author SHA1 Message Date
Haroon6138 a2fde1ddeb Merge pull request 'haroon_dev' (#143) from haroon_dev into master
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/143
1 week ago
haroon amjad ede8844f19 Monthly Reports implemented 1 week ago
haroon amjad 255353dd21 Bottom nav updates 1 week ago
haroon amjad c10ce10f10 Merge branch 'master' into haroon_dev 1 week ago
haroon amjad e9dd2f0648 updates 1 week ago
Haroon6138 853a866567 Merge pull request 'haroon_dev' (#142) from haroon_dev into master
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/142
1 week ago
haroon amjad 210da3404c updates 1 week ago
haroon amjad 32ee47ca66 Merge branch 'master' into haroon_dev 1 week ago
Haroon6138 ba211ea4c2 Merge pull request 'hospital_filter' (#141) from hospital_filter into master
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/141
1 week ago
haroon amjad b10d715d55 App updates 1 week ago
tahaalam f19d06512a filters changed in region selection bottom sheet 2 weeks ago
haroon amjad 05e5b41dc6 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/presentation/medical_file/medical_file_page.dart
2 weeks ago
Haroon6138 b7a32c7453 Merge pull request 'dev_sultan' (#140) from dev_sultan into master
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/140
2 weeks ago
haroon amjad 6f067d92d6 My invoices implemented 2 weeks ago
tahaalam 14842677e5 Merge remote-tracking branch 'origin/master' 2 weeks ago
Sultan khan d62324044a default appointment load fix 2 weeks 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)
2 weeks ago
Sultan khan 5a1fe2b5ca vital sign page added 2 weeks ago
Sultan khan f7021f685a no message 2 weeks 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
2 weeks ago
haroon amjad 93979707e4 Merge branch 'master' into haroon_dev 2 weeks 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
2 weeks ago
haroon amjad 213662e718 updates 2 weeks ago
faizatflutter 57f693e0d9 fixed the suggested design changes. (Not reminder ones) 2 weeks ago
faizatflutter 460e32d25a Merge branch 'master' into faiz_dev
# Conflicts:
#	lib/presentation/hmg_services/services_page.dart
2 weeks ago
faizatflutter a29c0dd6bc fixed the suggested design changes. (Not reminder ones) 2 weeks 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
2 weeks ago
Sultan khan 0895d94df2 Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan 2 weeks ago
Sultan khan afe169d2d9 silent login fix 2 weeks 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
2 weeks ago
faizatflutter 40f6cafb48 fixed routing again and again. 2 weeks ago
faizatflutter 81e0680cb3 fixed routing again and again. 2 weeks 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
2 weeks ago
Sultan khan 449c693fdb Merge branch 'refs/heads/faiz_dev' into dev_sultan
# Conflicts:
#	lib/presentation/book_appointment/laser/laser_appointment.dart
2 weeks ago
faizatflutter f8fdd7570e Merge branch 'master' into faiz_dev
# Conflicts:
#	lib/routes/app_routes.dart
#	lib/theme/colors.dart
2 weeks ago
faizatflutter 0e2de5a55d Completed Graph 2 weeks 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
2 weeks ago
haroon amjad e9590a15d3 updates & fixes 2 weeks ago
haroon amjad 162337b317 Added appointment nearest gate & floor 2 weeks ago
faizatflutter d4dd475e0b Added Graph 2 weeks ago
Sultan khan d55fe5e527 Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan 2 weeks ago
Sultan khan 0e26505692 covid page inprogress 2 weeks 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
2 weeks ago
aamir-csol 6c1707128b Merge branch 'master' into dev_aamir 2 weeks ago
aamir-csol 3601e39a29 Health calculators & converters 2 weeks 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
2 weeks 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
2 weeks 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
2 weeks ago
Sultan khan 68a34369ee no message 2 weeks ago
Sultan khan 873b2a1591 sorting done, covid inprogress 2 weeks ago