Commit Graph

442 Commits (cd4fbb1905cfce15cf949c8ac8eaf53e1b571926)

Author SHA1 Message Date
haroon amjad b0708d85d9 updates & fixes 2 days ago
haroon amjad 20216cd4ae Merge branch 'master' into haroon_dev 2 days ago
aamir-csol 2bbfe1f131 Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/presentation/profile_settings/profile_settings.dart
2 days ago
aamir-csol 8b701255ed logout & family file fix 2 days ago
haroon amjad 7ead6d79e5 updates 2 days ago
haroon amjad 3e9a381ed7 Merge branch 'master' into haroon_dev 2 days ago
faizatflutter 14f3c6cb81 Added Arabic Support for symptoms checker 3 days ago
haroon amjad 10a5a6f558 Ask Doctor implemented 3 days ago
haroon amjad f48eb631ab Merge branch 'master' into haroon_dev 3 days ago
haroon amjad f54ce71177 translation changes 3 days ago
faizatflutter 07447e148b Symptoms Checker flow is completed 4 days ago
haroon amjad 99282f34e3 Added language change option in landing page 4 days ago
aamir-csol 418297b6fb Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/core/api_consts.dart
5 days ago
haroon amjad 9ef70a250d translation updates 6 days ago
haroon amjad 3fc1302eaf New Flutter App param added 6 days ago
haroon amjad 5feacfaf27 Translation updates 6 days ago
haroon amjad e5f24b9c06 updates 1 week ago
haroon amjad 00475dc100 Merge branch 'master' into haroon_dev 1 week ago
haroon amjad 3ff9628cd3 Translation updates 1 week ago
aamir-csol bb72c7f7d6 Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/core/api_consts.dart
#	lib/presentation/hmg_services/services_page.dart
#	pubspec.lock
1 week ago
aamir-csol 0017c0601b blood donation changes 1 week ago
Sultan khan 7d8537fae6 Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan 1 week ago
haroon amjad 3e6ee8c10c Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/routes/app_routes.dart
1 week ago
haroon amjad 87422e8e05 translation updates 1 week ago
Fatimah.Alshammari 9795276ef9 fixed errors 1 week ago
Fatimah.Alshammari 97a47ce4e8 Merge branch 'refs/heads/master' into fatima
# Conflicts:
#	lib/core/dependencies.dart
#	lib/routes/app_routes.dart
1 week ago
Fatimah.Alshammari 287e2b9562 fixed QR 1 week ago
Sultan khan 8b5c4d7575 Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
# Conflicts:
#	lib/core/dependencies.dart
#	lib/routes/app_routes.dart
1 week ago
Sultan khan 8c92df8648 contact us page fix 1 week ago
haroon amjad a0008c9104 Nearest Appointment sorting fixed 2 weeks ago
Fatimah.Alshammari 1d224702ac Merge branch 'refs/heads/master' into fatima 2 weeks ago
Fatimah.Alshammari 69666a6f6c fixed button 2 weeks ago
haroon amjad 475a9b9acb Merge branch 'master' into haroon_dev 2 weeks 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
2 weeks ago
haroon amjad 609ae6ab83 updates 2 weeks 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
2 weeks ago
haroon amjad 44ce353dac updates 2 weeks 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
2 weeks ago
haroon amjad d848291930 updates 2 weeks ago
Sultan khan 8ee0e3b4ea no message 2 weeks ago
haroon amjad e454c9c991 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/core/api_consts.dart
#	lib/core/dependencies.dart
2 weeks ago
faizatflutter ff2bcbae3f Merge branch 'master' into faiz_dev
# Conflicts:
#	lib/core/api_consts.dart
#	lib/core/dependencies.dart
#	lib/main.dart
2 weeks ago
haroon amjad 91c16f13d1 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/core/app_assets.dart
2 weeks ago
haroon amjad 1c0842ab95 updates 2 weeks ago
faizatflutter 3f5bd0a759 Completed the health Tracker Module, Only the email part is left. 2 weeks ago
aamir-csol c7e4018ddc Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/presentation/appointments/widgets/hospital_bottom_sheet/hospital_bottom_sheet_body.dart
2 weeks ago
aamir-csol b815affe5c blood group 2 weeks ago
haroon amjad 02930a901e Indoor navigation implementation & Landing page swiper card updates 2 weeks ago
Fatimah.Alshammari 20e4f82df3 Merge branch 'master' into fatima
# Conflicts:
#	lib/core/dependencies.dart
#	lib/main.dart
#	lib/presentation/hmg_services/services_page.dart
#	lib/presentation/medical_file/medical_file_page.dart
#	lib/routes/app_routes.dart
2 weeks ago
Fatimah.Alshammari 8ae81d2b24 fixed parking qr 2 weeks ago