 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
|
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 |
|
haroon amjad
|
f46f978326
|
Clinic icons updated
|
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 |
|
faizatflutter
|
07447e148b
|
Symptoms Checker flow is completed
|
9 months ago |
|
haroon amjad
|
6faca94b89
|
updates
|
9 months ago |
|
haroon amjad
|
99282f34e3
|
Added language change option in landing page
|
9 months ago |
|
haroon amjad
|
9ef70a250d
|
translation updates
|
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
|
39af08ddc3
|
Translation updates
|
9 months ago |
|
haroon amjad
|
3ff9628cd3
|
Translation updates
|
9 months ago |
|
haroon amjad
|
87422e8e05
|
translation updates
|
9 months ago |
|
Sikander Saleem
|
45b013a048
|
UI/UX improvements - insurance update.
|
9 months ago |
|
haroon amjad
|
169215fd7b
|
translation changes
|
9 months ago |
|
Sikander Saleem
|
77a04e637e
|
UI/UX improvements.
|
9 months ago |
|
haroon amjad
|
8f428297cb
|
Arabic translations added
|
9 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
|
9 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
|
9 months ago |
|
haroon amjad
|
e454c9c991
|
Merge branch 'master' into haroon_dev
# Conflicts:
# lib/core/api_consts.dart
# lib/core/dependencies.dart
|
9 months ago |
|
faizatflutter
|
ff2bcbae3f
|
Merge branch 'master' into faiz_dev
# Conflicts:
# lib/core/api_consts.dart
# lib/core/dependencies.dart
# lib/main.dart
|
9 months ago |
|
haroon amjad
|
91c16f13d1
|
Merge branch 'master' into haroon_dev
# Conflicts:
# lib/core/app_assets.dart
|
9 months ago |
|
faizatflutter
|
3f5bd0a759
|
Completed the health Tracker Module, Only the email part is left.
|
9 months ago |
|
aamir-csol
|
c7e4018ddc
|
Merge branch 'master' into dev_aamir
# Conflicts:
# lib/presentation/appointments/widgets/hospital_bottom_sheet/hospital_bottom_sheet_body.dart
|
9 months ago |
|
aamir-csol
|
b815affe5c
|
blood group
|
9 months ago |
|
haroon amjad
|
02930a901e
|
Indoor navigation implementation & Landing page swiper card updates
|
9 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
|
9 months ago |
|
haroon amjad
|
ede8844f19
|
Monthly Reports implemented
|
9 months ago |
|
haroon amjad
|
255353dd21
|
Bottom nav updates
|
9 months ago |
|
haroon amjad
|
b10d715d55
|
App updates
|
10 months ago |
Sultan khan
|
5a1fe2b5ca
|
vital sign page added
|
10 months ago |
|
Sultan khan
|
f7021f685a
|
no message
|
10 months ago |
|
faizatflutter
|
f8fdd7570e
|
Merge branch 'master' into faiz_dev
# Conflicts:
# lib/routes/app_routes.dart
# lib/theme/colors.dart
|
10 months 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
|
10 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
|
10 months ago |
|
Sultan khan
|
68a34369ee
|
no message
|
10 months ago |
|
Sultan khan
|
873b2a1591
|
sorting done, covid inprogress
|
10 months ago |
|
faizatflutter
|
a1aaa041d1
|
Water Intake Final Touches
|
10 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
|
10 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
|
10 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
|
10 months ago |
|
faizatflutter
|
fd2abbbc7b
|
Water Intake Design completed
|
10 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
|
10 months ago |
|
aamir-csol
|
f509a09b34
|
Health calculators & converters
|
10 months ago |