Commit Graph

135 Commits (f04d8bd56aff6fc761602e78acb7d8db43a23924)

Author SHA1 Message Date
FaizHashmi 81e5c40e12 Merge branch 'master' into national_day_theme 1 month ago
Sultan khan 8b9f4d98f3 theme code updated. 1 month ago
haroon amjad 5a5282eff4 MyFatoorah implementation contd. 1 month ago
haroon amjad d43022bbb4 MyFatoorah Payment integration in progress 1 month ago
haroon amjad 83b17532d0 Security changes implemented 2 months ago
haroon amjad ed653d8108 Payment request & response insert implemented in paytabs. 3 months ago
haroon amjad b793426dd6 Implemented CloudFlare TurnStile 3 months ago
haroon amjad 6abcdf135e Clarity implementation, LiveCare update insurance API implemented 4 months ago
faizatflutter 05730d3774 fixed er 'pickFiles' can't be acc 5 months ago
faizatflutter 6efbe257d1 Merge branch 'master' into faiz_dev
# Conflicts:
#	lib/core/dependencies.dart
#	lib/main.dart
#	lib/presentation/authentication/register_step2.dart
5 months ago
faizatflutter 897bd30879 Refund Module Completed 5 months ago
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
5 months ago
Aamir Muhammad 7cd1d84ff6 Image Functionality & Discounts & Offers 5 months ago
faizatflutter 64da8f1804 Merge branch 'master' into faiz_dev
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/core/dependencies.dart
#	lib/features/habib_wallet/habib_wallet_view_model.dart
#	lib/generated/locale_keys.g.dart
#	lib/main.dart
#	lib/presentation/home/landing_page.dart
#	lib/presentation/medical_file/medical_file_page.dart
5 months ago
faizatflutter 198280fbde Refund Request and Withdraw Module In Progress! 6 months ago
haroon amjad 0db762fa2c Paytabs implementation contd. 6 months ago
faizatflutter 7cf593443d Refund Request Started 6 months ago
haroon amjad c9406aa66d Updates & http client enhancements 6 months ago
aamir-csol db2ccd3be6 Date & Time New Widget For Whole App 6 months ago
aamir-csol 2b0f8b45b0 appointment reminder & weather 7 months ago
Sultan khan 21ae30a8cc profile picture upload 7 months ago
haroon amjad d053f58b7d Updates 7 months ago
Haroon Amjad 040ff6a80d Dark mode persistence added in the app 8 months ago
haroon amjad 3c9c3032a5 Services price list implemented 9 months ago
haroon amjad b0708d85d9 updates & fixes 9 months ago
haroon amjad 10a5a6f558 Ask Doctor implemented 9 months ago
haroon amjad e5f24b9c06 updates 9 months ago
haroon amjad 3e6ee8c10c Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/routes/app_routes.dart
9 months ago
haroon amjad 87422e8e05 translation updates 9 months ago
Fatimah.Alshammari 9795276ef9 fixed errors 9 months ago
Fatimah.Alshammari 97a47ce4e8 Merge branch 'refs/heads/master' into fatima
# Conflicts:
#	lib/core/dependencies.dart
#	lib/routes/app_routes.dart
9 months ago
Fatimah.Alshammari 287e2b9562 fixed QR 9 months ago
haroon amjad a0008c9104 Nearest Appointment sorting fixed 10 months ago
Fatimah.Alshammari 1d224702ac Merge branch 'refs/heads/master' into fatima 10 months ago
Fatimah.Alshammari 69666a6f6c fixed button 10 months ago
haroon amjad 475a9b9acb Merge branch 'master' into haroon_dev 10 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
10 months ago
haroon amjad 609ae6ab83 updates 10 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
10 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
10 months ago
haroon amjad d848291930 updates 10 months ago
Sultan khan 8ee0e3b4ea no message 10 months ago
haroon amjad e454c9c991 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/core/api_consts.dart
#	lib/core/dependencies.dart
10 months ago
faizatflutter ff2bcbae3f Merge branch 'master' into faiz_dev
# Conflicts:
#	lib/core/api_consts.dart
#	lib/core/dependencies.dart
#	lib/main.dart
10 months ago
haroon amjad 91c16f13d1 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/core/app_assets.dart
10 months ago
faizatflutter 3f5bd0a759 Completed the health Tracker Module, Only the email part is left. 10 months ago
aamir-csol c7e4018ddc Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/presentation/appointments/widgets/hospital_bottom_sheet/hospital_bottom_sheet_body.dart
10 months ago
aamir-csol b815affe5c blood group 10 months ago
haroon amjad 02930a901e Indoor navigation implementation & Landing page swiper card updates 10 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
10 months ago