haroon amjad
2e0b853ddc
Merge branch 'master' into haroon_dev
...
# Conflicts:
# assets/langs/en-US.json
# lib/generated/locale_keys.g.dart
# pubspec.yaml
5 months ago
Haroon6138
b43431972a
Merge pull request 'feedbacks in symptoms checker (faiz_dev)' ( #331 ) from faiz_dev_symptoms_checker into master
...
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/331
5 months ago
haroon amjad
8299299d53
updates
5 months ago
faizatflutter
fb75e326d2
completed suggested changes
5 months ago
Aamir Muhammad
008878676a
Accessibility & Image Widgets Update
5 months ago
haroon amjad
e50be3ee92
Amazon Payfort hosted payment gateway implementation contd.
5 months ago
Aamir Muhammad
8a94f5b476
Accessibility & Image Widgets Update
5 months ago
faizatflutter
ce23c0302a
completed the symmtoms checker suggestions from infermedica
5 months ago
haroon amjad
4c6485d6af
Payfort in-app implementation contd.
5 months ago
faizatflutter
02e44ed7fb
added 3 apis
5 months ago
faizatflutter
c8378278c9
Merge branch 'master' into faiz_dev_symptoms_checker
...
# Conflicts:
# assets/langs/ar-SA.json
# lib/generated/locale_keys.g.dart
5 months ago
haroon amjad
bb89bb63af
Merge branch 'master' into haroon_dev
5 months ago
faizatflutter
826d12e57d
symptoms checker suggestions from infermedia inprogress
5 months ago
haroon amjad
3d82393cb7
Tamara implementation with PayTabs completed.
5 months ago
haroon amjad
1750c7dc44
Microsoft Clarity implementation contd.
5 months ago
haroon amjad
4eb4d0b37d
Parking QR implemented
5 months ago
Aamir Muhammad
3dac6cb3a7
Last Login UAE Fix
5 months ago
haroon amjad
8957382689
Merge branch 'master' into haroon_dev
...
# Conflicts:
# assets/langs/ar-SA.json
5 months ago
haroon amjad
304f9df0d7
updates
5 months ago
Aamir Muhammad
31035ed0cc
Hamza Fix For Arabic Search
5 months ago
haroon amjad
bcdbfa99ed
Fixes & update to stores VersionID 21.3
5 months ago
Haroon Amjad
3590dfc511
Wallet amount reload
5 months ago
haroon amjad
89670445b3
updates
5 months ago
haroon amjad
e427e91b2f
Merge branch 'master' into haroon_dev
...
# Conflicts:
# assets/langs/ar-SA.json
# assets/langs/en-US.json
# lib/core/api_consts.dart
# lib/generated/locale_keys.g.dart
# lib/presentation/symptoms_checker/triage_screen.dart
5 months ago
haroon amjad
98450b4f94
Appointment parking QR implemented
5 months ago
faizatflutter
6b4ad35217
fixed er 'pickFiles' can't be acc
5 months ago
haroon amjad
f08775cbd4
Updates & fixes
5 months ago
haroon amjad
8ffd7485d6
updates
5 months ago
faizatflutter
6efbe257d1
Merge branch 'master' into faiz_dev
...
# Conflicts:
# lib/core/dependencies.dart
# lib/main.dart
# lib/presentation/authentication/register_step2.dart
5 months ago
faizatflutter
897bd30879
Refund Module Completed
5 months ago
Aamir Muhammad
217b423308
OTP Changes & Drop Down Fixes.
5 months ago
haroon amjad
171a6a2d74
fixes
5 months ago
haroon amjad
ab86d53261
Updates
5 months ago
Aamir Muhammad
8365d2c4ee
Image Functionality & Discounts & Offers
5 months ago
Aamir Muhammad
4fd2312e61
Merge branch 'refs/heads/master' into offers_discounts
...
# Conflicts:
# lib/presentation/my_family/widget/family_cards.dart
5 months ago
Aamir Muhammad
2b53cce0aa
Merge branch 'refs/heads/master' into offers_discounts
...
# Conflicts:
# lib/core/api_consts.dart
# lib/presentation/home/landing_page.dart
# lib/presentation/my_family/widget/family_cards.dart
5 months ago
Aamir Muhammad
7cd1d84ff6
Image Functionality & Discounts & Offers
5 months ago
haroon amjad
227dd407f5
Updates
5 months ago
faizatflutter
64da8f1804
Merge branch 'master' into faiz_dev
...
# Conflicts:
# assets/langs/ar-SA.json
# assets/langs/en-US.json
# lib/core/dependencies.dart
# lib/features/habib_wallet/habib_wallet_view_model.dart
# lib/generated/locale_keys.g.dart
# lib/main.dart
# lib/presentation/home/landing_page.dart
# lib/presentation/medical_file/medical_file_page.dart
5 months ago
faizatflutter
67bb3895e2
Refund Module almost done
5 months ago
Haroon6138
c29632ffc0
Merge pull request 'haroon_dev' ( #317 ) from haroon_dev into master
...
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/317
6 months ago
haroon amjad
4015f5ba2e
PayTabs Card & Apple Pay Payment integration completed.
6 months ago
faizatflutter
198280fbde
Refund Request and Withdraw Module In Progress!
6 months ago
haroon amjad
155916b1a8
Paytabs implementation contd.
6 months ago
tahaalam
87b6e055da
organs added for the medication input
6 months ago
Haroon Amjad
cdc82c83f8
Paytabs implemented in Wallet payment
6 months ago
haroon amjad
0db762fa2c
Paytabs implementation contd.
6 months ago
haroon amjad
4329aa05ad
update to stores, VersionID 21.2
6 months ago
faizatflutter
8aa152f1a0
added apis
6 months ago
haroon amjad
f7d415b7eb
LocationID updates
6 months ago
haroon amjad
a9d085098f
Pharmacy invoice implemented
6 months ago
faizatflutter
7cf593443d
Refund Request Started
6 months ago
haroon amjad
469479d7cb
updates
6 months ago
haroon amjad
9986729ba5
Updates & fixes
6 months ago
haroon amjad
c9e602cfa3
updates & fixes
6 months ago
haroon amjad
9d04133b8d
Lakum integration completed
6 months ago
haroon amjad
40a0ecdda4
Lakum integration contd.
6 months ago
haroon amjad
285287e596
crashlytics fixes
6 months ago
Haroon6138
99dfd2cea9
Merge pull request 'Dob & Gender Fix' ( #314 ) from dev_aamir into master
...
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/314
6 months ago
Aamir CSol
8b9ba23d72
Merge branch 'refs/heads/master' into dev_aamir
6 months ago
Aamir CSol
3f683917cb
Dob Fix, Gender Fix
6 months ago
Sultan khan
b6e3c4a5ce
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 :
Hotfix app update sent to stores, VersionID 21.1, Lakum points implementation contd.
updates
Er refferal Fix
last login issue resolved
Updates
updates
updates & fixes
# Conflicts:
# assets/langs/ar-SA.json
# assets/langs/en-US.json
# lib/generated/locale_keys.g.dart
# lib/presentation/e_referral/new_e_referral.dart
# lib/presentation/e_referral/widget/e_referral_other_details.dart
6 months ago
Sultan khan
696eeccdbd
no message
6 months ago
haroon amjad
b6c9fb96d4
Hotfix app update sent to stores, VersionID 21.1, Lakum points implementation contd.
6 months ago
haroon amjad
7c49606331
updates
6 months ago
haroon amjad
3bb58e2e64
Updates
6 months ago
haroon amjad
4b3c986dc2
updates
6 months ago
haroon amjad
7ef435690d
updates & fixes
6 months ago
haroon amjad
13cab04791
updates
6 months ago
haroon amjad
695d6566a1
updates
6 months ago
Aamir CSol
c93aa5993e
Merge branch 'master' into dev_aamir
6 months ago
Aamir CSol
1911f7ce64
Input Field Error Handling
6 months ago
haroon amjad
021a835fa8
updates
6 months ago
Sultan khan
d9d7a8b7c2
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 :
updated scheduleApi Fix
Completed the SymptomsChecker Changes
Updates & http client enhancements
Updates
updates
Symptoms checker flow updates and Design Fixes on Fold
Habib Wallet fix in services page
Design fixes on Fold
Updates & fixes
Design changes on fold
updates
# Conflicts:
# assets/langs/ar-SA.json
# assets/langs/en-US.json
6 months ago
Sultan khan
e2adc629b8
e-referral issue and registration crashlytics issue fixed.
6 months ago
faizatflutter
b03cbf518c
updated scheduleApi Fix
6 months ago
faizatflutter
f3f47dfa4f
Merge branch 'master' into faiz_dev
6 months ago
faizatflutter
03ce3b617d
Completed the SymptomsChecker Changes
6 months ago
haroon amjad
34cc16c24f
Updates
6 months ago
haroon amjad
9458e205af
Merge branch 'master' into haroon_dev
...
# Conflicts:
# lib/presentation/appointments/widgets/appointment_card.dart
# lib/presentation/hmg_services/services_page.dart
# lib/presentation/home/landing_page.dart
6 months ago
faizatflutter
a9d7190348
Merge branch 'master' into faiz_dev
...
# Conflicts:
# lib/core/api_consts.dart
# lib/presentation/home/landing_page.dart
# lib/presentation/medical_file/medical_file_page.dart
6 months ago
faizatflutter
63fd82407e
Symptoms checker flow updates and Design Fixes on Fold
6 months ago
faizatflutter
7b1684c455
Design fixes on Fold
6 months ago
haroon amjad
0e2b8db63a
Updates & fixes
6 months ago
haroon amjad
19e102b52d
family member add navigation issue fixed
6 months ago
haroon amjad
018f316a01
Merge branch 'master' into haroon_dev
6 months ago
aamir-csol
dfd7160030
Medical File Navigation & Keyboard Fix
6 months ago
haroon amjad
877f73b384
Notification permission added on app launch, appointment invoice download option added, HMG Wallet added in medical file page
6 months ago
haroon amjad
dc26183467
radiology empty state fix
6 months ago
Sultan khan
85b901d3d5
Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
...
# Conflicts:
# assets/langs/ar-SA.json
# assets/langs/en-US.json
# lib/generated/locale_keys.g.dart
6 months ago
haroon amjad
e200e84b8e
Updates
6 months ago
Sultan khan
2da0d0dcaf
update and fixes
6 months ago
haroon amjad
16f3298f37
Added shared preferences check in the prescription reminders
6 months ago
Sultan khan
caa9da2cce
Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
...
# Conflicts:
# assets/langs/ar-SA.json
# assets/langs/en-US.json
# lib/generated/locale_keys.g.dart
# lib/presentation/book_appointment/livecare/immediate_livecare_payment_details.dart
6 months ago
Sultan khan
efa7a39978
no message
6 months ago
aamir-csol
e842d85254
Fixes & Translation
6 months ago
haroon amjad
9e9344cd0f
updates
6 months ago
aamir-csol
697642143c
Translation & Calender
6 months ago
haroon amjad
333f702f80
updates & fixes
6 months ago
aamir-csol
ff55257e73
Zoom in and Out
6 months ago
aamir-csol
fdf21b725e
Zoom in and Out
6 months ago
aamir-csol
42f4333a28
Merge branch 'master' into dev_aamir
6 months ago
aamir-csol
e5a055d355
Localization & rad error fix
6 months ago
haroon amjad
fe82f12b33
fix for patient share
6 months ago
aamir-csol
13040a17a7
Merge branch 'master' into dev_aamir
...
# Conflicts:
# lib/features/authentication/authentication_view_model.dart
6 months ago
aamir-csol
1c929999f1
Localization
6 months ago
Sultan khan
83a414796a
Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
...
# Conflicts:
# lib/features/authentication/authentication_view_model.dart
6 months ago
Sultan khan
1366518ce1
fixes and updates
6 months ago
faizatflutter
61f17a3feb
fixed api localization issue
6 months ago
Sultan khan
8a41b5716f
updates
6 months ago
faizatflutter
8c925a7f5e
Merge branch 'master' into faiz_dev
...
# Conflicts:
# ios/Podfile.lock
6 months ago
tahaalam
513422cb03
Merge remote-tracking branch 'origin/master' into changes
6 months ago
tahaalam
bf7b0d922e
weather permission issue
6 months ago
aamir-csol
cb2e3c7574
Merge branch 'master' into dev_aamir
...
# Conflicts:
# assets/langs/ar-SA.json
# assets/langs/en-US.json
# lib/generated/locale_keys.g.dart
# lib/presentation/book_appointment/select_clinic_page.dart
6 months ago
aamir-csol
baa9ebe7ea
Merge branch 'master' into dev_aamir
...
# Conflicts:
# assets/langs/ar-SA.json
# assets/langs/en-US.json
6 months ago
Sultan khan
256537cfb3
update and fix
6 months ago
aamir-csol
1849a90b32
Localization
6 months ago
tahaalam
28d03644ba
Merge remote-tracking branch 'origin/master' into changes
...
# Conflicts:
# assets/langs/ar-SA.json
# assets/langs/en-US.json
# lib/generated/locale_keys.g.dart
6 months ago
aamir-csol
1515fc57e5
Localization
6 months ago
tahaalam
bf9b88e79c
map prescriptiojn changes
...
date sorting for the rrt and amublance history.
weather issue,
e refferal langauge
6 months ago
tahaalam
66e23197c5
referral lingual change
6 months ago
Sultan khan
bd581c4fe0
Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
...
# Conflicts:
# assets/langs/ar-SA.json
# assets/langs/en-US.json
# lib/generated/locale_keys.g.dart
7 months ago
Sultan khan
82f2adfc3f
Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
7 months ago
tahaalam
a31c4c99df
Merge remote-tracking branch 'origin/master' into changes
...
# Conflicts:
# assets/langs/ar-SA.json
# lib/generated/codegen_loader.g.dart
# lib/generated/locale_kesy.g.dart
7 months ago
tahaalam
2d36d91ab6
language and stepper changes
7 months ago
Sultan khan
c2dcf95d52
update and fix
7 months ago
aamir-csol
01e56e4fb5
Merge branch 'refs/heads/master' into dev_aamir
7 months ago
aamir-csol
db2ccd3be6
Date & Time New Widget For Whole App
7 months ago
khansultan1
8e9c5ae6df
Merge pull request 'radiology ai Analysis' ( #246 ) from dev_aamir into master
...
Reviewed-on: #246
7 months ago
aamir-csol
4cd5132627
radiology ai Analysis
7 months ago
Sultan khan
0a24e6cfd1
Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
7 months ago
Sultan khan
fd3e434b0c
no message
7 months ago
tahaalam
c19451a6b6
profile picture fix
7 months ago
Sultan khan
69310575e5
updates
7 months ago
aamir-csol
f0b8db0318
Merge branch 'master' into dev_aamir
...
# Conflicts:
# lib/features/medical_file/medical_file_view_model.dart
# lib/presentation/appointments/appointment_details_page.dart
7 months ago
aamir-csol
461fa11df3
health calculator design & timer & bell icon switch changes
7 months ago
Sultan khan
16e898bb6c
updates and fixes
7 months ago
aamir-csol
90bcdf674d
Merge branch 'refs/heads/master' into dev_aamir
...
# Conflicts:
# android/app/src/main/AndroidManifest.xml
7 months ago
tahaalam
303fb87661
Merge remote-tracking branch 'origin/master' into changes
7 months ago
tahaalam
fcf990bc00
hot fixes
7 months ago
Sultan khan
cfea843c4f
updates and fixes
7 months ago
aamir-csol
2b0f8b45b0
appointment reminder & weather
7 months ago
faizatflutter
8c3121fd38
Merge branch 'master' into faiz_dev
...
# Conflicts:
# ios/Podfile.lock
7 months ago
Sultan khan
a144f30f42
no message
7 months ago
tahaalam
d97ead4e03
Merge remote-tracking branch 'origin/master' into changes
...
# Conflicts:
# lib/core/app_assets.dart
7 months ago
tahaalam
fb93aa1092
ambulance call page changes:
...
1. icon change for the success of ambulance call and rrt.
2. flow changed to first select the appoiintment then hospital.
3. location accorate enabled.
7 months ago
tahaalam
ebfefefec0
issue fix for the projects having distance not found if the permission for the application
7 months ago
Sultan khan
3d226c39d0
fixes and updates
7 months ago
Sultan khan
207b84e493
fixes and updates
7 months ago
Sultan khan
7e2c470767
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 & fixes
7 months ago