Commit Graph

703 Commits (5a1fe2b5ca8c37a176bd88b4c4ef5d378c8ff36e)
 

Author SHA1 Message Date
Sultan khan 5a1fe2b5ca vital sign page added 9 months ago
Sultan khan f7021f685a no message 9 months ago
Sultan khan 0895d94df2 Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan 10 months ago
Sultan khan afe169d2d9 silent login fix 10 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
10 months ago
faizatflutter 40f6cafb48 fixed routing again and again. 10 months ago
faizatflutter 81e0680cb3 fixed routing again and again. 10 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
10 months ago
Sultan khan 449c693fdb Merge branch 'refs/heads/faiz_dev' into dev_sultan
# Conflicts:
#	lib/presentation/book_appointment/laser/laser_appointment.dart
10 months ago
faizatflutter f8fdd7570e Merge branch 'master' into faiz_dev
# Conflicts:
#	lib/routes/app_routes.dart
#	lib/theme/colors.dart
10 months ago
faizatflutter 0e2de5a55d Completed Graph 10 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
10 months ago
haroon amjad e9590a15d3 updates & fixes 10 months ago
haroon amjad 162337b317 Added appointment nearest gate & floor 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
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
haroon amjad 3cc2610d30 updates 10 months ago
haroon amjad f886357bcd updates 10 months ago
Sultan khan 40638cfec4 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:
  collapsing_list_view improvement
  Updated design for HHC
  updates & fixes
  QLine API implementation enhancements
  LiveCare flow from clinic selection implemented

# Conflicts:
#	lib/presentation/home/landing_page.dart
10 months ago
faizatflutter fd2abbbc7b Water Intake Design completed 10 months ago
haroon amjad 5581346a2d updates 10 months ago
haroon amjad b8ecb70aa2 Merge branch 'master' into haroon_dev 10 months ago
Haroon6138 cf51b95f84 Merge pull request 'dev_aamir' (#126) from dev_aamir into master
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/126
10 months ago
aamir-csol ada169f83f Health calculators & converters 10 months ago
aamir-csol c921228ad9 Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/presentation/book_appointment/select_clinic_page.dart
#	lib/presentation/health_calculators/health_calculator_result.dart
10 months ago
aamir-csol f509a09b34 Health calculators & converters 10 months ago
Haroon6138 89d684d600 Merge pull request 'dev_sikander' (#125) from dev_sikander into master
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/125
10 months ago
Sikander Saleem 60f6fcfecb Merge branch 'refs/heads/master' into dev_sikander 10 months ago
Sikander Saleem edcab9d26d collapsing_list_view improvement 10 months ago
Haroon6138 4690537462 Merge pull request 'dev_sikander' (#124) from dev_sikander into master
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/124
10 months ago
Sikander Saleem 5191ffeb2c Merge branch 'refs/heads/master' into dev_sikander 10 months ago