Commit Graph

302 Commits (cd4fbb1905cfce15cf949c8ac8eaf53e1b571926)

Author SHA1 Message Date
haroon amjad b0708d85d9 updates & fixes 16 hours ago
haroon amjad 3e9a381ed7 Merge branch 'master' into haroon_dev 22 hours ago
faizatflutter 14f3c6cb81 Added Arabic Support for symptoms checker 1 day ago
haroon amjad 10a5a6f558 Ask Doctor implemented 2 days ago
haroon amjad f48eb631ab Merge branch 'master' into haroon_dev 2 days ago
haroon amjad f54ce71177 translation changes 2 days ago
faizatflutter 07447e148b Symptoms Checker flow is completed 3 days ago
haroon amjad 6faca94b89 updates 3 days ago
haroon amjad 5feacfaf27 Translation updates 5 days ago
haroon amjad 39af08ddc3 Translation updates 7 days ago
haroon amjad 475a9b9acb Merge branch 'master' into haroon_dev 1 week 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
Sultan khan 42222804fd fix graph dot and bp graph. 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 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
faizatflutter 3f5bd0a759 Completed the health Tracker Module, Only the email part is left. 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
haroon amjad ede8844f19 Monthly Reports implemented 2 weeks ago
haroon amjad 255353dd21 Bottom nav updates 2 weeks ago
haroon amjad b10d715d55 App updates 3 weeks ago
haroon amjad 05e5b41dc6 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/presentation/medical_file/medical_file_page.dart
3 weeks ago
haroon amjad 6f067d92d6 My invoices implemented 3 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)
3 weeks ago
Sultan khan f7021f685a no message 3 weeks ago
faizatflutter a29c0dd6bc fixed the suggested design changes. (Not reminder ones) 3 weeks ago
faizatflutter f8fdd7570e Merge branch 'master' into faiz_dev
# Conflicts:
#	lib/routes/app_routes.dart
#	lib/theme/colors.dart
3 weeks 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
3 weeks ago
faizatflutter d4dd475e0b Added Graph 3 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
4 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
4 weeks ago
Sultan khan 873b2a1591 sorting done, covid inprogress 4 weeks ago
faizatflutter a1aaa041d1 Water Intake Final Touches 4 weeks 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
4 weeks ago
aamir-csol 135b05e561 Health calculators & converters 4 weeks ago
Fatimah.Alshammari f3674ba06f Merge branch 'refs/heads/master' into fatima
# Conflicts:
#	lib/core/dependencies.dart
#	lib/presentation/hmg_services/services_page.dart
#	lib/routes/app_routes.dart
4 weeks ago
faizatflutter fd2abbbc7b Water Intake Design completed 4 weeks ago
haroon amjad 5581346a2d updates 1 month ago
Sikander Saleem edcab9d26d collapsing_list_view improvement 1 month ago
Sikander Saleem 5191ffeb2c Merge branch 'refs/heads/master' into dev_sikander 1 month ago
Sikander Saleem a78769df67 collapsing_list_view improvement 1 month ago
faizatflutter 94668997aa Updated design for HHC 1 month ago
haroon amjad 450f07d39d updates & fixes 1 month ago
Fatimah.Alshammari 3d8daeb58d Merge branch 'refs/heads/master' into fatima
# Conflicts:
#	lib/core/app_assets.dart
#	lib/core/dependencies.dart
#	lib/core/utils/calendar_utils.dart
#	lib/features/hmg_services/models/ui_models/hmg_services_component_model.dart
#	lib/main.dart
#	lib/presentation/hmg_services/services_page.dart
#	lib/presentation/hmg_services/services_view.dart
#	lib/presentation/medical_file/medical_file_page.dart
#	lib/routes/app_routes.dart
#	lib/theme/colors.dart
#	pubspec.yaml
1 month ago
aamir-csol 7d71d994ea Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/core/app_assets.dart
#	lib/core/enums.dart
#	lib/core/utils/calender_utils_new.dart
#	lib/main.dart
#	lib/presentation/hmg_services/services_page.dart
#	lib/presentation/hmg_services/services_view.dart
#	lib/routes/app_routes.dart
1 month ago
aamir-csol 335e6a6649 Health Calculators 1 month ago
faizatflutter 6f72c99975 Merge branch 'master' into faiz_dev
# Conflicts:
#	lib/presentation/lab/lab_orders_page.dart
#	lib/theme/colors.dart
1 month ago