Commit Graph

451 Commits (70a6d90ce37f5b844990d24af4d5a275ba80b007)

Author SHA1 Message Date
haroon amjad 70a6d90ce3 updates & fixes 9 months ago
haroon amjad cfd0c16738 updates & fixes 9 months ago
Sikander Saleem f376f430c6 Merge branch 'refs/heads/master' into dev_sikander 9 months ago
Sikander Saleem 6e1eb0d0bb ui improvements 9 months ago
haroon amjad ae3ed83dd0 contact us page changes 9 months ago
Sikander Saleem 6e4d7519fb Merge branch 'refs/heads/master' into dev_sikander
# Conflicts:
#	lib/presentation/home/widgets/habib_wallet_card.dart
9 months 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
9 months ago
haroon amjad b0708d85d9 updates & fixes 9 months ago
haroon amjad 20216cd4ae Merge branch 'master' into haroon_dev 9 months ago
aamir-csol 2bbfe1f131 Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/presentation/profile_settings/profile_settings.dart
9 months ago
aamir-csol 8b701255ed logout & family file fix 9 months ago
haroon amjad 7ead6d79e5 updates 9 months ago
haroon amjad 3e9a381ed7 Merge branch 'master' into haroon_dev 9 months ago
faizatflutter 14f3c6cb81 Added Arabic Support for symptoms checker 9 months ago
haroon amjad 10a5a6f558 Ask Doctor implemented 9 months ago
haroon amjad f48eb631ab Merge branch 'master' into haroon_dev 9 months ago
haroon amjad f54ce71177 translation changes 9 months ago
faizatflutter 07447e148b Symptoms Checker flow is completed 9 months ago
haroon amjad 99282f34e3 Added language change option in landing page 9 months ago
aamir-csol 418297b6fb Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/core/api_consts.dart
9 months ago
haroon amjad 9ef70a250d translation updates 9 months ago
haroon amjad 3fc1302eaf New Flutter App param added 9 months 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
9 months ago
haroon amjad 5feacfaf27 Translation updates 9 months ago
haroon amjad e5f24b9c06 updates 9 months ago
haroon amjad 00475dc100 Merge branch 'master' into haroon_dev 9 months ago
haroon amjad 3ff9628cd3 Translation updates 9 months 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
9 months ago
aamir-csol 0017c0601b blood donation changes 9 months ago
Sultan khan 7d8537fae6 Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan 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
Sikander Saleem 77a04e637e UI/UX improvements. 9 months 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
9 months ago
Sultan khan 8c92df8648 contact us page fix 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
haroon amjad 44ce353dac updates 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