Commit Graph

121 Commits (2b53cce0aa30114b2e5bc38cc27bd4207e74e0cd)

Author SHA1 Message Date
Aamir Muhammad 2b53cce0aa Merge branch 'refs/heads/master' into offers_discounts
# Conflicts:
#	lib/core/api_consts.dart
#	lib/presentation/home/landing_page.dart
#	lib/presentation/my_family/widget/family_cards.dart
4 weeks ago
Aamir Muhammad 7cd1d84ff6 Image Functionality & Discounts & Offers 4 weeks ago
haroon amjad 0db762fa2c Paytabs implementation contd. 1 month ago
haroon amjad c9406aa66d Updates & http client enhancements 2 months ago
aamir-csol db2ccd3be6 Date & Time New Widget For Whole App 2 months ago
aamir-csol 2b0f8b45b0 appointment reminder & weather 2 months ago
Sultan khan 21ae30a8cc profile picture upload 2 months ago
haroon amjad d053f58b7d Updates 3 months ago
Haroon Amjad 040ff6a80d Dark mode persistence added in the app 3 months ago
haroon amjad 3c9c3032a5 Services price list implemented 4 months ago
haroon amjad b0708d85d9 updates & fixes 5 months ago
haroon amjad 10a5a6f558 Ask Doctor implemented 5 months ago
haroon amjad e5f24b9c06 updates 5 months ago
haroon amjad 3e6ee8c10c Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/routes/app_routes.dart
5 months ago
haroon amjad 87422e8e05 translation updates 5 months ago
Fatimah.Alshammari 9795276ef9 fixed errors 5 months ago
Fatimah.Alshammari 97a47ce4e8 Merge branch 'refs/heads/master' into fatima
# Conflicts:
#	lib/core/dependencies.dart
#	lib/routes/app_routes.dart
5 months ago
Fatimah.Alshammari 287e2b9562 fixed QR 5 months ago
haroon amjad a0008c9104 Nearest Appointment sorting fixed 5 months ago
Fatimah.Alshammari 1d224702ac Merge branch 'refs/heads/master' into fatima 5 months ago
Fatimah.Alshammari 69666a6f6c fixed button 5 months ago
haroon amjad 475a9b9acb Merge branch 'master' into haroon_dev 5 months 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
5 months ago
haroon amjad 609ae6ab83 updates 5 months 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
5 months 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
5 months ago
haroon amjad d848291930 updates 5 months ago
Sultan khan 8ee0e3b4ea no message 5 months ago
haroon amjad e454c9c991 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/core/api_consts.dart
#	lib/core/dependencies.dart
5 months ago
faizatflutter ff2bcbae3f Merge branch 'master' into faiz_dev
# Conflicts:
#	lib/core/api_consts.dart
#	lib/core/dependencies.dart
#	lib/main.dart
5 months ago
haroon amjad 91c16f13d1 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/core/app_assets.dart
5 months ago
faizatflutter 3f5bd0a759 Completed the health Tracker Module, Only the email part is left. 5 months ago
aamir-csol c7e4018ddc Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/presentation/appointments/widgets/hospital_bottom_sheet/hospital_bottom_sheet_body.dart
5 months ago
aamir-csol b815affe5c blood group 5 months ago
haroon amjad 02930a901e Indoor navigation implementation & Landing page swiper card updates 5 months 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
5 months ago
Fatimah.Alshammari 8ae81d2b24 fixed parking qr 5 months ago
haroon amjad ede8844f19 Monthly Reports implemented 5 months ago
haroon amjad 6f067d92d6 My invoices implemented 5 months ago
Fatimah.Alshammari 62bb667cb8 added parking part 5 months ago
faizatflutter d4dd475e0b Added Graph 5 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
6 months ago
faizatflutter a1aaa041d1 Water Intake Final Touches 6 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
6 months ago
Fatimah.Alshammari 68f044de52 added monthly report 6 months ago
faizatflutter fd2abbbc7b Water Intake Design completed 6 months ago
aamir-csol f509a09b34 Health calculators & converters 6 months ago
Fatimah.Alshammari c9de23347a fix error 6 months ago
Fatimah.Alshammari 190492a191 Merge branch 'refs/heads/master' into fatima
# Conflicts:
#	lib/routes/app_routes.dart
6 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
6 months ago