Commit Graph

312 Commits (dev_sikander)

Author SHA1 Message Date
Sikander Saleem b9350afead ui improvements 8 hours ago
faizatflutter 9c7cfde5f4 ui improvements 1 day ago
Sikander Saleem 6e1eb0d0bb ui improvements 2 days ago
Sikander Saleem 6e4d7519fb Merge branch 'refs/heads/master' into dev_sikander
# Conflicts:
#	lib/presentation/home/widgets/habib_wallet_card.dart
5 days 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
5 days ago
haroon amjad b0708d85d9 updates & fixes 5 days ago
haroon amjad 3e9a381ed7 Merge branch 'master' into haroon_dev 6 days ago
faizatflutter 14f3c6cb81 Added Arabic Support for symptoms checker 6 days ago
haroon amjad 10a5a6f558 Ask Doctor implemented 6 days ago
haroon amjad f48eb631ab Merge branch 'master' into haroon_dev 7 days ago
haroon amjad f54ce71177 translation changes 7 days ago
faizatflutter 07447e148b Symptoms Checker flow is completed 1 week ago
haroon amjad 6faca94b89 updates 1 week 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
1 week ago
haroon amjad 5feacfaf27 Translation updates 1 week ago
haroon amjad 39af08ddc3 Translation updates 2 weeks ago
Sikander Saleem 0b9df1f22b collapsing toolbar behaviour changed as like barq 2 weeks ago
Sikander Saleem 45b013a048 UI/UX improvements - insurance update. 2 weeks ago
Sikander Saleem 1599cfed4e UI/UX improvements-1. 2 weeks ago
Sikander Saleem 77a04e637e UI/UX improvements. 2 weeks ago
haroon amjad 475a9b9acb Merge branch 'master' into haroon_dev 2 weeks 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 3 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
3 weeks ago
haroon amjad ede8844f19 Monthly Reports implemented 3 weeks ago
haroon amjad 255353dd21 Bottom nav updates 3 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)
4 weeks ago
Sultan khan f7021f685a no message 4 weeks ago
faizatflutter a29c0dd6bc fixed the suggested design changes. (Not reminder ones) 4 weeks ago
faizatflutter f8fdd7570e Merge branch 'master' into faiz_dev
# Conflicts:
#	lib/routes/app_routes.dart
#	lib/theme/colors.dart
4 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
4 weeks ago
faizatflutter d4dd475e0b Added Graph 4 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 1 month 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
1 month ago
aamir-csol 135b05e561 Health calculators & converters 1 month 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
1 month ago
faizatflutter fd2abbbc7b Water Intake Design completed 1 month ago