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 |
faizatflutter
|
14f3c6cb81
|
Added Arabic Support for symptoms checker
|
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 |
|
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 |
|
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 |
|
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 |
|
haroon amjad
|
1c0842ab95
|
updates
|
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 |
|
Fatimah.Alshammari
|
8ae81d2b24
|
fixed parking qr
|
10 months ago |
|
haroon amjad
|
685eec6a52
|
updates & fixes
|
10 months ago |
 tahaalam
|
699ef2f672
|
Merge remote-tracking branch 'origin/ambulance_service' into ambulance_service
# Conflicts:
# android/settings.gradle.kts
|
10 months ago |
|
tahaalam
|
85f9609cbb
|
Merge remote-tracking branch 'origin/master' into ambulance_service
# Conflicts:
# android/app/libs/PenNavUI.aar
# android/app/libs/Penguin.aar
# android/app/libs/PenguinRenderer.aar
# android/app/src/main/kotlin/com/ejada/hmg/MainActivity.kt
# android/app/src/main/res/values/strings.xml
# android/build/reports/problems/problems-report.html
# ios/Runner/AppDelegate.swift
|
10 months ago |
|
haroon amjad
|
ede8844f19
|
Monthly Reports implemented
|
10 months ago |
|
faizatflutter
|
17f32e34d3
|
Merge branch 'refs/heads/master' into faiz_dev
# Conflicts:
# lib/presentation/symptoms_checker/user_info_selection.dart
|
10 months ago |