Commit Graph

133 Commits (2ab3e178a2c879be8ed5d6c8f2a99393a32a6d36)

Author SHA1 Message Date
Sikander Saleem f376f430c6 Merge branch 'refs/heads/master' into dev_sikander 3 weeks ago
haroon amjad 4e6d3d3178 SmartWatch implementation contd. 3 weeks ago
Sikander Saleem 2648f304f6 Merge branch 'refs/heads/master' into dev_sikander
# Conflicts:
#	lib/core/app_assets.dart
#	lib/presentation/hmg_services/services_page.dart
#	lib/presentation/home/data/landing_page_data.dart
#	lib/presentation/home/landing_page.dart
#	lib/presentation/home/widgets/habib_wallet_card.dart
#	lib/presentation/home/widgets/small_service_card.dart
#	lib/presentation/lab/lab_orders_page.dart
#	lib/widgets/appbar/collapsing_list_view.dart
3 weeks ago
haroon amjad 20216cd4ae Merge branch 'master' into haroon_dev 3 weeks ago
aamir-csol 2bbfe1f131 Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/presentation/profile_settings/profile_settings.dart
3 weeks ago
aamir-csol 8b701255ed logout & family file fix 3 weeks ago
haroon amjad 7ead6d79e5 updates 3 weeks ago
haroon amjad f46f978326 Clinic icons updated 3 weeks ago
haroon amjad 10a5a6f558 Ask Doctor implemented 3 weeks ago
haroon amjad f48eb631ab Merge branch 'master' into haroon_dev 3 weeks ago
faizatflutter 07447e148b Symptoms Checker flow is completed 4 weeks ago
haroon amjad 99282f34e3 Added language change option in landing page 4 weeks ago
Sikander Saleem e38892ff2d Merge branch 'refs/heads/master' into dev_sikander
# Conflicts:
#	lib/presentation/habib_wallet/habib_wallet_page.dart
#	lib/presentation/hmg_services/services_page.dart
#	lib/presentation/home/landing_page.dart
#	lib/presentation/home/widgets/habib_wallet_card.dart
#	lib/presentation/insurance/insurance_home_page.dart
#	lib/presentation/lab/lab_orders_page.dart
#	lib/presentation/medical_file/medical_file_page.dart
#	lib/presentation/profile_settings/profile_settings.dart
#	lib/presentation/radiology/radiology_orders_page.dart
#	lib/widgets/appbar/collapsing_list_view.dart
4 weeks ago
Sikander Saleem 45b013a048 UI/UX improvements - insurance update. 1 month ago
Sikander Saleem 77a04e637e UI/UX improvements. 1 month 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
1 month 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
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
faizatflutter ff2bcbae3f Merge branch 'master' into faiz_dev
# Conflicts:
#	lib/core/api_consts.dart
#	lib/core/dependencies.dart
#	lib/main.dart
1 month ago
haroon amjad 91c16f13d1 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/core/app_assets.dart
1 month ago
faizatflutter 3f5bd0a759 Completed the health Tracker Module, Only the email part is left. 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 02930a901e Indoor navigation implementation & Landing page swiper card updates 1 month 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
1 month ago
haroon amjad ede8844f19 Monthly Reports implemented 1 month ago
haroon amjad 255353dd21 Bottom nav updates 1 month ago
haroon amjad b10d715d55 App updates 1 month ago
Sultan khan 5a1fe2b5ca vital sign page added 1 month ago
Sultan khan f7021f685a no message 1 month ago
faizatflutter f8fdd7570e Merge branch 'master' into faiz_dev
# Conflicts:
#	lib/routes/app_routes.dart
#	lib/theme/colors.dart
1 month 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
1 month 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 months ago
Sultan khan 68a34369ee no message 2 months ago
faizatflutter a1aaa041d1 Water Intake Final Touches 2 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
2 months 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
2 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
2 months ago
faizatflutter fd2abbbc7b Water Intake Design completed 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 450f07d39d updates & fixes 2 months ago
Sultan khan 68e1b116f9 last rated updated. 2 months 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
2 months ago
Fatimah.Alshammari 0b3fea230f monthly report 2 months 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
2 months ago
aamir-csol 335e6a6649 Health Calculators 2 months ago
haroon amjad d202aa8423 Smartwatch integration started 2 months ago
haroon amjad ff98262cf7 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/presentation/home/landing_page.dart
2 months ago
faizatflutter 6f72c99975 Merge branch 'master' into faiz_dev
# Conflicts:
#	lib/presentation/lab/lab_orders_page.dart
#	lib/theme/colors.dart
2 months ago