haroon amjad
|
b0708d85d9
|
updates & fixes
|
23 hours ago |
haroon amjad
|
20216cd4ae
|
Merge branch 'master' into haroon_dev
|
1 day ago |
aamir-csol
|
2bbfe1f131
|
Merge branch 'master' into dev_aamir
# Conflicts:
# lib/presentation/profile_settings/profile_settings.dart
|
1 day ago |
aamir-csol
|
8b701255ed
|
logout & family file fix
|
1 day ago |
haroon amjad
|
3e9a381ed7
|
Merge branch 'master' into haroon_dev
|
1 day ago |
faizatflutter
|
14f3c6cb81
|
Added Arabic Support for symptoms checker
|
2 days ago |
haroon amjad
|
10a5a6f558
|
Ask Doctor implemented
|
2 days ago |
haroon amjad
|
d2deb974b1
|
symptoms merge
|
2 days ago |
haroon amjad
|
f48eb631ab
|
Merge branch 'master' into haroon_dev
|
2 days ago |
haroon amjad
|
f54ce71177
|
translation changes
|
2 days ago |
faizatflutter
|
07447e148b
|
Symptoms Checker flow is completed
|
3 days ago |
haroon amjad
|
6faca94b89
|
updates
|
3 days ago |
haroon amjad
|
99282f34e3
|
Added language change option in landing page
|
3 days ago |
aamir-csol
|
418297b6fb
|
Merge branch 'master' into dev_aamir
# Conflicts:
# lib/core/api_consts.dart
|
4 days ago |
haroon amjad
|
00475dc100
|
Merge branch 'master' into haroon_dev
|
1 week ago |
haroon amjad
|
3ff9628cd3
|
Translation updates
|
1 week 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
|
1 week ago |
aamir-csol
|
0017c0601b
|
blood donation changes
|
1 week ago |
Sultan khan
|
7d8537fae6
|
Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
|
1 week ago |
haroon amjad
|
87422e8e05
|
translation updates
|
1 week 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
|
1 week ago |
Sultan khan
|
8c92df8648
|
contact us page fix
|
1 week ago |
aamir-csol
|
a816afadea
|
Merge branch 'master' into dev_aamir
# Conflicts:
# lib/core/dependencies.dart
# lib/presentation/hmg_services/services_page.dart
|
1 week ago |
aamir-csol
|
d76ff5828f
|
fixes
|
1 week ago |
haroon amjad
|
a0008c9104
|
Nearest Appointment sorting fixed
|
1 week ago |
haroon amjad
|
475a9b9acb
|
Merge branch 'master' into haroon_dev
|
1 week ago |
aamir-csol
|
bf210e664d
|
Merge branch 'master' into dev_aamir
|
2 weeks ago |
aamir-csol
|
6725ab028d
|
doctor search filter design update & switch user bug fix.
|
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 |
Haroon6138
|
96ebc3c7e9
|
Merge pull request 'dev_aamir' (#149) from dev_aamir into master
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/149
|
2 weeks ago |
aamir-csol
|
c11e859df1
|
search doctor by name filter.
|
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
|
001808488c
|
Added 'send report to email' feature
|
2 weeks ago |
haroon amjad
|
91c16f13d1
|
Merge branch 'master' into haroon_dev
# Conflicts:
# lib/core/app_assets.dart
|
2 weeks ago |
aamir-csol
|
83f04bc0e6
|
search filter on select doctor page.
|
2 weeks ago |
faizatflutter
|
3f5bd0a759
|
Completed the health Tracker Module, Only the email part is left.
|
2 weeks ago |
aamir-csol
|
38d8341963
|
family file fix
|
2 weeks ago |
aamir-csol
|
c7e4018ddc
|
Merge branch 'master' into dev_aamir
# Conflicts:
# lib/presentation/appointments/widgets/hospital_bottom_sheet/hospital_bottom_sheet_body.dart
|
2 weeks ago |
aamir-csol
|
b815affe5c
|
blood group
|
2 weeks ago |
haroon amjad
|
02930a901e
|
Indoor navigation implementation & Landing page swiper card updates
|
2 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
|
2 weeks ago |
Fatimah.Alshammari
|
8ae81d2b24
|
fixed parking qr
|
2 weeks 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
|
2 weeks ago |
haroon amjad
|
ede8844f19
|
Monthly Reports implemented
|
2 weeks ago |
faizatflutter
|
17f32e34d3
|
Merge branch 'refs/heads/master' into faiz_dev
# Conflicts:
# lib/presentation/symptoms_checker/user_info_selection.dart
|
2 weeks ago |
faizatflutter
|
8c91b6830a
|
Triage Completed. Explain API left
|
3 weeks ago |
haroon amjad
|
32ee47ca66
|
Merge branch 'master' into haroon_dev
|
3 weeks ago |