Commit Graph

116 Commits (2e1f4e87e0a93b6381b6fb1bc13306ea71b49db3)

Author SHA1 Message Date
aamir-csol a105d87241 Merge branch 'master' into dev_aamir
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/features/authentication/authentication_view_model.dart
#	lib/generated/locale_keys.g.dart
4 days ago
aamir-csol 2c7f4ddc48 Ai Analysis & PMA-(1078,1079) 4 days ago
haroon amjad 95b65ed8a5 Merge branch 'haroon_dev' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into haroon_dev
# Conflicts:
#	lib/features/book_appointments/book_appointments_view_model.dart
4 days ago
haroon amjad c9279e2272 updates 4 days ago
Haroon Amjad 23abbebf9e arabic fixes 4 days ago
Haroon Amjad a4573c8710 arabic fixes 4 days ago
Haroon Amjad eeaa22357f Date format changed to en-US 4 days ago
haroon amjad 9ed016ad8b updates & fixes 1 week ago
haroon amjad 3af43dc676 JIRA bug fixes & updates 1 week ago
haroon amjad 85ccf41d04 Updates & fixes for Habib Wallet, Insurance update, Immediate LiveCare 1 week ago
haroon amjad 5c684a6a0d Doctor Rating details implemented 1 week ago
haroon amjad bafe835ebd Scheduled livecare appointment booking fixes 2 weeks ago
haroon amjad cfd0c16738 updates & fixes 2 weeks ago
tahaalam f78eb5da67 Wd: Unware clinic bottom sheet shown on appointment page. 3 weeks ago
haroon amjad 7ead6d79e5 updates 3 weeks ago
haroon amjad f46f978326 Clinic icons updated 3 weeks ago
haroon amjad f54ce71177 translation changes 3 weeks ago
haroon amjad 99282f34e3 Added language change option in landing page 3 weeks ago
haroon amjad 8f428297cb Arabic translations added 1 month ago
haroon amjad a0008c9104 Nearest Appointment sorting fixed 1 month ago
haroon amjad 475a9b9acb Merge branch 'master' into haroon_dev 1 month ago
aamir-csol 6725ab028d doctor search filter design update & switch user bug fix. 1 month ago
haroon amjad e454c9c991 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/core/api_consts.dart
#	lib/core/dependencies.dart
1 month ago
aamir-csol c11e859df1 search doctor by name filter. 1 month ago
haroon amjad 91c16f13d1 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/core/app_assets.dart
1 month ago
haroon amjad 1c0842ab95 updates 1 month ago
aamir-csol 83f04bc0e6 search filter on select doctor page. 1 month ago
aamir-csol c7e4018ddc Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/presentation/appointments/widgets/hospital_bottom_sheet/hospital_bottom_sheet_body.dart
1 month ago
aamir-csol b815affe5c blood group 1 month ago
haroon amjad ede8844f19 Monthly Reports implemented 1 month ago
haroon amjad e9dd2f0648 updates 1 month ago
tahaalam f19d06512a filters changed in region selection bottom sheet 1 month ago
Sultan khan 449c693fdb Merge branch 'refs/heads/faiz_dev' into dev_sultan
# Conflicts:
#	lib/presentation/book_appointment/laser/laser_appointment.dart
1 month ago
haroon amjad 162337b317 Added appointment nearest gate & floor 1 month ago
Sultan khan d55fe5e527 Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan 1 month ago
Sultan khan 0e26505692 covid page inprogress 1 month ago
aamir-csol 6c1707128b Merge branch 'master' into dev_aamir 1 month ago
aamir-csol 3601e39a29 Health calculators & converters 1 month 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 months ago
Sultan khan 873b2a1591 sorting done, covid inprogress 2 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
2 months ago
aamir-csol 135b05e561 Health calculators & converters 2 months ago
haroon amjad f886357bcd updates 2 months ago
haroon amjad b8ecb70aa2 Merge branch 'master' into haroon_dev 2 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
2 months ago
aamir-csol f509a09b34 Health calculators & converters 2 months ago
haroon amjad 15f5eaf8e5 updates 2 months ago
haroon amjad 87fd9a42b7 Nearest Appointment selected 2 months ago
haroon amjad 450f07d39d updates & fixes 2 months ago
haroon amjad a80410d64b LiveCare flow from clinic selection implemented 2 months ago